From f1d032c2748f079abad362d37a4d1deb6e77f1ab Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 8 Aug 2002 18:53:47 +0000
Subject: (set_resolution): handle the optional $resolution->{Y}
 (@resolutions): add 1280x960

---
 perl-install/Xconfig/xfreeX.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'perl-install')

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.
-- 
cgit v1.2.1