diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-07 14:53:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-07 14:53:48 +0000 |
| commit | d5ac51b006c039894e4e35102a8e182d21a52efc (patch) | |
| tree | c01c6a3e0155d887b99d15962c4e3cfeee3746ad /xorg-server/test | |
| parent | e76fe637326278601890dd11749ea2c40a26f550 (diff) | |
| parent | 20f59c125afe31a8bdb0ae6a74dd408e5fa00237 (diff) | |
| download | vcxsrv-d5ac51b006c039894e4e35102a8e182d21a52efc.tar.gz vcxsrv-d5ac51b006c039894e4e35102a8e182d21a52efc.tar.bz2 vcxsrv-d5ac51b006c039894e4e35102a8e182d21a52efc.zip | |
svn merge ^/branches/released
(Merged in record patch)
Diffstat (limited to 'xorg-server/test')
| -rw-r--r-- | xorg-server/test/input.c | 4 |
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; |