From c23074d2db91471542cb41dcaa94510127294f56 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 30 Sep 2004 04:47:52 +0000
Subject: list all mice and keyboards (thus lowering unknown hardware in
 hwdb-clients)

---
 perl-install/harddrake/data.pm | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

(limited to 'perl-install/harddrake')

diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 04e6a1406..c0ffa80d6 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -266,20 +266,6 @@ our @tree =
       checked_on_boot => 0,
      },
 
-     {
-      class => "MOUSE",
-      string => N("Mouse"),
-      icon => "hw_mouse.png",
-      configurator => "$sbindir/mousedrake",
-      detector => sub { 
-          require mouse;
-          require modules;
-          mouse::detect($modules_conf);
-      },
-      checked_on_boot => 1,
-      automatic => 1,
-     },
-
      {
       class => "JOYSTICK",
       string => N("Joystick"),
@@ -375,6 +361,31 @@ our @tree =
       checked_on_boot => 0,
      },
      
+     {
+      class => "KEYBOARD",
+      string => N("Keyboard"),
+      icon => "usb.png",
+      configurator => "$sbindir/keyboardrake",
+      detector => sub {
+          f(grep { $_->{description} =~ /Keyboard/i } @devices),
+          grep { $_->{bus} ne 'usb' && $_->{driver} eq 'kbd' } detect_devices::getInputDevices();
+      },
+      checked_on_boot => 0,
+     },
+
+     {
+      class => "MOUSE",
+      string => N("Mouse"),
+      icon => "hw_mouse.png",
+      configurator => "$sbindir/mousedrake",
+      detector => sub {
+          f(grep { $_->{driver} =~ /^Mouse:/ } @devices),
+            grep { $_->{bus} ne 'usb' && $_->{driver} =~ /mouse/ } detect_devices::getInputDevices();
+      },
+      checked_on_boot => 1,
+      automatic => 1,
+     },
+     
      {
       class => "SCANNER",
       string => N("Scanner"),
-- 
cgit v1.2.1