diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-11-22 16:04:51 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-11-22 16:04:51 +0000 |
| commit | 900a7894c85fbf8ca23804ee69e8d38d0c2b35ff (patch) | |
| tree | dff0c61e39ab575df678bec9e05d8ce26d25ef2e | |
| parent | b3c58cca6cc9191ad429f6a18471b2e9799a82fb (diff) | |
| download | drakx-900a7894c85fbf8ca23804ee69e8d38d0c2b35ff.tar drakx-900a7894c85fbf8ca23804ee69e8d38d0c2b35ff.tar.gz drakx-900a7894c85fbf8ca23804ee69e8d38d0c2b35ff.tar.bz2 drakx-900a7894c85fbf8ca23804ee69e8d38d0c2b35ff.tar.xz drakx-900a7894c85fbf8ca23804ee69e8d38d0c2b35ff.zip | |
incorporate 8.2 HP fixes back in cooker.
| -rw-r--r-- | perl-install/mouse.pm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index dd34ff2de..04acaad88 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -41,7 +41,7 @@ my %mice = 'USB' => [ [ 'usbmouse' ], - [ if_(arch() eq 'ppc', [ 1, 'ps/2', 'PS/2', N_("1 button") ]), + [ [ 1, 'ps/2', 'PS/2', N_("1 button") ], [ 2, 'ps/2', 'PS/2', N_("Generic 2 Button Mouse") ], [ 3, 'ps/2', 'PS/2', N_("Generic") ], [ 5, 'ps/2', 'IMPS/2', N_("Wheel") ], @@ -269,6 +269,12 @@ sub detect() { my $fast_mouse_probe = sub { my $auxmouse = detect_devices::hasMousePS2("psaux") && fullname2mouse("PS/2|Standard", unsafe => 1); + #- workaround for some special case were mouse is openable 1/2. + unless ($auxmouse) { + $auxmouse = detect_devices::hasMousePS2("psaux") && fullname2mouse("PS/2|Generic PS2 Wheel Mouse", unsafe => 0); + $auxmouse and detect_devices::hasMousePS2("psaux"); #- fake another open in order for XFree to see the mouse. + } + if (modules::get_probeall("usb-interface")) { if (my (@l) = detect_devices::usbMice()) { log::l("found usb mouse $_->{driver} $_->{description} ($_->{type})") foreach @l; |