From 1d9c1bcea6a223379af63b4d779d53663eaffcf8 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 22 Nov 2021 22:30:40 +0100 Subject: input-device: remove wlr_input_device.link This field's ownership is unclear: it's in wlr_input_device, but it's not managed by the common code, it's up to each individual backend to use it and clean it up. Since this is a backend implementation detail, move it to the backend-specific structs. --- include/backend/headless.h | 2 +- include/backend/libinput.h | 2 +- include/backend/wayland.h | 1 + include/wlr/types/wlr_input_device.h | 2 -- 4 files changed, 3 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/backend/headless.h b/include/backend/headless.h index 09d5856b..f60d07e6 100644 --- a/include/backend/headless.h +++ b/include/backend/headless.h @@ -29,7 +29,7 @@ struct wlr_headless_output { struct wlr_headless_input_device { struct wlr_input_device wlr_input_device; - + struct wl_list link; struct wlr_headless_backend *backend; }; diff --git a/include/backend/libinput.h b/include/backend/libinput.h index e85ad291..a6841d7e 100644 --- a/include/backend/libinput.h +++ b/include/backend/libinput.h @@ -26,7 +26,7 @@ struct wlr_libinput_backend { struct wlr_libinput_input_device { struct wlr_input_device wlr_input_device; - + struct wl_list link; struct libinput_device *handle; }; diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 32783597..4e5d3636 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -87,6 +87,7 @@ struct wlr_wl_output { struct wlr_wl_input_device { struct wlr_input_device wlr_input_device; + struct wl_list link; uint32_t fingers; struct wlr_wl_backend *backend; diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h index 8ed9b465..cbc877df 100644 --- a/include/wlr/types/wlr_input_device.h +++ b/include/wlr/types/wlr_input_device.h @@ -53,8 +53,6 @@ struct wlr_input_device { } events; void *data; - - struct wl_list link; }; #endif -- cgit v1.2.3