summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_gtk.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-19 17:31:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-19 17:31:21 +0000
commit190150fae69cd0b7839b7f36c8139fff9079bb7f (patch)
treed86bdbe017c049bdb81452a67a5e7d915b46fdc0 /perl-install/install_steps_gtk.pm
parent25a532696b1a761d02d03bdbe7076258ca370fd3 (diff)
downloaddrakx-190150fae69cd0b7839b7f36c8139fff9079bb7f.tar
drakx-190150fae69cd0b7839b7f36c8139fff9079bb7f.tar.gz
drakx-190150fae69cd0b7839b7f36c8139fff9079bb7f.tar.bz2
drakx-190150fae69cd0b7839b7f36c8139fff9079bb7f.tar.xz
drakx-190150fae69cd0b7839b7f36c8139fff9079bb7f.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
-rw-r--r--perl-install/install_steps_gtk.pm19
1 files changed, 7 insertions, 12 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 4562bc127..6144af723 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -168,29 +168,24 @@ sub selectInstallClass1 {
#------------------------------------------------------------------------------
sub selectMouse {
my ($o, $force) = @_;
-
- my $set = sub {
- my ($mouse) = @_;
- symlinkf($mouse->{device}, "/dev/mouse");
- c::setMouseLive($ENV{DISPLAY}, mouse::xmouse2xId($mouse->{XMOUSETYPE}));
- };
-
my %old = %{$o->{mouse}};
$o->SUPER::selectMouse($force);
- $old{type} eq $o->{mouse}{type} && $old{name} eq $o->{mouse}{name} && !$force and return;
+ my $mouse = $o->{mouse};
+ $old{type} eq $mouse->{type} && $old{name} eq $mouse->{name} && !$force and return;
local $my_gtk::grab = 1; #- unsure a crazy mouse don't go wild clicking everywhere
while (1) {
log::l("telling X server to use another mouse");
- eval { modules::load('serial') } if $o->{mouse}{device} =~ /ttyS/;
+ eval { modules::load('serial') } if $mouse->{device} =~ /ttyS/;
if (!$::testing) {
- symlinkf($o->{mouse}{device}, "/dev/mouse");
- c::setMouseLive($ENV{DISPLAY}, mouse::xmouse2xId($o->{mouse}{XMOUSETYPE}));
+ symlinkf($mouse->{device}, "/dev/mouse");
+ c::setMouseLive($ENV{DISPLAY}, mouse::xmouse2xId($mouse->{XMOUSETYPE}), $mouse->{nbuttons} < 3);
}
- install_gtk::test_mouse($o->{mouse}) and return;
+ install_gtk::test_mouse($mouse) and return;
$o->SUPER::selectMouse(1);
+ $mouse = $o->{mouse};
}
}