summaryrefslogtreecommitdiffstats
path: root/perl-install/install_gtk.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-12 14:53:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-12 14:53:42 +0000
commit7fcb6cc30e6264865a66551a2ab9cca3dc089c64 (patch)
tree4c9ae99febde2cd144d0be8380f354d98dded034 /perl-install/install_gtk.pm
parent035cb5489a0115eca20ca0891ea0dde602449c79 (diff)
downloaddrakx-7fcb6cc30e6264865a66551a2ab9cca3dc089c64.tar
drakx-7fcb6cc30e6264865a66551a2ab9cca3dc089c64.tar.gz
drakx-7fcb6cc30e6264865a66551a2ab9cca3dc089c64.tar.bz2
drakx-7fcb6cc30e6264865a66551a2ab9cca3dc089c64.tar.xz
drakx-7fcb6cc30e6264865a66551a2ab9cca3dc089c64.zip
XFree4 during install
Diffstat (limited to 'perl-install/install_gtk.pm')
-rw-r--r--perl-install/install_gtk.pm122
1 files changed, 4 insertions, 118 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 5270220e3..e2ffed9d6 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -245,7 +245,7 @@ sub createXconf {
symlink("/tmp/stage2/etc/im_palette.pal", "etc/im_palette.pal");
if ($Driver) {
- output($file, sprintf(<<'END', $mouse_type, $Driver));
+ output($file, sprintf(<<'END', $mouse_type, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
Section "Files"
FontPath "/usr/X11R6/lib/X11/fonts:unscaled"
@@ -264,6 +264,7 @@ Section "InputDevice"
Driver "mouse"
Option "Protocol" "%s"
Option "Device" "/dev/mouse"
+ Option "ZAxisMapping" "4 5"
EndSection
Section "Monitor"
@@ -284,7 +285,7 @@ Section "Screen"
DefaultColorDepth 16
Subsection "Display"
Depth 16
- Modes "800x600" "640x480"
+ Modes %s
EndSubsection
EndSection
@@ -296,122 +297,7 @@ Section "ServerLayout"
EndSection
END
-
-
-} else {
-
- my $wacom;
- if ($wacom_dev) {
- my $dev = devices::make($wacom_dev);
- $wacom = <<END;
-Section "Module"
- Load "xf86Wacom.so"
-EndSection
-
-Section "XInput"
- SubSection "WacomStylus"
- Port "$dev"
- AlwaysCore
- EndSubSection
- SubSection "WacomCursor"
- Port "$dev"
- AlwaysCore
- EndSubSection
- SubSection "WacomEraser"
- Port "$dev"
- AlwaysCore
- EndSubSection
-EndSection
-END
- }
-
- output($file, <<END);
-Section "Files"
- FontPath "/usr/X11R6/lib/X11/fonts:unscaled"
-EndSection
-
-Section "Keyboard"
- Protocol "Standard"
- AutoRepeat 0 0
-
- LeftAlt Meta
- RightAlt Meta
- ScrollLock Compose
- RightCtl Control
- XkbDisable
-EndSection
-
-Section "Pointer"
- Protocol "$mouse_type"
- Device "/dev/mouse"
- ZAxisMapping 4 5
-EndSection
-
-$wacom
-
-Section "Monitor"
- Identifier "monitor"
- HorizSync 31.5-35.5
- VertRefresh 50-70
- ModeLine "640x480" 25.175 640 664 760 800 480 491 493 525
- ModeLine "640x480" 28.3 640 664 760 800 480 491 493 525
- ModeLine "800x600" 36 800 824 896 1024 600 601 603 625
-EndSection
-
-
-Section "Device"
- Identifier "Generic VGA"
- Chipset "generic"
-EndSection
-
-Section "Device"
- Identifier "svga"
-EndSection
-
-Section "Screen"
- Driver "vga16"
- Device "Generic VGA"
- Monitor "monitor"
- Subsection "Display"
- Modes "640x480"
- ViewPort 0 0
- EndSubsection
-EndSection
-
-Section "Screen"
- Driver "fbdev"
- Device "Generic VGA"
- Monitor "monitor"
- Subsection "Display"
- Depth 16
- Modes "default"
- ViewPort 0 0
- EndSubsection
-EndSection
-
-Section "Screen"
- Driver "svga"
- Device "svga"
- Monitor "monitor"
- Subsection "Display"
- Depth 16
- Modes "800x600" "640x480"
- ViewPort 0 0
- EndSubsection
-EndSection
-
-Section "Screen"
- Driver "accel"
- Device "svga"
- Monitor "monitor"
- Subsection "Display"
- Depth 16
- Modes "800x600" "640x480"
- ViewPort 0 0
- EndSubsection
-EndSection
-END
-}
+ }
}
1;