summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Salch <chrissalch@letu.edu>2008-08-08 15:56:27 +0930
committerPeter Hutterer <peter.hutterer@redhat.com>2008-08-08 16:04:26 +0930
commit555f5a7cbf3c980c436c205e9b23a78f3e19bdfe (patch)
tree617aaebac9c7d34659faffd760a51721e7898b22
parent134829d911c698704595014ba402516ae9a2f36c (diff)
downloadxorg-driver-xf86-input-evdev-555f5a7cbf3c980c436c205e9b23a78f3e19bdfe.tar.gz
Filter wheel events before middle mouse button emulation.
The Emulate3Button needs to be the last filter function, otherwise the timeout code causes it to hijack button presses for the first 3 buttons. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
-rw-r--r--src/evdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/evdev.c b/src/evdev.c
index a80a433..38a211b 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -287,10 +287,10 @@ EvdevReadInput(InputInfoPtr pInfo)
default:
button = EvdevUtilButtonEventToButtonNumber(ev.code);
- if (EvdevMBEmuFilterEvent(pInfo, button, value))
+ if (EvdevWheelEmuFilterButton(pInfo, button, value))
break;
- if (EvdevWheelEmuFilterButton(pInfo, button, value))
+ if (EvdevMBEmuFilterEvent(pInfo, button, value))
break;
if (button)