From 8ce06c96e469139bb12065d80fe4abb6173e2855 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 5 Aug 2014 15:59:17 +1000 Subject: Make the slot-state per slot The previous approach only had the slot state for the current slot. If we changed slots, that means we lost the information if the slot was ever initialized. If the ABS_MT_TRACKING_ID was never received, the slot would still update and try to send events (which the server refused with a warning). Avoid this by having a per-slot state and a dirty bit that tells us if the current slot updated at all. If we don't get the tracking ID, leave the slot empty and refuse any further events from that touch. This quashes the various "unable to find touch point 0" warnings caused if a touchpoint starts before the device is enabled. Signed-off-by: Peter Hutterer Reviewed-by: Walter Harms --- src/evdev.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/evdev.h') diff --git a/src/evdev.h b/src/evdev.h index 520d017..2d6b62d 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -167,7 +167,10 @@ typedef struct { ValuatorMask *mt_mask; ValuatorMask **last_mt_vals; int cur_slot; - enum SlotState slot_state; + struct slot { + int dirty; + enum SlotState state; + } *slots; #ifdef MULTITOUCH struct mtdev *mtdev; #endif -- cgit v1.2.1