diff options
| author | Isaac Freund <ifreund@ifreund.xyz> | 2020-11-11 14:16:41 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-11-11 15:40:47 +0100 |
| commit | e06c9e43afd8d2067c2c28bc25ed0830e43e5c78 (patch) | |
| tree | 547939dfa46a72c85c771c615ab0f94cb1be6977 /include | |
| parent | 0724b3c453e45b59aecdaecd6b654e1febb68dc7 (diff) | |
Remove unneeded includes from wlr_input_device.h
This uncovered many places where we were using things without directly
including them.
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/wayland.h | 1 | ||||
| -rw-r--r-- | include/backend/x11.h | 3 | ||||
| -rw-r--r-- | include/wlr/types/wlr_input_device.h | 10 | ||||
| -rw-r--r-- | include/wlr/types/wlr_pointer.h | 1 | ||||
| -rw-r--r-- | include/wlr/types/wlr_seat.h | 1 |
5 files changed, 8 insertions, 8 deletions
diff --git a/include/backend/wayland.h b/include/backend/wayland.h index d782584f..9542a75f 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -12,6 +12,7 @@ #include <wlr/render/egl.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_box.h> +#include <wlr/types/wlr_pointer.h> #include <wlr/render/drm_format_set.h> struct wlr_wl_backend { diff --git a/include/backend/x11.h b/include/backend/x11.h index 549f6a77..03396361 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -10,7 +10,10 @@ #include <wlr/backend/x11.h> #include <wlr/config.h> #include <wlr/interfaces/wlr_input_device.h> +#include <wlr/interfaces/wlr_keyboard.h> #include <wlr/interfaces/wlr_output.h> +#include <wlr/interfaces/wlr_pointer.h> +#include <wlr/interfaces/wlr_touch.h> #include <wlr/render/egl.h> #include <wlr/render/wlr_renderer.h> diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h index 21462023..8ed9b465 100644 --- a/include/wlr/types/wlr_input_device.h +++ b/include/wlr/types/wlr_input_device.h @@ -9,6 +9,8 @@ #ifndef WLR_TYPES_WLR_INPUT_DEVICE_H #define WLR_TYPES_WLR_INPUT_DEVICE_H +#include <wayland-server-core.h> + enum wlr_button_state { WLR_BUTTON_RELEASED, WLR_BUTTON_PRESSED, @@ -23,14 +25,6 @@ enum wlr_input_device_type { WLR_INPUT_DEVICE_SWITCH, }; -/* Note: these are circular dependencies */ -#include <wlr/types/wlr_keyboard.h> -#include <wlr/types/wlr_pointer.h> -#include <wlr/types/wlr_touch.h> -#include <wlr/types/wlr_tablet_tool.h> -#include <wlr/types/wlr_tablet_pad.h> -#include <wlr/types/wlr_switch.h> - struct wlr_input_device_impl; struct wlr_input_device { diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h index 69699042..ac168d60 100644 --- a/include/wlr/types/wlr_pointer.h +++ b/include/wlr/types/wlr_pointer.h @@ -11,6 +11,7 @@ #include <stdint.h> #include <wayland-server-core.h> +#include <wayland-server-protocol.h> #include <wlr/types/wlr_input_device.h> struct wlr_pointer_impl; diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index 332ab0d3..5094874c 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -13,6 +13,7 @@ #include <wayland-server-core.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_keyboard.h> +#include <wlr/types/wlr_pointer.h> #include <wlr/types/wlr_surface.h> #define WLR_SERIAL_RINGSET_SIZE 128 |