summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-02-06 17:20:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-02-06 17:20:40 +0000
commitbf034b9f3c4ea46fb42a081b526b4550fe2a375b (patch)
tree62670934fb76909c21a19cc353bdbee7f8fa5ecf /perl-install
parent2746a6460465e06de266196f4e090ab2d327743c (diff)
downloaddrakx-bf034b9f3c4ea46fb42a081b526b4550fe2a375b.tar
drakx-bf034b9f3c4ea46fb42a081b526b4550fe2a375b.tar.gz
drakx-bf034b9f3c4ea46fb42a081b526b4550fe2a375b.tar.bz2
drakx-bf034b9f3c4ea46fb42a081b526b4550fe2a375b.tar.xz
drakx-bf034b9f3c4ea46fb42a081b526b4550fe2a375b.zip
use mouse::change_mouse_live()
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps_gtk.pm13
1 files changed, 1 insertions, 12 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index dc037b6b9..f3abe2110 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -193,18 +193,7 @@ sub selectMouse {
local $ugtk2::grab = 1; #- unsure a crazy mouse don't go wild clicking everywhere
while (1) {
- my $xId = mouse::xmouse2xId($mouse->{XMOUSETYPE});
- my $x_protocol_changed = $old{device} ne $mouse->{device} || $xId != mouse::xmouse2xId($old{XMOUSETYPE});
- if ($x_protocol_changed) {
- log::l("telling X server to use another mouse ($mouse->{XMOUSETYPE}, $xId)");
- eval { modules::load('serial') } if $mouse->{device} =~ /ttyS/;
-
- if (!$::testing) {
- devices::make($mouse->{device});
- symlinkf($mouse->{device}, "/dev/mouse");
- c::setMouseLive($ENV{DISPLAY}, $xId, $mouse->{nbuttons} < 3);
- }
- }
+ my $x_protocol_changed = mouse::change_mouse_live($mouse, \%old);
mouse::test_mouse_install($mouse, $x_protocol_changed) and return;
%old = %$mouse;