aboutsummaryrefslogtreecommitdiff
path: root/backend/x11/input_device.c
diff options
context:
space:
mode:
authorSimon Zeni <simon@bl4ckb0ne.ca>2022-03-02 16:07:40 -0500
committerKirill Primak <vyivel@eclair.cafe>2022-03-07 16:37:41 +0000
commit10cbb9fbe141ee8f5c766783bde645ae19998d22 (patch)
tree79f6d761896044040c81f97ecac33e30c06448f9 /backend/x11/input_device.c
parent8d3cb94b41b3c21350e16e38a00f4e33941c33d5 (diff)
interface/wlr_touch: rework destroy sequence
The destroy callback in wlr_touch_impl has been removed. The function `wlr_touch_finish` has been introduced to clean up the resources owned by a wlr_touch. `wlr_input_device_destroy` no longer destroys the wlr_touch, attempting to destroy a wlr_touch will result in a no-op. The field `name` has been added to the wlr_touch_impl to be able to identify a given wlr_touch device.
Diffstat (limited to 'backend/x11/input_device.c')
-rw-r--r--backend/x11/input_device.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c
index 9182ba8e..77edf8ad 100644
--- a/backend/x11/input_device.c
+++ b/backend/x11/input_device.c
@@ -293,12 +293,8 @@ const struct wlr_pointer_impl x11_pointer_impl = {
.name = "x11-pointer",
};
-static void touch_destroy(struct wlr_touch *wlr_touch) {
- // Don't free the touch, it's on the stack
-}
-
const struct wlr_touch_impl x11_touch_impl = {
- .destroy = touch_destroy,
+ .name = "x11-touch",
};
void update_x11_pointer_position(struct wlr_x11_output *output,