- switch "<= 3 buttons usb mice" from X protocol PS/2 to IMPS/2 (it works

nicely, and redhat do so)
- default usb mice to USB|Wheel instead of USB|Generic, since most (all?) usb
mice have a wheel

(i tested on 1 button mac mouse, it works nicely with ZAxisMapping and IMPS/2)

1 files changed, 4 insertions, 4 deletions

diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 01e46badc..6db3de123 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -41,9 +41,9 @@ my %mice =
      
  'USB' =>
  [ [ 'usbmouse' ],
-   [ [ 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") ],
+   [ [ 1, 'ps/2', 'IMPS/2', N_("1 button") ],
+     [ 2, 'ps/2', 'IMPS/2', N_("Generic 2 Button Mouse") ],
+     [ 3, 'ps/2', 'IMPS/2', N_("Generic") ],
      [ 5, 'ps/2', 'IMPS/2', N_("Wheel") ],
      [ 7, 'ps/2', 'ExplorerPS/2', N_("Microsoft Explorer") ],
    ] ],
@@ -264,7 +264,7 @@ sub detect() {
 		log::l("found usb mouse $_->{driver} $_->{description} ($_->{type})") foreach @l;
 		eval { modules::load(qw(hid mousedev usbmouse)) };
 		if (!$@ && detect_devices::tryOpen("usbmouse")) {
-		    my $mouse = fullname2mouse($l[0]{driver} =~ /Mouse:(.*)/ ? $1 : "USB|Generic");
+		    my $mouse = fullname2mouse($l[0]{driver} =~ /Mouse:(.*)/ ? $1 : "USB|Wheel");
 		    $auxmouse and $mouse->{auxmouse} = $auxmouse; #- for laptop, we kept the PS/2 as secondary (symbolic).
 		    return $mouse;
 		}