From b31618b25b03dd609f6104ca5159343f446033d5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 14 Apr 2016 15:38:42 +1000 Subject: evdev: use a slot variable instead of dereferencing everywhere MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Hutterer Reviewed-by: Jonas Ådahl --- src/evdev.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index d9d23025..4f69cb1e 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -353,8 +353,11 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) struct normalized_coords accel, unaccel; struct device_coords point; struct device_float_coords raw; + struct mt_slot *slot = NULL; slot_idx = device->mt.slot; + if (device->mt.slots) + slot = &device->mt.slots[slot_idx]; switch (device->pending_event) { case EVDEV_NONE: @@ -395,7 +398,7 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) if (!(device->seat_caps & EVDEV_DEVICE_TOUCH)) break; - if (device->mt.slots[slot_idx].seat_slot != -1) { + if (slot->seat_slot != -1) { log_bug_kernel(libinput, "%s: Driver sent multiple touch down for the " "same slot", @@ -404,13 +407,13 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) } seat_slot = ffs(~seat->slot_map) - 1; - device->mt.slots[slot_idx].seat_slot = seat_slot; + slot->seat_slot = seat_slot; if (seat_slot == -1) break; seat->slot_map |= 1 << seat_slot; - point = device->mt.slots[slot_idx].point; + point = slot->point; evdev_transform_absolute(device, &point); touch_notify_touch_down(base, time, slot_idx, seat_slot, @@ -420,8 +423,8 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) if (!(device->seat_caps & EVDEV_DEVICE_TOUCH)) break; - seat_slot = device->mt.slots[slot_idx].seat_slot; - point = device->mt.slots[slot_idx].point; + seat_slot = slot->seat_slot; + point = slot->point; if (seat_slot == -1) break; @@ -434,8 +437,8 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) if (!(device->seat_caps & EVDEV_DEVICE_TOUCH)) break; - seat_slot = device->mt.slots[slot_idx].seat_slot; - device->mt.slots[slot_idx].seat_slot = -1; + seat_slot = slot->seat_slot; + slot->seat_slot = -1; if (seat_slot == -1) break; -- cgit v1.2.3