diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-15 07:53:19 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-21 12:38:35 +1000 |
| commit | 634b0da9a83076d0e9e0fc44dc5dc77b0c368bc1 (patch) | |
| tree | 7e2c820e296ceb8c91e5fb52bd5ce8a26fbcf687 | |
| parent | dbfd7b37a0ba21899d8ebb7e0b324301bd466c49 (diff) | |
dix: set core and button state based on the touch state
If a pointer-emulating touch caused a button to be logically down, set that
state in the input events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
| -rw-r--r-- | dix/inpututils.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/dix/inpututils.c b/dix/inpututils.c index 8cd4d5921..50a122f2f 100644 --- a/dix/inpututils.c +++ b/dix/inpututils.c @@ -663,6 +663,8 @@ int event_get_corestate(DeviceIntPtr mouse, DeviceIntPtr kbd) /* core state needs to be assembled BEFORE the device is updated. */ corestate = (kbd && kbd->key) ? XkbStateFieldFromRec(&kbd->key->xkbInfo->state) : 0; corestate |= (mouse && mouse->button) ? (mouse->button->state) : 0; + corestate |= (mouse && mouse->touch) ? (mouse->touch->state) : 0; + return corestate; } @@ -674,6 +676,9 @@ void event_set_state(DeviceIntPtr mouse, DeviceIntPtr kbd, DeviceEvent *event) if (BitIsOn(mouse->button->down, i)) SetBit(event->buttons, i); + if (mouse && mouse->touch && mouse->touch->buttonsDown > 0) + SetBit(event->buttons, mouse->button->map[1]); + if (kbd && kbd->key) { XkbStatePtr state; |