mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

interface/wlr_touch: rework destroy sequence

Browse source 
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.
This commit is contained in:
Simon Zeni 2022-03-02 16:07:40 -05:00 • committed by Kirill Primak
parent 8d3cb94b41
commit 10cbb9fbe1
8 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/libinput/events.c
View file

@ -24,7 +24,7 @@ void destroy_libinput_input_device(struct wlr_libinput_input_device *dev) {
wlr_switch_finish(&dev->switch_device);
}
if (dev->touch.impl) {
wlr_touch_destroy(&dev->touch);
wlr_touch_finish(&dev->touch);
}
if (dev->tablet.impl) {
finish_device_tablet(dev);

6
backend/libinput/touch.c
View file

@ -4,12 +4,8 @@
#include "backend/libinput.h"
#include "util/signal.h"
static void touch_destroy(struct wlr_touch *touch) {
/* wlr_touch belongs to the wlr_libinput_input_device */
}
const struct wlr_touch_impl libinput_touch_impl = {
.destroy = touch_destroy,
.name = "libinput-touch",
};
void init_device_touch(struct wlr_libinput_input_device *dev) {