summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-08-20 10:52:24 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-08-24 10:06:37 +1000
commitef75301854d41c6b11dd2742fa9d17a5de8a4cfa (patch)
tree38e92267978b295e5b76a2d11e549d29a0d5409a
parentc73cd3b265c301b8a54ffe484d6c696f2abefb46 (diff)
dix: FixUpEventFromWindow mustn't scramble non-device events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--dix/events.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/dix/events.c b/dix/events.c
index b32960abe..de96de3ce 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2258,7 +2258,10 @@ FixUpEventFromWindow(
event->evtype == XI_RawKeyRelease ||
event->evtype == XI_RawButtonPress ||
event->evtype == XI_RawButtonRelease ||
- event->evtype == XI_RawMotion)
+ event->evtype == XI_RawMotion ||
+ event->evtype == XI_DeviceChanged ||
+ event->evtype == XI_HierarchyChanged ||
+ event->evtype == XI_PropertyEvent)
return;
event->root = RootWindow(pDev)->drawable.id;