diff options
Diffstat (limited to 'perl-install/standalone/mousedrake')
| -rwxr-xr-x | perl-install/standalone/mousedrake | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index 2b646e334..852c5e612 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -5,28 +5,26 @@ use lib qw(/usr/lib/libDrakX); use common qw(:system); use interactive; use mouse; -use c; local $_ = join '', @ARGV; /-h/ and die "usage: mousedrake [--auto] [--noauto] [--testing]\n"; -$::auto = /-auto/; -$::noauto = /-noauto/; -$::testing = /-testing/; +$::auto = /--auto/; +$::noauto = /--noauto/; +$::testing = /--testing/; $::isStandalone = 1; -my $in = vnew interactive('su'); +my $in = vnew interactive; -my $mouse = eval { mouse::detect() } unless $::noauto; +my $mouse = mouse::detect() unless $::noauto; -if (!(my $name = $mouse && $mouse->{FULLNAME}) || !$::auto) { +if (!(my $name = $mouse->{FULLNAME}) || !$::auto) { $name ||= "Generic Mouse (serial)"; $name = $in->ask_from_list_('', _("What is the type of your mouse?"), [ mouse::names() ], $name); $mouse = mouse::name2mouse($name); if ($mouse->{device} eq "usbmouse") { - require pci_probing::main; my ($c) = pci_probing::main::probe("serial_usb") or die _("no serial_usb found\n"); eval { modules::load($c->[1], "serial_usb") }; } @@ -40,32 +38,14 @@ $mouse->{device} = mouse::serial_ports_names2dev( [ mouse::serial_ports_names() ])) if $mouse->{device} eq "ttyS"; mouse::write('', $mouse); -modules::write_conf('') if $mouse->{device} eq "usbmouse" && !$::testing; +modules::write_conf("/etc/conf.modules") if $mouse->{device} eq "usbmouse" && !$::testing; my $f = "/etc/X11/XF86Config"; -my $g = "/etc/X11/XF86Config-4"; - -my $zaxis = "\n ZAxisMapping 4 5" if $mouse->{nbuttons} > 3; - $zaxis .= "\n ZAxisMapping 6 7" if $mouse->{nbuttons} > 5; - $zaxis = " - Emulate3Buttons - Emulate3Timeout 50" if $mouse->{nbuttons} < 3; - substInFile { if (/^Section "Pointer"/ .. /^EndSection/) { - $_ = '' if /(ZAxisMapping|Emulate3)/; #- remove existing line - s|^(\s*Protocol\s+).*|$1"$mouse->{XMOUSETYPE}"|; - s|^(\s*Device\s+).*|$1"/dev/mouse"$zaxis|; + s|^(\s*Protocol\s+).*|$1 "$mouse->{XMOUSETYPE}"|; + s|^(\s*Device\s+).*|$1 "/dev/mouse"|; } } $f if -e $f && !$::testing; -$zaxis =~ s/(ZAxisMapping|Emulate3\w+)/Option "$1"/g; -substInFile { - if (/^Identifier "Mouse1"/ .. /^EndSection/) { - $_ = '' if /(ZAxisMapping|Emulate3)/; #- remove existing line - s|^(\s*Option\s+"Protocol"\s+).*|$1"$mouse->{XMOUSETYPE}"|; - s|^(\s*Option\s+"Device"\s+).*|$1"/dev/mouse"$zaxis|; - } -} $g if -e $g && !$::testing; - -$in->exit(0); +exec 'true' if ref($in) =~ /gtk/; #- workaround for perl-GTK |