summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Chapman <mike@very.puzzling.org>2009-01-09 19:07:10 +1100
committerPeter Hutterer <peter.hutterer@who-t.net>2009-01-13 11:36:14 +1000
commita34a2cd3476441f29c9faa79ffa9289dbf2eebf4 (patch)
tree93dea44f47ee89e87bdae92267d6537361de0847
parent78c00bd77f983aa22611c9966fbcb7e22453b588 (diff)
downloadxorg-driver-xf86-input-evdev-a34a2cd3476441f29c9faa79ffa9289dbf2eebf4.tar.gz
Disable middle mouse button emulation when a middle mouse button event is registered
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 0592d97fbb5a1241ee79397ce9203346d050a9f9)
-rw-r--r--src/emuMB.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/emuMB.c b/src/emuMB.c
index e5a767a..028d27f 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -231,6 +231,11 @@ EvdevMBEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL press)
if (!pEvdev->emulateMB.enabled)
return ret;
+ if (button == 2) {
+ EvdevMBEmuEnable(pInfo, FALSE);
+ return ret;
+ }
+
/* don't care about other buttons */
if (button != 1 && button != 3)
return ret;