diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-09-03 08:38:23 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-09-03 08:38:23 +0000 |
| commit | 3ccb7a706f6977fb9b0631e64bfc705299766981 (patch) | |
| tree | 81878237c71757a5a8f42db37d9a4d56423c7f4d | |
| parent | 95de1050aa3b54be4c13ad63c5d504348b46b733 (diff) | |
| download | drakx-3ccb7a706f6977fb9b0631e64bfc705299766981.tar drakx-3ccb7a706f6977fb9b0631e64bfc705299766981.tar.gz drakx-3ccb7a706f6977fb9b0631e64bfc705299766981.tar.bz2 drakx-3ccb7a706f6977fb9b0631e64bfc705299766981.tar.xz drakx-3ccb7a706f6977fb9b0631e64bfc705299766981.zip | |
(set_xfree_conf) synaptics fixes
| -rw-r--r-- | perl-install/mouse.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 79ca7a024..2478cc871 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -365,7 +365,8 @@ sub set_xfree_conf { my ($mouse, $xfree_conf, $b_keep_auxmouse_unchanged) = @_; my ($synaptics, $mouse_) = partition { $_->{name} eq N_("Synaptics Touchpad") } - @{[ $mouse, if_(!is_empty_hash_ref $mouse->{auxmouse}, $mouse->{auxmouse}) ]}; + ($mouse, if_(!is_empty_hash_ref($mouse->{auxmouse}), $mouse->{auxmouse})); + undef $mouse->{auxmouse} if ($synaptics && $synaptics == $mouse->{auxmouse}); my @mice = map { { Protocol => $_->{XMOUSETYPE}, @@ -375,7 +376,7 @@ sub set_xfree_conf { if_($_->{EMULATEWHEEL}, Emulate3Buttons => undef, Emulate3Timeout => 50, EmulateWheel => undef, EmulateWheelButton => 2), }; } @$mouse_; - + if (!$mouse->{auxmouse} && $b_keep_auxmouse_unchanged) { my (undef, @l) = $xfree_conf->get_mice; push @mice, @l; |