From ba79d9c8b00ce6a0a42a5f56b6e68967efe47f37 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sat, 20 Jul 2002 21:42:34 +0000 Subject: - rename updateCardAccordingName into add_to_card__using_Cards - rename cardConfigurationAuto into probe_cards - cleanup the simple XF86Config used during install --- perl-install/install_gtk.pm | 136 ++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 94 deletions(-) diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index 7dcc90931..0c895eda1 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -222,71 +222,56 @@ sub createXconf { if (arch() =~ /^ia64/) { require Xconfigurator; - my ($card) = Xconfigurator::cardConfigurationAuto(); - Xconfigurator::updateCardAccordingName($card, $card->{type}) if $card && $card->{type}; - local *F; - open F, ">$file" or die "can't create X configuration file $file"; - print F <{type}) if $card && $card->{type}; + output($file, <{driver}" EndSection Section "Screen" - Identifier "screen1" - Device "device1" - Monitor "Generic|High Frequency SVGA, 1024x768 at 70 Hz" + Identifier "screen" + Device "device" + Monitor "monitor" DefaultColorDepth 16 Subsection "Display" - Depth 16 - Modes "800x600" "640x480" - ViewPort 0 0 + Depth 16 + Modes "800x600" "640x480" EndSubsection EndSection Section "ServerLayout" - Identifier "layout1" - Screen "screen1" - InputDevice "Mouse1" "CorePointer" - InputDevice "Keyboard1" "CoreKeyboard" + Identifier "layout" + Screen "screen" + InputDevice "Mouse" "CorePointer" + InputDevice "Keyboard" "CoreKeyboard" EndSection END @@ -296,10 +281,9 @@ END else { - my $wacom; if ($wacom_dev) { - $wacom_dev = devices::make($wacom_dev); + my $dev = devices::make($wacom_dev); $wacom = <$file" or die "can't create X configuration file $file"; - print F <