mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-28 08:56:32 -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

6
backend/x11/input_device.c
View file

@ -289,12 +289,8 @@ const struct wlr_keyboard_impl x11_keyboard_impl = {
.name = "x11-keyboard",
};
static void pointer_destroy(struct wlr_pointer *wlr_pointer) {
// Don't free the pointer, it's on the stack
}
const struct wlr_pointer_impl x11_pointer_impl = {
.destroy = pointer_destroy,
.name = "x11-pointer",
};
static void touch_destroy(struct wlr_touch *wlr_touch) {

2
backend/x11/output.c
View file

@ -76,7 +76,7 @@ static void output_destroy(struct wlr_output *wlr_output) {
pixman_region32_fini(&output->exposed);
wlr_pointer_destroy(&output->pointer);
wlr_pointer_finish(&output->pointer);
wlr_touch_destroy(&output->touch);
struct wlr_x11_buffer *buffer, *buffer_tmp;