diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-08-08 18:53:47 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-08-08 18:53:47 +0000 |
| commit | f1d032c2748f079abad362d37a4d1deb6e77f1ab (patch) | |
| tree | 1ba6d30d2df7c1e3577db01528f3b957ede0af91 | |
| parent | 9aa1aa83f3e46a0ae1964a019b8a31354eff127c (diff) | |
| download | drakx-f1d032c2748f079abad362d37a4d1deb6e77f1ab.tar drakx-f1d032c2748f079abad362d37a4d1deb6e77f1ab.tar.gz drakx-f1d032c2748f079abad362d37a4d1deb6e77f1ab.tar.bz2 drakx-f1d032c2748f079abad362d37a4d1deb6e77f1ab.tar.xz drakx-f1d032c2748f079abad362d37a4d1deb6e77f1ab.zip | |
(set_resolution): handle the optional $resolution->{Y}
(@resolutions): add 1280x960
| -rw-r--r-- | perl-install/Xconfig/xfreeX.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/Xconfig/xfreeX.pm b/perl-install/Xconfig/xfreeX.pm index 8a10a3b10..977de104a 100644 --- a/perl-install/Xconfig/xfreeX.pm +++ b/perl-install/Xconfig/xfreeX.pm @@ -182,7 +182,10 @@ sub set_resolution { if ($resolution->{fbdev}) { '"default"'; } else { - my @Modes = grep { /(\d+)x/ && $1 <= $resolution->{X} } reverse our @resolutions; + my @Modes = grep { + /(\d+)x(\d+)/; + $1 <= $resolution->{X} && (!$resolution->{Y} || $2 <= $resolution->{Y}); + } reverse our @resolutions; join(" ", map { qq("$_") } @Modes); } }; @@ -306,7 +309,7 @@ sub ModeLine_from_string { -our @resolutions = ('640x480', '800x600', '1024x768', if_(arch() =~ /ppc/, '1152x768'), '1152x864', '1280x1024', '1400x1050', '1600x1200', '1920x1440', '2048x1536'); +our @resolutions = ('640x480', '800x600', '1024x768', if_(arch() =~ /ppc/, '1152x768'), '1152x864', '1280x960', '1280x1024', '1400x1050', '1600x1200', '1920x1440', '2048x1536'); our $default_header = << 'END'; # File generated by XFdrake. |