diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2016-06-20 09:26:44 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2016-06-20 09:26:44 +1000 |
| commit | 28f75d9f9debf4fcc78029e2ddca5c7feac06571 (patch) | |
| tree | 12955d3bc612996b4f06d160db3c5147ac109c80 /src | |
| parent | 9bb0cfd8785294a735407c862d7b59621a4ec98d (diff) | |
| parent | 48473994c8e60189356feae7b7eae25288e5ac28 (diff) | |
Merge branch 'wip/touchpad-drop-hysteresis'
Diffstat (limited to 'src')
| -rw-r--r-- | src/evdev-mt-touchpad.c | 12 | ||||
| -rw-r--r-- | src/evdev-mt-touchpad.h | 1 | ||||
| -rw-r--r-- | src/evdev.c | 1 | ||||
| -rw-r--r-- | src/evdev.h | 1 |
4 files changed, 0 insertions, 15 deletions
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index fdc53192..96e78b94 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -357,7 +357,6 @@ tp_process_absolute(struct tp_dispatch *tp, tp_end_sequence(tp, t, time); break; case ABS_MT_PRESSURE: - t->pressure_delta = e->value - t->pressure; t->pressure = e->value; t->dirty = true; tp->queued |= TOUCHPAD_EVENT_OTHERAXIS; @@ -1018,7 +1017,6 @@ tp_detect_jumps(const struct tp_dispatch *tp, struct tp_touch *t) static void tp_process_state(struct tp_dispatch *tp, uint64_t time) { - struct evdev_device *device = tp->device; struct tp_touch *t; unsigned int i; bool restart_filter = false; @@ -1044,10 +1042,6 @@ tp_process_state(struct tp_dispatch *tp, uint64_t time) if (!t->dirty) continue; - if ((device->model_flags & EVDEV_MODEL_LENOVO_T450_TOUCHPAD) && - t->pressure_delta < -7) - tp_motion_history_reset(t); - if (tp_detect_jumps(tp, t)) { if (!tp->semi_mt) log_bug_kernel(tp_libinput_context(tp), @@ -2124,12 +2118,6 @@ tp_init_hysteresis(struct tp_dispatch *tp) { int res_x, res_y; - tp->hysteresis_margin.x = 0; - tp->hysteresis_margin.y = 0; - - if (tp->device->model_flags & EVDEV_MODEL_PRECISE_TOUCHPAD) - return; - res_x = tp->device->abs.absinfo_x->resolution; res_y = tp->device->abs.absinfo_y->resolution; tp->hysteresis_margin.x = res_x/2; diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h index cbb9fb0e..3f3b728a 100644 --- a/src/evdev-mt-touchpad.h +++ b/src/evdev-mt-touchpad.h @@ -155,7 +155,6 @@ struct tp_touch { uint64_t millis; int distance; /* distance == 0 means touch */ int pressure; - int pressure_delta; struct { /* A quirk mostly used on Synaptics touchpads. In a diff --git a/src/evdev.c b/src/evdev.c index 335c2386..b4a1088a 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1804,7 +1804,6 @@ evdev_read_model_flags(struct evdev_device *device) MODEL(CYBORG_RAT), MODEL(CYAPA), MODEL(LENOVO_T450_TOUCHPAD), - MODEL(PRECISE_TOUCHPAD), MODEL(TRACKBALL), MODEL(APPLE_MAGICMOUSE), { NULL, EVDEV_MODEL_DEFAULT }, diff --git a/src/evdev.h b/src/evdev.h index d995985f..ca133181 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -114,7 +114,6 @@ enum evdev_device_model { EVDEV_MODEL_CYBORG_RAT = (1 << 14), EVDEV_MODEL_CYAPA = (1 << 15), EVDEV_MODEL_LENOVO_T450_TOUCHPAD= (1 << 17), - EVDEV_MODEL_PRECISE_TOUCHPAD = (1 << 18), EVDEV_MODEL_TRACKBALL = (1 << 19), EVDEV_MODEL_APPLE_MAGICMOUSE = (1 << 20), }; |