mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-16 08:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

interface/wlr_pointer: rework destroy sequence

Browse source 
The destroy callback in wlr_pointer_impl has been removed. The function
`wlr_pointer_finish` has been introduced to clean up the resources owned by a
wlr_pointer.

`wlr_input_device_destroy` no longer destroys the wlr_pointer, attempting to
destroy a wlr_pointer will result in a no-op.

The field `name` has been added to the wlr_pointer_impl to be able to identify
a given wlr_pointer device.
This commit is contained in:
Simon Zeni 2022-03-02 13:57:28 -05:00 • committed by Kirill Primak
parent 7dc4a3ecd7
commit 51cd3c0726
9 changed files with 40 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/libinput/events.c
View file

@ -18,7 +18,7 @@ void destroy_libinput_input_device(struct wlr_libinput_input_device *dev) {
wlr_keyboard_finish(&dev->keyboard);
}
if (dev->pointer.impl) {
wlr_pointer_destroy(&dev->pointer);
wlr_pointer_finish(&dev->pointer);
}
if (dev->switch_device.impl) {
wlr_switch_destroy(&dev->switch_device);

6
backend/libinput/pointer.c
View file

@ -4,12 +4,8 @@
#include "backend/libinput.h"
#include "util/signal.h"
static void pointer_destroy(struct wlr_pointer *pointer) {
/* wlr_pointer belongs to the wlr_libinput_input_device */
}
const struct wlr_pointer_impl libinput_pointer_impl = {
.destroy = pointer_destroy,
.name = "libinput-pointer",
};
void init_device_pointer(struct wlr_libinput_input_device *dev) {