Commit 64f6603e authored by Peter Hutterer's avatar Peter Hutterer

touchpad: rename tp_touch->millis to tp_touch->time

This is in µs and hasn't been in ms for a long time.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent dd25e179
......@@ -147,14 +147,14 @@ static void
tp_button_set_enter_timer(struct tp_dispatch *tp, struct tp_touch *t)
{
libinput_timer_set(&t->button.timer,
t->millis + DEFAULT_BUTTON_ENTER_TIMEOUT);
t->time + DEFAULT_BUTTON_ENTER_TIMEOUT);
}
static void
tp_button_set_leave_timer(struct tp_dispatch *tp, struct tp_touch *t)
{
libinput_timer_set(&t->button.timer,
t->millis + DEFAULT_BUTTON_LEAVE_TIMEOUT);
t->time + DEFAULT_BUTTON_LEAVE_TIMEOUT);
}
/*
......
......@@ -103,7 +103,7 @@ tp_edge_scroll_set_timer(struct tp_dispatch *tp,
return;
libinput_timer_set(&t->scroll.timer,
t->millis + DEFAULT_SCROLL_LOCK_TIMEOUT);
t->time + DEFAULT_SCROLL_LOCK_TIMEOUT);
}
static void
......
......@@ -217,7 +217,7 @@ tp_new_touch(struct tp_dispatch *tp, struct tp_touch *t, uint64_t time)
t->was_down = false;
t->state = TOUCH_HOVERING;
t->pinned.is_pinned = false;
t->millis = time;
t->time = time;
tp->queued |= TOUCHPAD_EVENT_MOTION;
}
......@@ -226,7 +226,7 @@ tp_begin_touch(struct tp_dispatch *tp, struct tp_touch *t, uint64_t time)
{
t->dirty = true;
t->state = TOUCH_BEGIN;
t->millis = time;
t->time = time;
t->was_down = true;
tp->nfingers_down++;
t->palm.time = time;
......@@ -259,7 +259,7 @@ tp_end_touch(struct tp_dispatch *tp, struct tp_touch *t, uint64_t time)
t->palm.state = PALM_NONE;
t->state = TOUCH_END;
t->pinned.is_pinned = false;
t->millis = time;
t->time = time;
t->palm.time = 0;
assert(tp->nfingers_down >= 1);
tp->nfingers_down--;
......@@ -314,7 +314,7 @@ tp_process_absolute(struct tp_dispatch *tp,
e->code,
e->value);
t->point.x = e->value;
t->millis = time;
t->time = time;
t->dirty = true;
tp->queued |= TOUCHPAD_EVENT_MOTION;
break;
......@@ -323,7 +323,7 @@ tp_process_absolute(struct tp_dispatch *tp,
e->code,
e->value);
t->point.y = e->value;
t->millis = time;
t->time = time;
t->dirty = true;
tp->queued |= TOUCHPAD_EVENT_MOTION;
break;
......@@ -362,7 +362,7 @@ tp_process_absolute_st(struct tp_dispatch *tp,
e->code,
e->value);
t->point.x = e->value;
t->millis = time;
t->time = time;
t->dirty = true;
tp->queued |= TOUCHPAD_EVENT_MOTION;
break;
......@@ -371,7 +371,7 @@ tp_process_absolute_st(struct tp_dispatch *tp,
e->code,
e->value);
t->point.y = e->value;
t->millis = time;
t->time = time;
t->dirty = true;
tp->queued |= TOUCHPAD_EVENT_MOTION;
break;
......
......@@ -144,7 +144,7 @@ struct tp_touch {
bool has_ended; /* TRACKING_ID == -1 */
bool dirty;
struct device_coords point;
uint64_t millis;
uint64_t time;
int pressure;
bool is_tool_palm; /* MT_TOOL_PALM */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment