From 31fdcc7b2b0d02ed84853e4e21c3562f98a3f37a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 28 Apr 2005 15:51:50 +0000
Subject: if one prefer using "Modes" instead of "Virtual", keep it as is

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

(limited to 'perl-install')

diff --git a/perl-install/Xconfig/xfree.pm b/perl-install/Xconfig/xfree.pm
index b05e25a5e..da6799b6a 100644
--- a/perl-install/Xconfig/xfree.pm
+++ b/perl-install/Xconfig/xfree.pm
@@ -152,10 +152,13 @@ sub set_resolution {
     
     foreach my $Screen ($o_Screen_ ? $o_Screen_ : $raw_X->get_Sections('Screen')) {
 	$Screen ||= $raw_X->get_default_screen or internal_error('no screen');
+
+	my $Mode_name = (any { $_->{l}{Modes} } @{$Screen->{Display} || []}) ? 'Modes' : 'Virtual';
+	my $Mode = sprintf($Mode_name eq 'Modes' ? '"%dx%d"' : '%d %d', @$resolution{'X', 'Y'});
 	
-	$Screen->{DefaultColorDepth} = { val => $resolution->{Depth} eq '32' ? 24 : $resolution->{Depth} };
+	$Screen->{DefaultColorDepth} = { val => $resolution->{Depth} eq '32' ? 24 : $resolution->{Depth} };	
 	$Screen->{Display} = [ map {
-	    { l => { Depth => { val => $_ }, Virtual => { val => join(' ', @$resolution{'X', 'Y'}) } } };
+	    { l => { Depth => { val => $_ }, $Mode_name => { val => $Mode } } };
 	} 8, 15, 16, 24 ];
     }
     add_gtf_ModeLines($raw_X, $resolution);
-- 
cgit v1.2.1