summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-07-20 14:52:34 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-30 09:44:34 +1000
commitc793aa27381dc346d88a3e7d8bdb90dd8d3ed39c (patch)
tree939040d8c5a51a61a858db639a5ac58d18dc4ef0
parent9f3632c0b6c181706daf661646de5994217c0bb2 (diff)
downloadxorg-driver-xf86-input-evdev-c793aa27381dc346d88a3e7d8bdb90dd8d3ed39c.tar.gz
Don't register middle mouse button emulation handlers for keyboards.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 2994825665790dc8e35b2944e0d411f3cc9f76fd)
-rw-r--r--src/emuMB.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/emuMB.c b/src/emuMB.c
index 41d0d2c..b29f552 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -327,6 +327,9 @@ EvdevMBEmuPreInit(InputInfoPtr pInfo)
void
EvdevMBEmuOn(InputInfoPtr pInfo)
{
+ if (!pInfo->dev->button) /* don't init for keyboards */
+ return;
+
RegisterBlockAndWakeupHandlers (EvdevMBEmuBlockHandler,
EvdevMBEmuWakeupHandler,
(pointer)pInfo);
@@ -335,6 +338,9 @@ EvdevMBEmuOn(InputInfoPtr pInfo)
void
EvdevMBEmuFinalize(InputInfoPtr pInfo)
{
+ if (!pInfo->dev->button) /* don't cleanup for keyboards */
+ return;
+
RemoveBlockAndWakeupHandlers (EvdevMBEmuBlockHandler,
EvdevMBEmuWakeupHandler,
(pointer)pInfo);