summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2017-06-21 11:02:48 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2017-06-21 19:07:11 +1000
commit64f6603ecb2cf2bd326692f3068122245ba3f729 (patch)
tree048af385f255e7c00f0c5cad7caf5f58f0f86648 /src
parentdd25e1799f58179de3c611e42edfe6087b814d7e (diff)
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 <peter.hutterer@who-t.net>
Diffstat (limited to 'src')
-rw-r--r--src/evdev-mt-touchpad-buttons.c4
-rw-r--r--src/evdev-mt-touchpad-edge-scroll.c2
-rw-r--r--src/evdev-mt-touchpad.c14
-rw-r--r--src/evdev-mt-touchpad.h2
4 files changed, 11 insertions, 11 deletions
diff --git a/src/evdev-mt-touchpad-buttons.c b/src/evdev-mt-touchpad-buttons.c
index 895cf0e..c437ddf 100644
--- a/src/evdev-mt-touchpad-buttons.c
+++ b/src/evdev-mt-touchpad-buttons.c
@@ -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);
}
/*
diff --git a/src/evdev-mt-touchpad-edge-scroll.c b/src/evdev-mt-touchpad-edge-scroll.c
index 9f6660c..6174b73 100644
--- a/src/evdev-mt-touchpad-edge-scroll.c
+++ b/src/evdev-mt-touchpad-edge-scroll.c
@@ -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
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index eeb1a1b..9f2dd8b 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -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;
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index ef0171d..2873c01 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -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 */