summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-03-07 16:06:26 -0800
committerJeremy Huddleston <jeremyhu@apple.com>2012-03-30 14:51:24 -0700
commit5a3ec826e653377e8b70e7553d1f0ca72210447c (patch)
treeea9b885ef0ab4042b56578ee3972b5e510b4d75d /include
parenta8c9a93c66edce893af3ba460d728fe2bc48c2af (diff)
Xi: Fix TouchEnd to TouchUpdate change for one accepted grab
If there is only one listener of a touch, the listener is a grab, and is accepted before the touch has ended, the current code will not end the touch record when the touch does end. This change adds a listener state for when a touch is accepted but has not yet ended. We now keep the touch record alive in this state, but end it when the touch ends. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 58427e08a4a36ce9e213e4b4fe5249d5db2c764d)
Diffstat (limited to 'include')
-rw-r--r--include/input.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/input.h b/include/input.h
index a9d094437..d891fe5db 100644
--- a/include/input.h
+++ b/include/input.h
@@ -523,7 +523,8 @@ enum TouchListenerState {
LISTENER_AWAITING_OWNER, /**< Waiting for a TouchOwnership event */
LISTENER_EARLY_ACCEPT, /**< Waiting for ownership, has already
accepted */
- LISTENER_IS_OWNER, /**< Is the current owner */
+ LISTENER_IS_OWNER, /**< Is the current owner, hasn't accepted */
+ LISTENER_HAS_ACCEPTED, /**< Is the current owner, has accepted */
LISTENER_HAS_END, /**< Has already received the end event */
};