From cc44241143f3ac2997e50f09b56a851ec5c1bdc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Mon, 10 Nov 2008 12:33:16 +0000 Subject: [PATCH] Prepend the mouse name with "Extended " if the device path contains "intelli". This makes sure that you can have an old style mouse without scroll wheel and one with attached at the same time. For example, when I hot-plug my PS/2 mouse with wheel, the IBM trackpoint will otherwise already use up the "PS/2 Mouse 1" name. Unfortunately, hot-plugging the PS/2 mouse on my T60 docking station still does not work quite right. The PS/2 driver detects everything correctly, the node monitoring works and I end up with the correct device threads in the input_server. (The notebook is automatically removing the touchpad and trackpoint devices in this event, which cannot be turned off in the BIOS.) However, the mouse does not move. In the syslog, I see one message "ps2: strange mouse data, x/y overflow, trying resync" after the the output from the add-on manager in the input_server that it has added the new device. When I restart the input_server, it works fine, even though the same devices are detected and polling threads are running. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28591 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp index d1b524e66e..cc2faefd57 100644 --- a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp +++ b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp @@ -269,6 +269,9 @@ MouseDevice::_BuildShortName() const else name.Capitalize(); + if (string.FindFirst("intelli") >= 0) + name.Prepend("Extended "); + name << " Mouse " << index; return strdup(name.String());