[PATCH v2 1/2] Really decrease button count when processing TouchEnd events
Chase Douglas
chase.douglas at canonical.com
Mon Jul 9 17:12:43 PDT 2012
In commit 96d8df5bc9d400d55830b23afe5525b222f8dfc7, we update the device
state for touch end as events are processed as opposed to when a touch
is ended internally. Unfortunately, the device state still isn't updated
due to how the previous mechanism was implemented.
This change removes the previous mechanism (TOUCH_END device event flag)
so that the device state is updated properly.
Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
---
Xi/exevents.c | 2 --
include/input.h | 1 -
2 files changed, 3 deletions(-)
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 37ed5c7..c1fcc55 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -971,8 +971,6 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent *event)
if (!(event->flags & TOUCH_POINTER_EMULATED))
return DONT_PROCESS;
- if (!(event->flags & TOUCH_END))
- return DONT_PROCESS;
DecreaseButtonCount(device, key, &t->buttonsDown, &t->motionMask,
&t->state);
diff --git a/include/input.h b/include/input.h
index 991d648..1a846e7 100644
--- a/include/input.h
+++ b/include/input.h
@@ -77,7 +77,6 @@ SOFTWARE.
#define TOUCH_CLIENT_ID (1 << 3) /* touch ID is the client-visible id */
#define TOUCH_REPLAYING (1 << 4) /* event is being replayed */
#define TOUCH_POINTER_EMULATED (1 << 5) /* touch event may be pointer emulated */
-#define TOUCH_END (1 << 6) /* really end this touch now */
/*int constants for pointer acceleration schemes*/
#define PtrAccelNoOp 0
--
1.7.10.4
More information about the xorg-devel
mailing list