From 555b8e5bfafd6a40a19844892f414dde67503eaf Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 5 Sep 2017 15:38:49 +1000 Subject: [PATCH] Remove some now-unused patches --- ...the-event-listener-after-removing-it.patch | 99 ------------------- ...e-tap-exclusion-zone-down-to-the-ful.patch | 46 --------- 2 files changed, 145 deletions(-) delete mode 100644 0001-lid-re-init-the-event-listener-after-removing-it.patch delete mode 100644 0001-touchpad-pull-the-tap-exclusion-zone-down-to-the-ful.patch diff --git a/0001-lid-re-init-the-event-listener-after-removing-it.patch b/0001-lid-re-init-the-event-listener-after-removing-it.patch deleted file mode 100644 index bf165b7..0000000 --- a/0001-lid-re-init-the-event-listener-after-removing-it.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 98eca5257c1d3d62ebaaf0ed8ee262381f3dc256 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 4 May 2017 14:50:31 +1000 -Subject: [PATCH libinput] lid: re-init the event listener after removing it - -We may call remove on it again and that segfaults if it hasn't been -initialized. - -https://bugzilla.redhat.com/show_bug.cgi?id=1440927 - -Signed-off-by: Peter Hutterer ---- - src/evdev-lid.c | 23 ++++++++++++++++++++--- - src/evdev-mt-touchpad.c | 6 ++++++ - 2 files changed, 26 insertions(+), 3 deletions(-) - -diff --git a/src/evdev-lid.c b/src/evdev-lid.c -index 8db7f37c..b7ff065e 100644 ---- a/src/evdev-lid.c -+++ b/src/evdev-lid.c -@@ -98,7 +98,9 @@ lid_switch_toggle_keyboard_listener(struct lid_switch_dispatch *dispatch, - dispatch); - } else { - libinput_device_remove_event_listener( -- &dispatch->keyboard.listener); -+ &dispatch->keyboard.listener); -+ libinput_device_init_event_listener( -+ &dispatch->keyboard.listener); - } - } - -@@ -174,6 +176,17 @@ evdev_read_switch_reliability_prop(struct evdev_device *device) - } - - static void -+lid_switch_remove(struct evdev_dispatch *evdev_dispatch) -+{ -+ struct lid_switch_dispatch *dispatch = lid_dispatch(evdev_dispatch); -+ -+ if (!dispatch->keyboard.keyboard) -+ return; -+ -+ libinput_device_remove_event_listener(&dispatch->keyboard.listener); -+} -+ -+static void - lid_switch_destroy(struct evdev_dispatch *evdev_dispatch) - { - struct lid_switch_dispatch *dispatch = lid_dispatch(evdev_dispatch); -@@ -197,7 +210,9 @@ lid_switch_pair_keyboard(struct evdev_device *lid_switch, - if (dispatch->keyboard.keyboard) { - if (bus_kbd != BUS_I8042) - return; -+ - libinput_device_remove_event_listener(&dispatch->keyboard.listener); -+ libinput_device_init_event_listener(&dispatch->keyboard.listener); - } - - dispatch->keyboard.keyboard = keyboard; -@@ -225,7 +240,9 @@ lid_switch_interface_device_removed(struct evdev_device *device, - - if (removed_device == dispatch->keyboard.keyboard) { - libinput_device_remove_event_listener( -- &dispatch->keyboard.listener); -+ &dispatch->keyboard.listener); -+ libinput_device_init_event_listener( -+ &dispatch->keyboard.listener); - dispatch->keyboard.keyboard = NULL; - } - } -@@ -271,7 +288,7 @@ lid_switch_sync_initial_state(struct evdev_device *device, - struct evdev_dispatch_interface lid_switch_interface = { - lid_switch_process, - NULL, /* suspend */ -- NULL, /* remove */ -+ lid_switch_remove, - lid_switch_destroy, - lid_switch_interface_device_added, - lid_switch_interface_device_removed, -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index a35688b1..73f0fdd8 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -1673,6 +1673,12 @@ tp_interface_device_removed(struct evdev_device *device, - tp->dwt.keyboard = NULL; - } - -+ if (removed_device == tp->lid_switch.lid_switch) { -+ libinput_device_remove_event_listener( -+ &tp->lid_switch.lid_switch_listener); -+ tp->lid_switch.lid_switch = NULL; -+ } -+ - if (tp->sendevents.current_mode != - LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE) - return; --- -2.12.2 - diff --git a/0001-touchpad-pull-the-tap-exclusion-zone-down-to-the-ful.patch b/0001-touchpad-pull-the-tap-exclusion-zone-down-to-the-ful.patch deleted file mode 100644 index dd53373..0000000 --- a/0001-touchpad-pull-the-tap-exclusion-zone-down-to-the-ful.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3a940332df9dbc07ceff076e70a0972d2cf28769 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 9 May 2017 15:07:20 +1000 -Subject: [PATCH libinput] touchpad: pull the tap exclusion zone down to the - full edge zone - -This was originally left outside of the button areas in case users tap in -those zones, but we're getting false tap events in that zone. - -On a 100mm touchpad, the edge zone is merely 5mm, it's acceptable to ignore -taps in that area even in the software button. We can revisit this if we see -tap detection failures in the future. - -https://bugzilla.redhat.com/show_bug.cgi?id=1415796 - -Signed-off-by: Peter Hutterer ---- - src/evdev-mt-touchpad.c | 12 +++--------- - 1 file changed, 3 insertions(+), 9 deletions(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index e0757e17..54fa650b 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -557,15 +557,9 @@ tp_palm_tap_is_palm(const struct tp_dispatch *tp, const struct tp_touch *t) - t->point.x < tp->palm.right_edge) - return false; - -- /* We're inside the left/right palm edge and not in one of the -- * software button areas */ -- if (t->point.y < tp->buttons.bottom_area.top_edge) { -- evdev_log_debug(tp->device, -- "palm: palm-tap detected\n"); -- return true; -- } -- -- return false; -+ evdev_log_debug(tp->device, -+ "palm: palm-tap detected\n"); -+ return true; - } - - static bool --- -2.12.2 -