diff options
Diffstat (limited to 'perl-install/Xconfig')
| -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. |