Fill in the last event time for synced events

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2013-06-03 16:20:35 +10:00
parent bfc41a9ab9
commit 1927b2024f
2 changed files with 11 additions and 8 deletions

View file

@ -76,6 +76,8 @@ struct libevdev {
size_t queue_size; /**< size of queue in elements */ size_t queue_size; /**< size of queue in elements */
size_t queue_next; /**< next event index */ size_t queue_next; /**< next event index */
size_t queue_nsync; /**< number of sync events */ size_t queue_nsync; /**< number of sync events */
struct timeval last_event_time;
}; };
/** /**

View file

@ -322,10 +322,9 @@ libevdev_get_fd(const struct libevdev* dev)
} }
static inline void static inline void
init_event(struct input_event *ev, int type, int code, int value) init_event(struct libevdev *dev, struct input_event *ev, int type, int code, int value)
{ {
ev->time.tv_sec = 0; /* FIXME: blah! */ ev->time = dev->last_event_time;
ev->time.tv_usec = 0; /* FIXME: blah! */
ev->type = type; ev->type = type;
ev->code = code; ev->code = code;
ev->value = value; ev->value = value;
@ -348,7 +347,7 @@ sync_key_state(struct libevdev *dev)
new = bit_is_set(keystate, i); new = bit_is_set(keystate, i);
if (old ^ new) { if (old ^ new) {
struct input_event *ev = queue_push(dev); struct input_event *ev = queue_push(dev);
init_event(ev, EV_KEY, i, new ? 1 : 0); init_event(dev, ev, EV_KEY, i, new ? 1 : 0);
} }
set_bit_state(dev->key_values, i, new); set_bit_state(dev->key_values, i, new);
} }
@ -380,7 +379,7 @@ sync_abs_state(struct libevdev *dev)
if (dev->abs_info[i].value != abs_info.value) { if (dev->abs_info[i].value != abs_info.value) {
struct input_event *ev = queue_push(dev); struct input_event *ev = queue_push(dev);
init_event(ev, EV_ABS, i, abs_info.value); init_event(dev, ev, EV_ABS, i, abs_info.value);
dev->abs_info[i].value = abs_info.value; dev->abs_info[i].value = abs_info.value;
} }
} }
@ -417,7 +416,7 @@ sync_mt_state(struct libevdev *dev)
struct input_event *ev; struct input_event *ev;
ev = queue_push(dev); ev = queue_push(dev);
init_event(ev, EV_ABS, ABS_MT_SLOT, i); init_event(dev, ev, EV_ABS, ABS_MT_SLOT, i);
for (j = ABS_MT_MIN; j < ABS_MT_MAX; j++) { for (j = ABS_MT_MIN; j < ABS_MT_MAX; j++) {
int jdx = j - ABS_MT_MIN; int jdx = j - ABS_MT_MIN;
@ -425,7 +424,7 @@ sync_mt_state(struct libevdev *dev)
continue; continue;
ev = queue_push(dev); ev = queue_push(dev);
init_event(ev, EV_ABS, j, mt_state[jdx].val[i]); init_event(dev, ev, EV_ABS, j, mt_state[jdx].val[i]);
dev->mt_slot_vals[i][jdx] = mt_state[jdx].val[i]; dev->mt_slot_vals[i][jdx] = mt_state[jdx].val[i];
} }
} }
@ -470,7 +469,7 @@ sync_state(struct libevdev *dev)
rc = sync_mt_state(dev); rc = sync_mt_state(dev);
ev = queue_push(dev); ev = queue_push(dev);
init_event(ev, EV_SYN, SYN_REPORT, 0); init_event(dev, ev, EV_SYN, SYN_REPORT, 0);
dev->queue_nsync = queue_num_elements(dev); dev->queue_nsync = queue_num_elements(dev);
dev->need_sync = 0; dev->need_sync = 0;
@ -543,6 +542,8 @@ update_state(struct libevdev *dev, const struct input_event *e)
break; break;
} }
dev->last_event_time = e->time;
return rc; return rc;
} }