summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2010-12-27 13:24:35 +0000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-09-29 12:23:07 +1000
commit5d62c32981dbe9630bed32567b55008b536c81c5 (patch)
treea72c25d1299873b5c6d9ddc25c4af044678eb766
parentafb1fe695d197187a301c19863a128a65389b15c (diff)
Input: Add flags to DeviceEvent
Add a flags member which will be copied wholesale into the resultant xXIDeviceEvent. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--dix/eventconvert.c1
-rw-r--r--include/eventstr.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/dix/eventconvert.c b/dix/eventconvert.c
index 024f2e833..6ddcf9e8b 100644
--- a/dix/eventconvert.c
+++ b/dix/eventconvert.c
@@ -605,6 +605,7 @@ eventToDeviceEvent(DeviceEvent *ev, xEvent **xi)
xde->root_x = FP1616(ev->root_x, ev->root_x_frac);
xde->root_y = FP1616(ev->root_y, ev->root_y_frac);
+ xde->flags = ev->flags;
if (ev->key_repeat)
xde->flags |= XIKeyRepeat;
diff --git a/include/eventstr.h b/include/eventstr.h
index 049688ca0..0885883a5 100644
--- a/include/eventstr.h
+++ b/include/eventstr.h
@@ -113,6 +113,7 @@ struct _DeviceEvent
Window root; /**< Root window of the event */
int corestate; /**< Core key/button state BEFORE the event */
int key_repeat; /**< Internally-generated key repeat event */
+ uint32_t flags; /**< Flags to be copied into the generated event */
};