fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-09 05:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

touchpad: rename scroll.state to scroll.edge_state

Browse source 
In preparation for a twofinger_state field, to avoid confusion.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2014-12-18 10:21:48 +10:00
parent b74330255b
commit 54c972402f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/evdev-mt-touchpad-edge-scroll.c
View file

@ -69,7 +69,7 @@ tp_edge_scroll_set_state(struct tp_dispatch *tp,
{ {
libinput_timer_cancel(&t->scroll.timer); libinput_timer_cancel(&t->scroll.timer);
t->scroll.state = state; t->scroll.edge_state = state;
switch (state) { switch (state) {
case EDGE_SCROLL_TOUCH_STATE_NONE: case EDGE_SCROLL_TOUCH_STATE_NONE:
@ -207,7 +207,7 @@ tp_edge_scroll_handle_event(struct tp_dispatch *tp,
struct tp_touch *t, struct tp_touch *t,
enum scroll_event event) enum scroll_event event)
{ {
switch (t->scroll.state) { switch (t->scroll.edge_state) {
case EDGE_SCROLL_TOUCH_STATE_NONE: case EDGE_SCROLL_TOUCH_STATE_NONE:
tp_edge_scroll_handle_none(tp, t, event); tp_edge_scroll_handle_none(tp, t, event);
break; break;
@ -374,5 +374,5 @@ tp_edge_scroll_stop_events(struct tp_dispatch *tp, uint64_t time)
int int
tp_edge_scroll_touch_active(struct tp_dispatch *tp, struct tp_touch *t) tp_edge_scroll_touch_active(struct tp_dispatch *tp, struct tp_touch *t)
{ {
return t->scroll.state == EDGE_SCROLL_TOUCH_STATE_AREA; return t->scroll.edge_state == EDGE_SCROLL_TOUCH_STATE_AREA;
} }

2
src/evdev-mt-touchpad.h
View file

@ -165,7 +165,7 @@ struct tp_touch {
} tap; } tap;
struct { struct {
enum tp_edge_scroll_touch_state state; enum tp_edge_scroll_touch_state edge_state;
uint32_t edge; uint32_t edge;
int direction; int direction;
double threshold; double threshold;