aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/test/input.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-01-07 14:43:29 +0000
committermarha <marha@users.sourceforge.net>2010-01-07 14:43:29 +0000
commit20f59c125afe31a8bdb0ae6a74dd408e5fa00237 (patch)
tree93fc4a87d462f722360911761986b031add1f5ae /xorg-server/test/input.c
parent163827567b71b0763a4c1a7104159cd08b5c2d95 (diff)
downloadvcxsrv-20f59c125afe31a8bdb0ae6a74dd408e5fa00237.tar.gz
vcxsrv-20f59c125afe31a8bdb0ae6a74dd408e5fa00237.tar.bz2
vcxsrv-20f59c125afe31a8bdb0ae6a74dd408e5fa00237.zip
Added patches for bug http://bugs.freedesktop.org/show_bug.cgi?id=20500
0001-dix-EventToCore-needs-to-copy-the-root-window-too.patch 0001-Re-enable-the-RECORD-extension.patch
Diffstat (limited to 'xorg-server/test/input.c')
-rw-r--r--xorg-server/test/input.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/test/input.c b/xorg-server/test/input.c
index 2de55bc63..63d1a1801 100644
--- a/xorg-server/test/input.c
+++ b/xorg-server/test/input.c
@@ -153,6 +153,7 @@ static void dix_event_to_core(int type)
int rc;
int state;
int detail;
+ const int ROOT_WINDOW_ID = 0x100;
/* EventToCore memsets the event to 0 */
#define test_event() \
@@ -165,7 +166,7 @@ static void dix_event_to_core(int type)
g_assert(core.u.keyButtonPointer.state == state); \
g_assert(core.u.keyButtonPointer.eventX == 0); \
g_assert(core.u.keyButtonPointer.eventY == 0); \
- g_assert(core.u.keyButtonPointer.root == 0); \
+ g_assert(core.u.keyButtonPointer.root == ROOT_WINDOW_ID); \
g_assert(core.u.keyButtonPointer.event == 0); \
g_assert(core.u.keyButtonPointer.child == 0); \
g_assert(core.u.keyButtonPointer.sameScreen == FALSE);
@@ -181,6 +182,7 @@ static void dix_event_to_core(int type)
ev.time = time;
ev.root_y = x;
ev.root_x = y;
+ ev.root = ROOT_WINDOW_ID;
ev.corestate = state;
ev.detail.key = detail;