diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-03-04 07:58:41 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-05-06 10:19:43 +1000 |
| commit | 9ad9c1358567998564d177f06d98fc46dcb41009 (patch) | |
| tree | 771e6d3c9e6b7918dd83b20467be64d66b52891f /dix | |
| parent | f5796f98dadccf67c04f601178966614dd51a1b4 (diff) | |
dix: don't set non-exisiting flags on touch events
Unlike pointer/keyboard events, the flags field for ET_Touch* is a set of
server-internal defines that we need to convert to XI protocol defines.
Currently only two of those defines actually translate to the protocol, so
make sure we don't send internal garbage down the wire.
No effect to current clients since they shouldn't look at undefined bits
anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit b86b3d10bb2fee1a922b8831e8bb415c339f3d99)
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/eventconvert.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/dix/eventconvert.c b/dix/eventconvert.c index 2c411cf40..ebc52c36c 100644 --- a/dix/eventconvert.c +++ b/dix/eventconvert.c @@ -684,17 +684,18 @@ eventToDeviceEvent(DeviceEvent *ev, xEvent **xi) xde->root_x = double_to_fp1616(ev->root_x + ev->root_x_frac); xde->root_y = double_to_fp1616(ev->root_y + ev->root_y_frac); - if (ev->type == ET_TouchUpdate) - xde->flags |= (ev->flags & TOUCH_PENDING_END) ? XITouchPendingEnd : 0; - else - xde->flags = ev->flags; + if (IsTouchEvent((InternalEvent *)ev)) { + if (ev->type == ET_TouchUpdate) + xde->flags |= (ev->flags & TOUCH_PENDING_END) ? XITouchPendingEnd : 0; - if (IsTouchEvent((InternalEvent *) ev) && - ev->flags & TOUCH_POINTER_EMULATED) - xde->flags |= XITouchEmulatingPointer; + if (ev->flags & TOUCH_POINTER_EMULATED) + xde->flags |= XITouchEmulatingPointer; + } else { + xde->flags = ev->flags; - if (ev->key_repeat) - xde->flags |= XIKeyRepeat; + if (ev->key_repeat) + xde->flags |= XIKeyRepeat; + } xde->mods.base_mods = ev->mods.base; xde->mods.latched_mods = ev->mods.latched; |