diff options
| -rw-r--r-- | backend/headless/output.c | 1 | ||||
| -rw-r--r-- | backend/libinput/backend.c | 1 | ||||
| -rw-r--r-- | examples/multi-pointer.c | 1 | ||||
| -rw-r--r-- | examples/pointer.c | 3 | ||||
| -rw-r--r-- | examples/simple.c | 1 | ||||
| -rw-r--r-- | examples/tablet.c | 1 | ||||
| -rw-r--r-- | examples/touch.c | 2 | ||||
| -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 | ||||
| -rw-r--r-- | types/tablet_v2/wlr_tablet_v2_pad.c | 1 | ||||
| -rw-r--r-- | types/wlr_cursor.c | 3 |
14 files changed, 22 insertions, 8 deletions
diff --git a/backend/headless/output.c b/backend/headless/output.c index 32c2a7fd..315f5a33 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -2,6 +2,7 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> #include <stdlib.h> +#include <stdio.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/render/wlr_renderer.h> #include <wlr/util/log.h> diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c index 3c42d7f8..12f76bbf 100644 --- a/backend/libinput/backend.c +++ b/backend/libinput/backend.c @@ -1,6 +1,7 @@ #include <assert.h> #include <libinput.h> #include <stdlib.h> +#include <stdio.h> #include <wlr/backend/interface.h> #include <wlr/backend/session.h> #include <wlr/util/log.h> diff --git a/examples/multi-pointer.c b/examples/multi-pointer.c index eceeb6d6..a48f5888 100644 --- a/examples/multi-pointer.c +++ b/examples/multi-pointer.c @@ -16,6 +16,7 @@ #include <wlr/types/wlr_list.h> #include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_output_layout.h> +#include <wlr/types/wlr_pointer.h> #include <wlr/util/log.h> #include <wlr/xcursor.h> #include <xkbcommon/xkbcommon.h> diff --git a/examples/pointer.c b/examples/pointer.c index 703aa59e..92a5934e 100644 --- a/examples/pointer.c +++ b/examples/pointer.c @@ -15,6 +15,9 @@ #include <wlr/types/wlr_list.h> #include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_output_layout.h> +#include <wlr/types/wlr_pointer.h> +#include <wlr/types/wlr_tablet_tool.h> +#include <wlr/types/wlr_touch.h> #include <wlr/types/wlr_xcursor_manager.h> #include <wlr/util/log.h> #include <xkbcommon/xkbcommon.h> diff --git a/examples/simple.c b/examples/simple.c index e3af1a11..ce58dfa9 100644 --- a/examples/simple.c +++ b/examples/simple.c @@ -10,6 +10,7 @@ #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_input_device.h> +#include <wlr/types/wlr_keyboard.h> #include <wlr/util/log.h> #include <xkbcommon/xkbcommon.h> diff --git a/examples/tablet.c b/examples/tablet.c index 7721ef72..59bf6979 100644 --- a/examples/tablet.c +++ b/examples/tablet.c @@ -14,6 +14,7 @@ #include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_input_device.h> +#include <wlr/types/wlr_keyboard.h> #include <wlr/types/wlr_tablet_pad.h> #include <wlr/types/wlr_tablet_tool.h> #include <wlr/util/log.h> diff --git a/examples/touch.c b/examples/touch.c index 39dd1d45..3d18dfd0 100644 --- a/examples/touch.c +++ b/examples/touch.c @@ -14,7 +14,9 @@ #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_list.h> #include <wlr/types/wlr_input_device.h> +#include <wlr/types/wlr_keyboard.h> #include <wlr/types/wlr_matrix.h> +#include <wlr/types/wlr_touch.h> #include <wlr/util/log.h> #include <xkbcommon/xkbcommon.h> #include "cat.h" 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 diff --git a/types/tablet_v2/wlr_tablet_v2_pad.c b/types/tablet_v2/wlr_tablet_v2_pad.c index fdffd475..779e24e5 100644 --- a/types/tablet_v2/wlr_tablet_v2_pad.c +++ b/types/tablet_v2/wlr_tablet_v2_pad.c @@ -8,6 +8,7 @@ #include <types/wlr_tablet_v2.h> #include <wayland-util.h> #include <wlr/types/wlr_tablet_tool.h> +#include <wlr/types/wlr_tablet_pad.h> #include <wlr/types/wlr_tablet_v2.h> #include <wlr/util/log.h> diff --git a/types/wlr_cursor.c b/types/wlr_cursor.c index 429acd6d..aff7859d 100644 --- a/types/wlr_cursor.c +++ b/types/wlr_cursor.c @@ -7,6 +7,9 @@ #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output.h> +#include <wlr/types/wlr_pointer.h> +#include <wlr/types/wlr_tablet_tool.h> +#include <wlr/types/wlr_touch.h> #include <wlr/util/log.h> #include "util/signal.h" |