From de8be07cc0a8163b6ef04455706fd5ca2cebe587 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 17 Aug 2010 12:08:52 +1000 Subject: [PATCH] dix: don't create core motion events for non-x/y valuators. Devices that send motion events with valuators other than x/y get core motion events with unchanged x/y coordinates. This confuses some applications. If the DeviceEvent does not have the x/y valuators set, return BadMatch on core conversion, thus skipping the event altogether. Reported-by: Bartosz Brachaczek Signed-off-by: Peter Hutterer Tested-by: Bartosz Brachaczek --- dix/eventconvert.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dix/eventconvert.c b/dix/eventconvert.c index 4e3de0b46..0f747c1a0 100644 --- a/dix/eventconvert.c +++ b/dix/eventconvert.c @@ -102,6 +102,15 @@ EventToCore(InternalEvent *event, xEvent *core) switch(event->any.type) { case ET_Motion: + { + DeviceEvent *e = &event->device_event; + /* Don't create core motion event if neither x nor y are + * present */ + if (!BitIsOn(e->valuators.mask, 0) && + !BitIsOn(e->valuators.mask, 1)) + return BadMatch; + } + /* fallthrough */ case ET_ButtonPress: case ET_ButtonRelease: case ET_KeyPress: