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

backend/x11: remove wlr_input_device_impl

Browse source
This commit is contained in:
Simon Zeni 2022-02-08 15:32:40 -05:00
parent 1acc931cf0
commit 19f7e5d2b4
4 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
backend/x11/input_device.c
View file

@ -286,19 +286,11 @@ void handle_x11_xinput_event(struct wlr_x11_backend *x11,
}
}
static void input_device_destroy(struct wlr_input_device *wlr_device) {
// Don't free the input device, it's on the stack
}
const struct wlr_input_device_impl input_device_impl = {
.destroy = input_device_destroy,
};
static void keyboard_destroy(struct wlr_keyboard *wlr_keyboard) {
// Don't free the keyboard, it's on the stack
}
const struct wlr_keyboard_impl keyboard_impl = {
const struct wlr_keyboard_impl x11_keyboard_impl = {
.destroy = keyboard_destroy,
};
@ -306,7 +298,7 @@ static void pointer_destroy(struct wlr_pointer *wlr_pointer) {
// Don't free the pointer, it's on the stack
}
const struct wlr_pointer_impl pointer_impl = {
const struct wlr_pointer_impl x11_pointer_impl = {
.destroy = pointer_destroy,
};
@ -314,7 +306,7 @@ static void touch_destroy(struct wlr_touch *wlr_touch) {
// Don't free the touch, it's on the stack
}
const struct wlr_touch_impl touch_impl = {
const struct wlr_touch_impl x11_touch_impl = {
.destroy = touch_destroy,
};
@ -338,12 +330,12 @@ void update_x11_pointer_position(struct wlr_x11_output *output,
bool wlr_input_device_is_x11(struct wlr_input_device *wlr_dev) {
switch (wlr_dev->type) {
case WLR_INPUT_DEVICE_KEYBOARD:
return wlr_dev->keyboard->impl == &keyboard_impl;
return wlr_dev->keyboard->impl == &x11_keyboard_impl;
case WLR_INPUT_DEVICE_POINTER:
return wlr_dev->pointer->impl == &pointer_impl;
return wlr_dev->pointer->impl == &x11_pointer_impl;
case WLR_INPUT_DEVICE_TOUCH:
return wlr_dev->touch->impl == &touch_impl;
return wlr_dev->touch->impl == &x11_touch_impl;
default:
return wlr_dev->impl == &input_device_impl;
return false;
}
}