XFree 3 is gone!

1 files changed, 438 insertions, 79 deletions

diff --git a/perl-install/Xconfig/xfree.pm b/perl-install/Xconfig/xfree.pm
index df6c0d3e0..c567192c9 100644
--- a/perl-install/Xconfig/xfree.pm
+++ b/perl-install/Xconfig/xfree.pm
@@ -5,111 +5,470 @@ use strict;
 
 use common;
 use Xconfig::parse;
-use Xconfig::xfree3;
-use Xconfig::xfree4;
-use log;
 
+#- mostly internal only
+sub new {
+    my ($class, $val) = @_;
+    bless $val, $class;
+}
 
+################################################################################
+# I/O ##########################################################################
+################################################################################
 sub read {
-    my ($class, $o_xfree3_file, $o_xfree4_file) = @_;
-    bless { xfree3 => eval { Xconfig::xfree3->read($o_xfree3_file) } || [], 
-	    xfree4 => eval { Xconfig::xfree4->read($o_xfree4_file) } || [] }, $class;
+    my ($class) = @_;
+    my $file = "$::prefix/etc/X11/XF86Config";
+    $file = "$file-4" if -e "$file-4"; #- prefer XF86Config-4 when there is one. Writing will take care of keeping only the new name
+    $class->new(Xconfig::parse::read_XF86Config($file));
 }
 sub write {
-    my ($both, $o_xfree3_file, $o_xfree4_file) = @_;
-    $both->{xfree3} ? $both->{xfree3}->write($o_xfree3_file) : unlink($o_xfree3_file);
-    $both->{xfree4} ? $both->{xfree4}->write($o_xfree4_file) : unlink($o_xfree4_file);
+    my ($raw_X) = @_;
+    my $file = "$::prefix/etc/X11/XF86Config";
+    rename $file, "$file.old";
+    rename "$file-4", "$file-4.old"; #- there won't be any XF86Config-4 anymore, we want this!
+    Xconfig::parse::write_XF86Config($raw_X, $file);
 }
 sub prepare_write {
-    my ($both) = @_;
-    ($both->{xfree4} || $both->{xfree3})->prepare_write;
+    my ($raw_X) = @_;
+    join('', Xconfig::parse::prepare_write_XF86Config($raw_X));
 }
-
 sub empty_config {
     my ($class) = @_;
-    bless { xfree3 => Xconfig::xfree3->empty_config, 
-	    xfree4 => Xconfig::xfree4->empty_config }, $class;
+    $class->new(Xconfig::parse::read_XF86Config_from_string(our $default_header));
+}
+
+################################################################################
+# keyboard #####################################################################
+################################################################################
+my @keyboard_fields = qw(XkbLayout XkbModel XkbDisable XkbOptions XkbCompat);
+sub get_keyboard {
+    my ($raw_X) = @_;
+    my $raw_kbd = $raw_X->get_Section('Keyboard') or die "no keyboard section";
+    raw_export_section($raw_kbd, \@keyboard_fields);
+}
+sub set_keyboard {
+    my ($raw_X, $kbd) = @_;
+    my $raw_kbd = $raw_X->get_Section('Keyboard') || _new_keyboard_section($raw_X);
+    raw_import_section($raw_kbd, $kbd);
+    _set_Option('keyboard', $raw_kbd, keys %$kbd);
+}
+sub _new_keyboard_section {
+    my ($raw_X) = @_;
+    my $raw_kbd = { Identifier => { val => 'Keyboard1' }, Driver => { val => 'Keyboard' } };
+    $raw_X->add_Section('InputDevice', $raw_kbd);
+
+    my $layout = get_ServerLayout($raw_X)->{InputDevice} ||= [];
+    push @$layout, { val => '"Keyboard1" "CoreKeyboard"' };
+
+    $raw_kbd;
+}
+
+
+################################################################################
+# mouse ########################################################################
+################################################################################
+#- example: { Protocol => 'IMPS/2', Device => '/dev/psaux', Emulate3Buttons => undef, Emulate3Timeout => 50, ZAxisMapping => [ '4 5', '6 7' ] }
+my @mouse_fields = qw(Protocol Device ZAxisMapping Emulate3Buttons Emulate3Timeout); #-);
+sub get_mice {
+    my ($raw_X) = @_;
+    my @raw_mice = $raw_X->get_InputDevices('mouse');
+    map { raw_export_section($_, \@mouse_fields) } @raw_mice;
+}
+sub set_mice {
+    my ($raw_X, @mice) = @_;
+    my @raw_mice = _new_mouse_sections($raw_X, int @mice);
+    mapn { 
+	my ($raw_mouse, $mouse) = @_;
+	raw_import_section($raw_mouse, $mouse);
+	_set_Option('mouse', $raw_mouse, keys %$mouse);
+    } \@raw_mice, \@mice;
+}
+sub _new_mouse_sections {
+    my ($raw_X, $nb_new) = @_;
+    $raw_X->remove_InputDevices('mouse');
+    
+    my $layout = get_ServerLayout($raw_X)->{InputDevice} ||= [];
+    @$layout = grep { $_->{val} !~ /^"Mouse/ } @$layout;
+    
+    $nb_new or return;
+    
+    my @l = map {
+	my $h = { Identifier => { val => "Mouse$_" }, Driver => { val => 'mouse' } };
+	$raw_X->add_Section('InputDevice', $h);
+    } (1 .. $nb_new);
+    
+    push @$layout, { val => qq("Mouse1" "CorePointer") };
+    push @$layout, { val => qq("Mouse$_" "SendCoreEvents") } foreach 2 .. $nb_new;
+    
+    @l;
+}
+
+
+################################################################################
+# resolution ###################################################################
+################################################################################
+sub get_resolution {
+    my ($raw_X, $o_Screen) = @_;
+    my $Screen = $o_Screen || $raw_X->get_default_screen or return {};
+    
+    my $depth = val($Screen->{DefaultColorDepth});
+    my $Display = find { !$depth || val($_->{l}{Depth}) eq $depth } @{$Screen->{Display} || []} or return {};
+    $Display->{l}{Virtual} && val($Display->{l}{Virtual}) =~ /(\d+)\s+(\d+)/ or
+      val($Display->{l}{Modes}) =~ /(\d+)x(\d+)/ or return {};
+    { X => $1, Y => $2, Depth => val($Display->{l}{Depth}) };
+}
+sub set_resolution {
+    my ($raw_X, $resolution, $o_Screen_) = @_;
+    
+    foreach my $Screen ($o_Screen_ ? $o_Screen_ : $raw_X->get_Sections('Screen')) {
+	$Screen ||= $raw_X->get_default_screen or internal_error('no screen');
+	
+	$Screen->{DefaultColorDepth} = { val => $resolution->{Depth} eq '32' ? 24 : $resolution->{Depth} };
+	$Screen->{Display} = [ map {
+	    { l => { Depth => { val => $_ }, Virtual => { val => join(' ', @$resolution{'X', 'Y'}) } } };
+	} 8, 15, 16, 24 ];
+    }
+}
+
+
+################################################################################
+# device #######################################################################
+################################################################################
+my @device_fields = qw(VendorName BoardName Driver VideoRam Screen BusID); #-);
+sub get_device {
+    my ($raw_X) = @_;
+    first(get_devices($raw_X));
+}
+sub get_devices {
+    my ($raw_X) = @_;
+    my @raw_devices = $raw_X->get_Sections('Device');
+    map {
+	my $raw_device = $_;
+	my $device = raw_export_section($raw_device, [ 'Identifier', @device_fields ]);
+	$device->{Options} = raw_export_section($raw_device, [ grep { (deref_array($raw_device->{$_}))[0]->{Option} } keys %$raw_device ]);
+	$device;
+    } @raw_devices;
+}
+sub set_devices {
+    my ($raw_X, @devices) = @_;
+    my @raw_devices = _new_device_sections($raw_X, int @devices);
+    mapn { 
+	my ($raw_device, $device) = @_;
+	my %Options  = %{$device->{Options} || {}};
+	raw_import_section($raw_device, $device, \@device_fields);
+	raw_import_section($raw_device, \%Options);
+	$_->{Option} = 1 foreach map { deref_array($raw_device->{$_}) } keys %Options;
+	$raw_device->{''} = [ { post_comment => $device->{raw_LINES} } ] if $device->{raw_LINES};
+    } \@raw_devices, \@devices;
+}
+sub _new_device_sections {
+    my ($raw_X, $nb_new) = @_;
+    $raw_X->remove_Section('Device');
+    map { $raw_X->add_Section('Device', { Identifier => { val => "device$_" }, DPMS => { Option => 1 } }) } (1 .. $nb_new);
+}
+
+
+################################################################################
+# wacoms #######################################################################
+################################################################################
+sub set_wacoms {
+    my ($raw_X, @wacoms) = @_;
+    $raw_X->remove_InputDevices('wacom');
+    
+    my $layout = get_ServerLayout($raw_X)->{InputDevice} ||= [];
+    @$layout = grep { $_->{val} !~ /^"(Stylus|Eraser|Cursor)/ } @$layout;
+    
+    @wacoms or return;
+    
+    my %Modes = (Stylus => 'Absolute', Eraser => 'Absolute', Cursor => 'Relative');
+    
+    each_index {
+	my $wacom = $_;
+	foreach (keys %Modes) {
+	    my $identifier = $_ . ($::i + 1);
+	    my $h = { Identifier => { val => $identifier }, 
+		      Driver => { val => 'wacom' },
+		      Type => { val => lc $_, Option => 1 },
+		      Device => { val => $wacom->{Device}, Option => 1 },
+		      Mode => { val => $Modes{$_}, Option => 1 },
+		      if_($wacom->{USB}, USB => { Option => 1 })
+		    };
+	    $raw_X->add_Section('InputDevice', $h);
+	    push @$layout, { val => qq("$identifier" "AlwaysCore") };
+	}
+    } @wacoms;
+}
+
+
+################################################################################
+# monitor ######################################################################
+################################################################################
+my @monitor_fields = qw(VendorName ModelName HorizSync VertRefresh);
+sub get_monitors {
+    my ($raw_X) = @_;
+    my @raw_monitors = $raw_X->get_Sections('Monitor');
+    map { raw_export_section($_, [ 'Identifier', @monitor_fields ]) } @raw_monitors;
+}
+sub set_monitors {
+    my ($raw_X, @monitors) = @_;
+    my @raw_monitors = _new_monitor_sections($raw_X, int @monitors);
+    mapn { 
+	my ($raw_monitor, $monitor) = @_;
+	raw_import_section($raw_monitor, $monitor, \@monitor_fields);
+    } \@raw_monitors, \@monitors;
+}
+sub get_monitor {
+    my ($raw_X) = @_;
+    $raw_X->get_monitors or _new_monitor_sections($raw_X, 1);
+    first($raw_X->get_monitors);
+}
+sub _new_monitor_sections {
+    my ($raw_X, $nb_new) = @_;
+    my $ModeLine = ModeLine_from_string(qq(Section "Monitor"\n) . (our $default_ModeLine) . qq(EndSection\n));
+    $raw_X->remove_Section('Monitor');
+    map { $raw_X->add_Section('Monitor', { Identifier => { val => "monitor$_" }, ModeLine => $ModeLine }) } (1 .. $nb_new);
+}
+
+
+################################################################################
+# screens ######################################################################
+################################################################################
+sub get_default_screen {
+    my ($raw_X) = @_;
+    my @l = $raw_X->get_Sections('Screen');
+    (find { $_->{Identifier} && val($_->{Identifier}) eq 'screen1' || 
+	      $_->{Driver} && val($_->{Driver}) =~ /svga|accel/ } @l) || $l[0];
+}
+sub set_screens {
+    my ($raw_X, @screens) = @_;
+    my @raw_screens = _new_screen_sections($raw_X, int @screens);
+    mapn { 
+	my ($raw_screen, $screen) = @_;
+	raw_import_section($raw_screen, $screen);
+    } \@raw_screens, \@screens;
+}
+sub _new_screen_sections {
+    my ($raw_X, $nb_new) = @_;
+    $raw_X->remove_Section('Screen');
+    my @l = map { $raw_X->add_Section('Screen', { Identifier => { val => "screen$_" } }) } (1 .. $nb_new);
+
+    get_ServerLayout($raw_X)->{Screen} = [ 
+	{ val => qq("screen1") },
+	map { { val => sprintf('"screen%d" RightOf "screen%d"', $_, $_ - 1) } } (2 .. $nb_new)
+    ];
+    @l;
+}
+sub is_fbdev {
+    my ($raw_X, $o_Screen) = @_;
+
+    my $Screen = $o_Screen || $raw_X->get_default_screen or return;
+
+    my $Device = $raw_X->get_Section_by_Identifier('Device', val($Screen->{Device})) or internal_error("no device named $Screen->{Device}");
+    val($Device->{Driver}) eq 'fbdev';
 }
 
-sub get_keyboard { get_both('get_keyboard', @_) }
-sub set_keyboard { set_both('set_keyboard', @_) }
-sub get_mice     { get_both('get_mice', @_) }
-sub set_mice     { set_both('set_mice', @_) }
 
-sub get_resolution { get_both('get_resolution', @_) }
-sub set_resolution { set_both('set_resolution', @_) }
 
-sub get_device   { get_both('get_device', @_) }
-sub get_devices  { get_both('get_devices', @_) }
-sub set_devices  { set_both('set_devices', @_) }
 
-sub set_wacoms { set_both('set_wacoms', @_) }
+################################################################################
+# modules ######################################################################
+################################################################################
+sub get_modules {
+    my ($raw_X) = @_;
+    my $raw_Module = $raw_X->get_Section('Module') or return;
+    my $Module = raw_export_section($raw_Module, ['Load']);
+    @{$Module->{Load} || []};
+}
+sub add_load_module {
+    my ($raw_X, $module) = @_;
+    my $raw_Module = $raw_X->get_Section('Module') || $raw_X->add_Section('Module', {});
 
-sub get_monitor  { get_both('get_monitor', @_) }
-sub get_monitors { get_both('get_monitors', @_) }
-sub set_monitors { set_both('set_monitors', @_) }
+    my %load_modules_comment = (
+	dbe => 'Double-Buffering Extension',
+	v4l => 'Video for Linux',
+	dri => 'direct rendering',
+	glx => '3D layer',
+	'glx-3.so' => '3D layer',
+    );
+    my $comment = $load_modules_comment{$module};
+    push @{$raw_Module->{Load}}, { val => $module,
+				   comment_on_line => $comment && " # $comment",
+				 } if !member($module, $raw_X->get_modules);
+}
+sub remove_load_module {
+    my ($raw_X, $module) = @_;
+    my $raw_Module = $raw_X->get_Section('Module') or return;
+    if (my @l = grep { $_->{val} ne $module } @{$raw_Module->{Load}}) {
+	$raw_Module->{Load} = \@l;
+    } else {
+	$raw_X->remove_Section('Module');
+    }
+}
+sub set_load_module {
+    my ($raw_X, $module, $bool) = @_;
+    $bool ? add_load_module($raw_X, $module) : remove_load_module($raw_X, $module);
+}
 
-sub is_fbdev { get_both('is_fbdev', @_) }
 
 #-##############################################################################
 #- helpers
 #-##############################################################################
-sub get_both {
-    my ($getter, $both) = @_;
-
-    if (is_empty_array_ref($both->{xfree3})) {
-	$both->{xfree4}->$getter;
-    } elsif (is_empty_array_ref($both->{xfree4})) {
-	$both->{xfree3}->$getter;
-    } else {
-	my @l3 = $both->{xfree3}->$getter;
-	my @l4 = $both->{xfree4}->$getter;
-	merge_values(\@l3, \@l4);
+sub _set_Option {
+    my ($category, $node, @names) = @_;
+    
+    if (member($category, 'keyboard', 'mouse')) {
+	#- everything we export is an Option
+	$_->{Option} = 1 foreach map { deref_array($node->{$_}) } @names;
     }
 }
-sub set_both {
-    my ($setter, $both, @l) = @_;
-
-    $both->{xfree3}->$setter(@l) if !is_empty_array_ref($both->{xfree3});
-    $both->{xfree4}->$setter(@l) if !is_empty_array_ref($both->{xfree4});
-}
-
-sub merge_values {
-    my ($l3, $l4) = @_;
-
-    sub merge_values__hashes {
-	my ($h3, $h4) = @_;
-	$h3 || $h4 or return;
-	$h3 or return $h4;
-	$h4 or return $h3;
-
-	my %h = %$h4;
-	foreach (keys %$h3) {
-	    if (exists $h{$_}) {
-		if (ref($h{$_}) eq 'HASH' && ref($h3->{$_}) eq 'HASH') {
-		    #- needed for "Options" of Devices
-		    $h{$_} = +{ %{$h3->{$_}}, %{$h{$_}} };
-		} else {
-		    my $s4  = join(", ", deref_array($h{$_}));
-		    my $s3  = join(", ", deref_array($h3->{$_}));
-		    my $s3_ = join(", ", map { qq("$_") } deref_array($h3->{$_}));
-		    if ($s4 eq $s3_) {
-			#- keeping the non-double-quoted value
-			$h{$_} = $h3->{$_};
-		    } else {
-			$s4 eq $s3 or log::l(qq(XFree: conflicting value for $_, "$s4" and "$s3" are different));
-		    }
-		}
-	    } else {
-		$h{$_} = $h3->{$_};
-	    }
-	}
-	\%h;
+
+sub get_InputDevices {
+    my ($raw_X, $Driver) = @_;
+    $raw_X->get_Sections('InputDevice', sub { val($_[0]{Driver}) eq $Driver });
+}
+sub remove_InputDevices {    
+    my ($raw_X, $Driver) = @_;
+    $raw_X->remove_Section('InputDevice', sub { val($_[0]{Driver}) ne $Driver });
+}
+
+sub get_ServerLayout {
+    my ($raw_X) = @_;
+    $raw_X->get_Section('ServerLayout') ||
+      $raw_X->add_Section('ServerLayout', { Identifier => { val => 'layout1' } });
+}
+
+#-##############################################################################
+#- helpers
+#-##############################################################################
+sub raw_export_section {
+    my ($section, $fields) = @_;
+
+    my $export_name = sub {
+	my ($name) = @_;
+	my $h = $section->{$name} or return;
+
+	my @l = map { if_(!$_->{commented}, $_->{val}) } deref_array($h) or return;    
+	$name => (ref($h) eq 'ARRAY' ? \@l : $l[0]);
+    };
+
+    my %h = map { $export_name->($_) } @$fields;
+    \%h;
+}
+
+sub raw_import_section {
+    my ($section, $h, $o_fields) = @_;
+    foreach ($o_fields ? grep { exists $h->{$_} } @$o_fields : keys %$h) {
+	my @l = map { ref($_) eq 'HASH' ? $_ : { val => $_ } } deref_array($h->{$_});
+	$section->{$_} = (ref($h->{$_}) eq 'ARRAY' ? \@l : $l[0]);
     }
+}
 
-    my @r = mapn_(\&merge_values__hashes, $l3, $l4);
+sub add_Section {
+    my ($raw_X, $Section, $h) = @_;
+    my @suggested_ordering = qw(Files ServerFlags Module DRI Keyboard Pointer XInput InputDevice Monitor Device Screen ServerLayout);
+    my %order = map_index { { lc($_) => $::i } } @suggested_ordering;
+    my $e = { name => $Section, l => $h };
+    my $added;
+    @$raw_X = map { 
+	if ($order{lc $_->{name}} > $order{lc $Section} && !$added) {
+	    $added = 1;
+	    ($e, $_);
+	} else { $_ }
+    } @$raw_X;
+    push @$raw_X, $e if !$added;
+    $h;
+}
+sub remove_Section {
+    my ($raw_X, $Section, $o_when) = @_;
+    @$raw_X = grep { $_->{name} ne $Section || $o_when && $o_when->($_->{l}) } @$raw_X;
+    $raw_X;
+}
+sub get_Sections {
+    my ($raw_X, $Section, $o_when) = @_;
+    map { if_($_->{name} eq $Section && (!$o_when || $o_when->($_->{l})), $_->{l}) } @$raw_X;
+}
+sub get_Section {
+    my ($raw_X, $Section, $o_when) = @_;
+    my @l = get_Sections($raw_X, $Section, $o_when);
+    @l > 1 and log::l("Xconfig: found more than one Section $Section");
+    $l[0];
+}
+sub get_Section_by_Identifier {
+    my ($raw_X, $Section, $Identifier) = @_;
+    my @l = get_Sections($raw_X, $Section, sub { val($_[0]{Identifier}) eq $Identifier });
+    @l > 1 and die "more than one Section $Section has Identifier $Identifier";
+    $l[0];
+}
 
-    @r == 1 ? $r[0] : @r;
+sub val {
+    my ($ref) = @_;
+    $ref && $ref->{val};
 }
 
+
+sub ModeLine_from_string {
+    my ($s) = @_;
+    my $raw_X_for_ModeLine = Xconfig::parse::read_XF86Config_from_string($s);
+    get_Section($raw_X_for_ModeLine, 'Monitor')->{ModeLine};
+}
+
+
+
+our @resolutions = ('640x480', '800x600', '1024x768', if_(arch() =~ /ppc/, '1152x768'), '1152x864', '1280x960', '1280x1024', '1400x1050', '1600x1200', '1920x1440', '2048x1536');
+
+our $default_header = <<'END';
+# File generated by XFdrake.
+
+# **********************************************************************
+# Refer to the XF86Config man page for details about the format of
+# this file.
+# **********************************************************************
+
+Section "Files"
+    # Multiple FontPath entries are allowed (they are concatenated together)
+    # By default, Mandrake 6.0 and later now use a font server independent of
+    # the X server to render fonts.
+    FontPath "unix/:-1"
+EndSection
+
+Section "ServerFlags"
+    #DontZap # disable <Crtl><Alt><BS> (server abort)
+    #DontZoom # disable <Crtl><Alt><KP_+>/<KP_-> (resolution switching)
+    AllowMouseOpenFail # allows the server to start up even if the mouse doesn't work
+EndSection
+END
+
+our $default_ModeLine = arch() =~ /ppc/ ? <<'END_PPC' : <<'END';
+    # Apple iMac modes
+    ModeLine "1024x768"   78.525 1024 1049 1145 1312   768  769  772  800 +hsync +vsync
+    ModeLine "800x600"    62.357  800  821  901 1040   600  601  604  632 +hsync +vsync
+    ModeLine "640x480"    49.886  640  661  725  832   480  481  484  514 +hsync +vsync
+    # Apple monitors tend to do 832x624
+    ModeLine "832x624"    57      832  876  940 1152   624  625  628  667 -hsync -vsync
+    # Apple PowerBook G3
+    ModeLine "800x600"    100     800  816  824  840   600  616  624  640 -hsync -vsync
+    # Apple TI Powerbook 
+    ModeLine "1152x768"   78.741 1152 1173 1269 1440   768  769  772  800 +vsync +vsync
+    # Pismo Firewire G3   
+    ModeLine "1024x768"   65     1024 1032 1176 1344   768  771  777  806 -hsync -vsync
+    # iBook2
+    ModeLine "1024x768"   65     1024 1048 1184 1344   768  771  777  806 -hsync -vsync
+    # 17" Apple Studio Display
+    ModeLine "1024x768"   112.62 1024 1076 1248 1420 768 768 780 808 +hsync +vsync
+    # HiRes Apple Studio Display
+    ModeLine "1280x1024"  135    1280 1288 1392 1664  1024 1027 1030 1064
+    # Another variation
+    ModeLine "1280x1024"  134.989 1280 1317 1429 1688  1024 1025 1028 1066 +hsync +vsync
+END_PPC
+    # Sony Vaio C1(X,XS,VE,VN)?
+    # 1024x480 @ 85.6 Hz, 48 kHz hsync
+    ModeLine "1024x480"    65.00 1024 1032 1176 1344   480  488  494  563 -hsync -vsync
+    
+    # TV fullscreen mode or DVD fullscreen output.
+    # 768x576 @ 79 Hz, 50 kHz hsync
+    ModeLine "768x576"     50.00  768  832  846 1000   576  590  595  630
+    # 768x576 @ 100 Hz, 61.6 kHz hsync
+    ModeLine "768x576"     63.07  768  800  960 1024   576  578  590  616
+END
+
 1;