diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-11 12:54:46 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-11 12:54:46 +1000 |
| commit | 88cb61e1e55c54982b90e2a77465faaac6a0ba89 (patch) | |
| tree | 0798bc507e7b088e2bdeadd29888a4bd092b036d /test | |
| parent | 19f43836d1006d253391926e880b14ed2e7a0cf8 (diff) | |
| parent | 4ed4915bc0fbe9b4419ca4a0d4e43c2fee032ae9 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-api
Conflicts:
dix/getevents.c
hw/xfree86/common/xf86Xinput.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'test')
| -rw-r--r-- | test/input.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/input.c b/test/input.c index 2aa76de6c..f8ce4b2df 100644 --- a/test/input.c +++ b/test/input.c @@ -183,6 +183,8 @@ static void dix_event_to_core(int type) ev.time = time; ev.root_y = x; ev.root_x = y; + SetBit(ev.valuators.mask, 0); + SetBit(ev.valuators.mask, 1); ev.root = ROOT_WINDOW_ID; ev.corestate = state; ev.detail.key = detail; |