From 864ae695ac0afaea3aae86dd8d21f2a21e779ee2 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 22 Apr 2009 11:09:46 +0000
Subject: (createXconf) split out mouse section (needed for next commit)

---
 perl-install/install/gtk.pm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'perl-install/install/gtk.pm')

diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index 6aa6a8c95..5c723d05f 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -263,7 +263,17 @@ sub createXconf {
     symlink("/tmp/stage2/etc/X11", "/etc/X11");
 
 if ($Driver) {
-     output($file, sprintf(<<'END', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
+    my $mouse_section = sprintf(<<'END', $mouse_type);
+Section "InputDevice"
+    Identifier "Mouse"
+    Driver "mouse"
+    Option "Protocol" "%s"
+    Option "Device" "/dev/mouse"
+    Option "ZAxisMapping" "4 5"
+EndSection
+END
+
+     output($file, sprintf(<<'END', $mouse_section, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
 Section "ServerFlags"
    Option "AutoAddDevices" "False"
 EndSection
@@ -279,13 +289,7 @@ Section "InputDevice"
     Option "XkbLayout" "us"
 EndSection
 
-Section "InputDevice"
-    Identifier "Mouse"
-    Driver "mouse"
-    Option "Protocol" "%s"
-    Option "Device" "/dev/mouse"
-    Option "ZAxisMapping" "4 5"
-EndSection
+%s
 
 Section "Monitor"
     Identifier "monitor"
-- 
cgit v1.2.1