diff options
| author | Simon Ser <contact@emersion.fr> | 2019-07-27 11:53:54 +0300 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-07-27 15:49:32 -0400 |
| commit | ca45f4490ccce64bf7aa0985951319646b55d258 (patch) | |
| tree | b786f4c4fb07ab3af9b1567510cb75b4eb905bc9 | |
| parent | 76ef089f52b20a2def3dd1f8a8564af165050dcb (diff) | |
Remove all wayland-server.h includes
The documentation for wayland-server.h says:
> Use of this header file is discouraged. Prefer including
> wayland-server-core.h instead, which does not include the server protocol
> header and as such only defines the library PI, excluding the deprecated API
> below.
Replacing wayland-server.h with wayland-server-core.h allows us to drop the
WL_HIDE_DEPRECATED declaration.
129 files changed, 136 insertions, 145 deletions
diff --git a/backend/backend.c b/backend/backend.c index 2c76d989..542d6f80 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend/drm.h> #include <wlr/backend/headless.h> #include <wlr/backend/interface.h> diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 7fdab816..541e720f 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -4,7 +4,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend/interface.h> #include <wlr/backend/session.h> #include <wlr/interfaces/wlr_output.h> diff --git a/backend/drm/drm.c b/backend/drm/drm.c index db727010..eef7beb5 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -12,7 +12,7 @@ #include <string.h> #include <strings.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wayland-util.h> #include <wlr/backend/interface.h> #include <wlr/interfaces/wlr_output.h> diff --git a/backend/rdp/keyboard.c b/backend/rdp/keyboard.c index b3c5869d..78dd8b08 100644 --- a/backend/rdp/keyboard.c +++ b/backend/rdp/keyboard.c @@ -1,5 +1,5 @@ #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_keyboard.h> #include <wlr/interfaces/wlr_keyboard.h> diff --git a/backend/rdp/output.c b/backend/rdp/output.c index 6133b751..45eba3aa 100644 --- a/backend/rdp/output.c +++ b/backend/rdp/output.c @@ -2,7 +2,7 @@ #include <EGL/egl.h> #include <EGL/eglext.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_output.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/util/log.h> diff --git a/backend/rdp/pointer.c b/backend/rdp/pointer.c index 31186669..b3fdcd73 100644 --- a/backend/rdp/pointer.c +++ b/backend/rdp/pointer.c @@ -1,7 +1,7 @@ #define _POSIX_C_SOURCE 200809L #include <stdlib.h> #include <string.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_pointer.h> #include <wlr/interfaces/wlr_pointer.h> diff --git a/backend/session/direct-freebsd.c b/backend/session/direct-freebsd.c index 391cc3fd..238664ac 100644 --- a/backend/session/direct-freebsd.c +++ b/backend/session/direct-freebsd.c @@ -13,7 +13,7 @@ #include <sys/types.h> #include <termios.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend/session/interface.h> #include <wlr/util/log.h> #include <xf86drm.h> diff --git a/backend/session/direct.c b/backend/session/direct.c index c634575a..4ffd711d 100644 --- a/backend/session/direct.c +++ b/backend/session/direct.c @@ -14,7 +14,7 @@ #include <sys/stat.h> #include <sys/sysmacros.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend/session/interface.h> #include <wlr/util/log.h> #include "backend/session/direct-ipc.h" diff --git a/backend/session/logind.c b/backend/session/logind.c index c7fb24c0..066003d9 100644 --- a/backend/session/logind.c +++ b/backend/session/logind.c @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <sys/sysmacros.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend/session/interface.h> #include <wlr/config.h> #include <wlr/util/log.h> diff --git a/backend/session/noop.c b/backend/session/noop.c index 87ec1207..0e13a177 100644 --- a/backend/session/noop.c +++ b/backend/session/noop.c @@ -3,7 +3,7 @@ #include <stdbool.h> #include <stdlib.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend/session/interface.h> #include <wlr/util/log.h> #include "util/signal.h" diff --git a/backend/session/session.c b/backend/session/session.c index 90fcfed6..70b4a567 100644 --- a/backend/session/session.c +++ b/backend/session/session.c @@ -6,7 +6,7 @@ #include <string.h> #include <sys/stat.h> #include <sys/types.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend/session.h> #include <wlr/backend/session/interface.h> #include <wlr/config.h> diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 25feb6fb..c2762c4a 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -5,7 +5,7 @@ #include <wlr/config.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend/interface.h> #include <wlr/interfaces/wlr_input_device.h> diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 6bece36d..26c56cab 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -10,7 +10,7 @@ #include <wlr/config.h> #include <X11/Xlib-xcb.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <xcb/xcb.h> #include <xcb/xfixes.h> #include <xcb/xinput.h> diff --git a/examples/fullscreen-shell.c b/examples/fullscreen-shell.c index e9e64ce1..dbea9f04 100644 --- a/examples/fullscreen-shell.c +++ b/examples/fullscreen-shell.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <time.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_compositor.h> diff --git a/examples/multi-pointer.c b/examples/multi-pointer.c index 44cf26d5..691bc49d 100644 --- a/examples/multi-pointer.c +++ b/examples/multi-pointer.c @@ -7,8 +7,7 @@ #include <string.h> #include <time.h> #include <unistd.h> -#include <wayland-server-protocol.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/backend/session.h> #include <wlr/render/gles2.h> diff --git a/examples/output-layout.c b/examples/output-layout.c index 5e406af0..d18a83af 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -8,8 +8,7 @@ #include <strings.h> #include <time.h> #include <unistd.h> -#include <wayland-server-protocol.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/backend/session.h> #include <wlr/render/wlr_renderer.h> diff --git a/examples/pointer.c b/examples/pointer.c index cf4b122d..4b0e6f46 100644 --- a/examples/pointer.c +++ b/examples/pointer.c @@ -6,8 +6,7 @@ #include <string.h> #include <time.h> #include <unistd.h> -#include <wayland-server-protocol.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/backend/session.h> #include <wlr/render/gles2.h> diff --git a/examples/rotation.c b/examples/rotation.c index cfcd001b..6e10721d 100644 --- a/examples/rotation.c +++ b/examples/rotation.c @@ -8,8 +8,7 @@ #include <strings.h> #include <time.h> #include <unistd.h> -#include <wayland-server-protocol.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/backend/session.h> #include <wlr/render/wlr_renderer.h> diff --git a/examples/simple.c b/examples/simple.c index 27eb6c20..96f33610 100644 --- a/examples/simple.c +++ b/examples/simple.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/backend/session.h> #include <wlr/types/wlr_output.h> diff --git a/examples/tablet.c b/examples/tablet.c index 6df28586..d437ff17 100644 --- a/examples/tablet.c +++ b/examples/tablet.c @@ -6,8 +6,7 @@ #include <string.h> #include <time.h> #include <unistd.h> -#include <wayland-server-protocol.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/backend/session.h> #include <wlr/render/wlr_renderer.h> diff --git a/examples/touch.c b/examples/touch.c index 4ca9b993..c306ba69 100644 --- a/examples/touch.c +++ b/examples/touch.c @@ -7,8 +7,7 @@ #include <string.h> #include <time.h> #include <unistd.h> -#include <wayland-server-protocol.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/backend/session.h> #include <wlr/types/wlr_output.h> diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index bc1c2933..f007c9e0 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -7,7 +7,7 @@ #include <stddef.h> #include <stdint.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wayland-util.h> #include <wlr/backend/drm.h> #include <wlr/backend/session.h> diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 8f8e1ea6..e25aba43 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -5,7 +5,7 @@ #include <wayland-client.h> #include <wayland-egl.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wayland-util.h> #include <wlr/backend/wayland.h> diff --git a/include/backend/x11.h b/include/backend/x11.h index 2bc08b21..e628e4cb 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -4,7 +4,7 @@ #include <stdbool.h> #include <X11/Xlib-xcb.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <xcb/xcb.h> #include <wlr/backend/x11.h> diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index 791f5a8b..d3d6ec18 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -1,7 +1,7 @@ #ifndef ROOTSTON_DESKTOP_H #define ROOTSTON_DESKTOP_H #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/config.h> #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_foreign_toplevel_management_v1.h> diff --git a/include/rootston/input.h b/include/rootston/input.h index 31810b4d..a799db59 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -1,7 +1,7 @@ #ifndef ROOTSTON_INPUT_H #define ROOTSTON_INPUT_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_cursor.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_seat.h> diff --git a/include/rootston/output.h b/include/rootston/output.h index 6b02d69f..257d9367 100644 --- a/include/rootston/output.h +++ b/include/rootston/output.h @@ -2,7 +2,7 @@ #define ROOTSTON_OUTPUT_H #include <pixman.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_output_damage.h> diff --git a/include/rootston/seat.h b/include/rootston/seat.h index b91f9578..fa3a83dd 100644 --- a/include/rootston/seat.h +++ b/include/rootston/seat.h @@ -1,7 +1,7 @@ #ifndef ROOTSTON_SEAT_H #define ROOTSTON_SEAT_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include "rootston/input.h" #include "rootston/keyboard.h" #include "rootston/layers.h" diff --git a/include/rootston/server.h b/include/rootston/server.h index 1836a374..f48549f2 100644 --- a/include/rootston/server.h +++ b/include/rootston/server.h @@ -1,7 +1,7 @@ #ifndef _ROOTSTON_SERVER_H #define _ROOTSTON_SERVER_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/backend/session.h> #include <wlr/config.h> diff --git a/include/types/wlr_data_device.h b/include/types/wlr_data_device.h index 5865c999..07a08c2f 100644 --- a/include/types/wlr_data_device.h +++ b/include/types/wlr_data_device.h @@ -1,7 +1,7 @@ #ifndef TYPES_WLR_DATA_DEVICE_H #define TYPES_WLR_DATA_DEVICE_H -#include <wayland-server.h> +#include <wayland-server-core.h> #define DATA_DEVICE_ALL_ACTIONS (WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY | \ WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE | \ diff --git a/include/types/wlr_seat.h b/include/types/wlr_seat.h index 15f1dc38..0ccb3345 100644 --- a/include/types/wlr_seat.h +++ b/include/types/wlr_seat.h @@ -1,7 +1,7 @@ #ifndef TYPES_WLR_SEAT_H #define TYPES_WLR_SEAT_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> const struct wlr_pointer_grab_interface default_pointer_grab_impl; diff --git a/include/types/wlr_tablet_v2.h b/include/types/wlr_tablet_v2.h index 334ea210..d2c4a212 100644 --- a/include/types/wlr_tablet_v2.h +++ b/include/types/wlr_tablet_v2.h @@ -2,7 +2,7 @@ #define TYPES_WLR_TABLET_V2_H #include "tablet-unstable-v2-protocol.h" -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_tablet_v2.h> struct wlr_tablet_seat_v2 { diff --git a/include/types/wlr_xdg_shell.h b/include/types/wlr_xdg_shell.h index 93058530..2afd564e 100644 --- a/include/types/wlr_xdg_shell.h +++ b/include/types/wlr_xdg_shell.h @@ -1,7 +1,7 @@ #ifndef TYPES_WLR_XDG_SHELL_H #define TYPES_WLR_XDG_SHELL_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_xdg_shell.h> #include "xdg-shell-protocol.h" diff --git a/include/types/wlr_xdg_shell_v6.h b/include/types/wlr_xdg_shell_v6.h index 59fca667..4c9d1fa0 100644 --- a/include/types/wlr_xdg_shell_v6.h +++ b/include/types/wlr_xdg_shell_v6.h @@ -1,7 +1,7 @@ #ifndef TYPES_WLR_XDG_SHELL_V6_H #define TYPES_WLR_XDG_SHELL_V6_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_xdg_shell_v6.h> #include "xdg-shell-unstable-v6-protocol.h" diff --git a/include/util/signal.h b/include/util/signal.h index cc6cb525..fd93073a 100644 --- a/include/util/signal.h +++ b/include/util/signal.h @@ -1,7 +1,7 @@ #ifndef UTIL_SIGNAL_H #define UTIL_SIGNAL_H -#include <wayland-server.h> +#include <wayland-server-core.h> void wlr_signal_emit_safe(struct wl_signal *signal, void *data); diff --git a/include/wlr/backend.h b/include/wlr/backend.h index 54f2b5e8..3337e51c 100644 --- a/include/wlr/backend.h +++ b/include/wlr/backend.h @@ -9,7 +9,7 @@ #ifndef WLR_BACKEND_H #define WLR_BACKEND_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend/session.h> #include <wlr/render/egl.h> diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index 3724adfb..e4b5e2d1 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -9,7 +9,7 @@ #ifndef WLR_BACKEND_DRM_H #define WLR_BACKEND_DRM_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/backend/session.h> #include <wlr/types/wlr_output.h> diff --git a/include/wlr/backend/libinput.h b/include/wlr/backend/libinput.h index 1a2ab294..50faaf7d 100644 --- a/include/wlr/backend/libinput.h +++ b/include/wlr/backend/libinput.h @@ -10,7 +10,7 @@ #define WLR_BACKEND_LIBINPUT_H #include <libinput.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/backend/session.h> #include <wlr/types/wlr_input_device.h> diff --git a/include/wlr/backend/session.h b/include/wlr/backend/session.h index 7b26f34c..36b80a8d 100644 --- a/include/wlr/backend/session.h +++ b/include/wlr/backend/session.h @@ -4,7 +4,7 @@ #include <libudev.h> #include <stdbool.h> #include <sys/types.h> -#include <wayland-server.h> +#include <wayland-server-core.h> struct session_impl; diff --git a/include/wlr/backend/wayland.h b/include/wlr/backend/wayland.h index 9a47d1ce..cd8e73fb 100644 --- a/include/wlr/backend/wayland.h +++ b/include/wlr/backend/wayland.h @@ -2,7 +2,7 @@ #define WLR_BACKEND_WAYLAND_H #include <stdbool.h> #include <wayland-client.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_output.h> diff --git a/include/wlr/backend/x11.h b/include/wlr/backend/x11.h index 9be976b2..5a6f050b 100644 --- a/include/wlr/backend/x11.h +++ b/include/wlr/backend/x11.h @@ -3,7 +3,7 @@ #include <stdbool.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/types/wlr_input_device.h> diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h index fb473ba8..915de5c0 100644 --- a/include/wlr/render/egl.h +++ b/include/wlr/render/egl.h @@ -19,7 +19,7 @@ #include <EGL/eglext.h> #include <pixman.h> #include <stdbool.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/render/dmabuf.h> #include <wlr/render/drm_format_set.h> diff --git a/include/wlr/types/wlr_box.h b/include/wlr/types/wlr_box.h index 40fd69bd..40585ab1 100644 --- a/include/wlr/types/wlr_box.h +++ b/include/wlr/types/wlr_box.h @@ -11,7 +11,7 @@ #include <pixman.h> #include <stdbool.h> -#include <wayland-server.h> +#include <wayland-server-protocol.h> struct wlr_box { int x, y; diff --git a/include/wlr/types/wlr_buffer.h b/include/wlr/types/wlr_buffer.h index 11b36596..86f8bccb 100644 --- a/include/wlr/types/wlr_buffer.h +++ b/include/wlr/types/wlr_buffer.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_BUFFER_H #include <pixman.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/render/dmabuf.h> /** diff --git a/include/wlr/types/wlr_compositor.h b/include/wlr/types/wlr_compositor.h index 36b9e83f..6aaea9c7 100644 --- a/include/wlr/types/wlr_compositor.h +++ b/include/wlr/types/wlr_compositor.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_COMPOSITOR_H #define WLR_TYPES_WLR_COMPOSITOR_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/render/wlr_renderer.h> struct wlr_surface; diff --git a/include/wlr/types/wlr_cursor.h b/include/wlr/types/wlr_cursor.h index 4c6b1202..58ce8505 100644 --- a/include/wlr/types/wlr_cursor.h +++ b/include/wlr/types/wlr_cursor.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_CURSOR_H #define WLR_TYPES_WLR_CURSOR_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_output_layout.h> diff --git a/include/wlr/types/wlr_data_control_v1.h b/include/wlr/types/wlr_data_control_v1.h index 32d169b4..d487a7db 100644 --- a/include/wlr/types/wlr_data_control_v1.h +++ b/include/wlr/types/wlr_data_control_v1.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_DATA_CONTROL_V1_H #define WLR_TYPES_WLR_DATA_CONTROL_V1_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> struct wlr_data_control_manager_v1 { diff --git a/include/wlr/types/wlr_data_device.h b/include/wlr/types/wlr_data_device.h index d8894d6e..c017e428 100644 --- a/include/wlr/types/wlr_data_device.h +++ b/include/wlr/types/wlr_data_device.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_DATA_DEVICE_H #define WLR_TYPES_WLR_DATA_DEVICE_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> extern const struct wlr_pointer_grab_interface diff --git a/include/wlr/types/wlr_export_dmabuf_v1.h b/include/wlr/types/wlr_export_dmabuf_v1.h index 42c88e5c..5b3fbc2c 100644 --- a/include/wlr/types/wlr_export_dmabuf_v1.h +++ b/include/wlr/types/wlr_export_dmabuf_v1.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_EXPORT_DMABUF_V1_H #include <stdbool.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/render/dmabuf.h> struct wlr_export_dmabuf_manager_v1 { diff --git a/include/wlr/types/wlr_foreign_toplevel_management_v1.h b/include/wlr/types/wlr_foreign_toplevel_management_v1.h index 6b234eb9..3adf2de5 100644 --- a/include/wlr/types/wlr_foreign_toplevel_management_v1.h +++ b/include/wlr/types/wlr_foreign_toplevel_management_v1.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_FOREIGN_TOPLEVEL_MANAGEMENT_V1_H #define WLR_TYPES_WLR_FOREIGN_TOPLEVEL_MANAGEMENT_V1_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_output.h> struct wlr_foreign_toplevel_manager_v1 { diff --git a/include/wlr/types/wlr_fullscreen_shell_v1.h b/include/wlr/types/wlr_fullscreen_shell_v1.h index a904d966..b014bf28 100644 --- a/include/wlr/types/wlr_fullscreen_shell_v1.h +++ b/include/wlr/types/wlr_fullscreen_shell_v1.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_FULLSCREEN_SHELL_V1_H #define WLR_TYPES_WLR_FULLSCREEN_SHELL_V1_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include "fullscreen-shell-unstable-v1-protocol.h" struct wlr_fullscreen_shell_v1 { diff --git a/include/wlr/types/wlr_gamma_control_v1.h b/include/wlr/types/wlr_gamma_control_v1.h index f186aa81..202fde12 100644 --- a/include/wlr/types/wlr_gamma_control_v1.h +++ b/include/wlr/types/wlr_gamma_control_v1.h @@ -1,7 +1,7 @@ #ifndef WLR_TYPES_WLR_GAMMA_CONTROL_V1_H #define WLR_TYPES_WLR_GAMMA_CONTROL_V1_H -#include <wayland-server.h> +#include <wayland-server-core.h> struct wlr_gamma_control_manager_v1 { struct wl_global *global; diff --git a/include/wlr/types/wlr_gtk_primary_selection.h b/include/wlr/types/wlr_gtk_primary_selection.h index f1a9a83b..bb16b4e3 100644 --- a/include/wlr/types/wlr_gtk_primary_selection.h +++ b/include/wlr/types/wlr_gtk_primary_selection.h @@ -14,7 +14,7 @@ #ifndef WLR_TYPES_WLR_GTK_PRIMARY_SELECTION_H #define WLR_TYPES_WLR_GTK_PRIMARY_SELECTION_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> /** diff --git a/include/wlr/types/wlr_idle.h b/include/wlr/types/wlr_idle.h index da268555..d16932f5 100644 --- a/include/wlr/types/wlr_idle.h +++ b/include/wlr/types/wlr_idle.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_IDLE_H #define WLR_TYPES_WLR_IDLE_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> /** diff --git a/include/wlr/types/wlr_idle_inhibit_v1.h b/include/wlr/types/wlr_idle_inhibit_v1.h index 2093eafe..0d007f9f 100644 --- a/include/wlr/types/wlr_idle_inhibit_v1.h +++ b/include/wlr/types/wlr_idle_inhibit_v1.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_IDLE_INHIBIT_V1_H #define WLR_TYPES_WLR_IDLE_INHIBIT_V1_H -#include <wayland-server.h> +#include <wayland-server-core.h> /* This interface permits clients to inhibit the idle behavior such as * screenblanking, locking, and screensaving. diff --git a/include/wlr/types/wlr_input_inhibitor.h b/include/wlr/types/wlr_input_inhibitor.h index f3187540..2dc007be 100644 --- a/include/wlr/types/wlr_input_inhibitor.h +++ b/include/wlr/types/wlr_input_inhibitor.h @@ -8,7 +8,7 @@ #ifndef WLR_TYPES_INPUT_INHIBITOR_H #define WLR_TYPES_INPUT_INHIBITOR_H -#include <wayland-server.h> +#include <wayland-server-core.h> struct wlr_input_inhibit_manager { struct wl_global *global; diff --git a/include/wlr/types/wlr_input_method_v2.h b/include/wlr/types/wlr_input_method_v2.h index d22d54d1..9b600c1e 100644 --- a/include/wlr/types/wlr_input_method_v2.h +++ b/include/wlr/types/wlr_input_method_v2.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_INPUT_METHOD_V2_H #include <stdint.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> struct wlr_input_method_v2_preedit_string { diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h index ae279541..e16df7a7 100644 --- a/include/wlr/types/wlr_keyboard.h +++ b/include/wlr/types/wlr_keyboard.h @@ -11,8 +11,8 @@ #include <stdbool.h> #include <stdint.h> -#include <wayland-server.h> -#include <wayland-server.h> +#include <wayland-server-core.h> +#include <wayland-server-core.h> #include <xkbcommon/xkbcommon.h> #define WLR_LED_COUNT 3 diff --git a/include/wlr/types/wlr_layer_shell_v1.h b/include/wlr/types/wlr_layer_shell_v1.h index fe0175f2..9613621a 100644 --- a/include/wlr/types/wlr_layer_shell_v1.h +++ b/include/wlr/types/wlr_layer_shell_v1.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_LAYER_SHELL_V1_H #include <stdbool.h> #include <stdint.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_surface.h> #include "wlr-layer-shell-unstable-v1-protocol.h" diff --git a/include/wlr/types/wlr_matrix.h b/include/wlr/types/wlr_matrix.h index a3961c35..359d84fb 100644 --- a/include/wlr/types/wlr_matrix.h +++ b/include/wlr/types/wlr_matrix.h @@ -17,7 +17,7 @@ #ifndef WLR_TYPES_WLR_MATRIX_H #define WLR_TYPES_WLR_MATRIX_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_box.h> /** Writes the identity matrix into mat */ diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 9bc1b67f..281f7daf 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -12,7 +12,7 @@ #include <pixman.h> #include <stdbool.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-protocol.h> #include <wayland-util.h> #include <wlr/render/dmabuf.h> #include <wlr/types/wlr_buffer.h> diff --git a/include/wlr/types/wlr_output_management_v1.h b/include/wlr/types/wlr_output_management_v1.h index 4d449601..cc74b404 100644 --- a/include/wlr/types/wlr_output_management_v1.h +++ b/include/wlr/types/wlr_output_management_v1.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_OUTPUT_MANAGEMENT_V1_H #include <stdbool.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_output.h> struct wlr_output_manager_v1 { diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h index 486e1bc9..69699042 100644 --- a/include/wlr/types/wlr_pointer.h +++ b/include/wlr/types/wlr_pointer.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_POINTER_H #include <stdint.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_input_device.h> struct wlr_pointer_impl; diff --git a/include/wlr/types/wlr_pointer_constraints_v1.h b/include/wlr/types/wlr_pointer_constraints_v1.h index fef8c2e9..e030a375 100644 --- a/include/wlr/types/wlr_pointer_constraints_v1.h +++ b/include/wlr/types/wlr_pointer_constraints_v1.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_POINTER_CONSTRAINTS_V1_H #include <stdint.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <pixman.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_seat.h> diff --git a/include/wlr/types/wlr_pointer_gestures_v1.h b/include/wlr/types/wlr_pointer_gestures_v1.h index 7caf0f53..86fcaf3d 100644 --- a/include/wlr/types/wlr_pointer_gestures_v1.h +++ b/include/wlr/types/wlr_pointer_gestures_v1.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_POINTER_GESTURES_V1_H #define WLR_TYPES_WLR_POINTER_GESTURES_V1_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> #include <wlr/types/wlr_surface.h> diff --git a/include/wlr/types/wlr_presentation_time.h b/include/wlr/types/wlr_presentation_time.h index 9f9f0e87..c80f6966 100644 --- a/include/wlr/types/wlr_presentation_time.h +++ b/include/wlr/types/wlr_presentation_time.h @@ -12,7 +12,7 @@ #include <stdbool.h> #include <stddef.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> struct wlr_presentation { struct wl_global *global; diff --git a/include/wlr/types/wlr_primary_selection.h b/include/wlr/types/wlr_primary_selection.h index 4df47380..af3d4849 100644 --- a/include/wlr/types/wlr_primary_selection.h +++ b/include/wlr/types/wlr_primary_selection.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_PRIMARY_SELECTION_H #define WLR_TYPES_WLR_PRIMARY_SELECTION_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> struct wlr_primary_selection_source; diff --git a/include/wlr/types/wlr_primary_selection_v1.h b/include/wlr/types/wlr_primary_selection_v1.h index e6bde8a3..b380ea61 100644 --- a/include/wlr/types/wlr_primary_selection_v1.h +++ b/include/wlr/types/wlr_primary_selection_v1.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_PRIMARY_SELECTION_V1_H #define WLR_TYPES_WLR_PRIMARY_SELECTION_V1_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> struct wlr_primary_selection_v1_device_manager { diff --git a/include/wlr/types/wlr_relative_pointer_v1.h b/include/wlr/types/wlr_relative_pointer_v1.h index 32ed574b..d4aa6fa8 100644 --- a/include/wlr/types/wlr_relative_pointer_v1.h +++ b/include/wlr/types/wlr_relative_pointer_v1.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_RELATIVE_POINTER_V1_H #define WLR_TYPES_WLR_RELATIVE_POINTER_V1_H -#include <wayland-server.h> +#include <wayland-server-core.h> /** * This protocol specifies a set of interfaces used for making clients able to diff --git a/include/wlr/types/wlr_screencopy_v1.h b/include/wlr/types/wlr_screencopy_v1.h index ff76d829..a01e4dab 100644 --- a/include/wlr/types/wlr_screencopy_v1.h +++ b/include/wlr/types/wlr_screencopy_v1.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_SCREENCOPY_V1_H #include <stdbool.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_box.h> struct wlr_screencopy_manager_v1 { diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index 974ca578..69fe1359 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_SEAT_H #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_keyboard.h> #include <wlr/types/wlr_surface.h> diff --git a/include/wlr/types/wlr_server_decoration.h b/include/wlr/types/wlr_server_decoration.h index 3e4eb5e1..cea47cdf 100644 --- a/include/wlr/types/wlr_server_decoration.h +++ b/include/wlr/types/wlr_server_decoration.h @@ -14,7 +14,7 @@ #ifndef WLR_TYPES_WLR_SERVER_DECORATION_H #define WLR_TYPES_WLR_SERVER_DECORATION_H -#include <wayland-server.h> +#include <wayland-server-core.h> /** * Possible values to use in request_mode and the event mode. Same as diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index 0c389987..f62171d1 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -13,7 +13,7 @@ #include <stdbool.h> #include <stdint.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_output.h> enum wlr_surface_state_field { diff --git a/include/wlr/types/wlr_switch.h b/include/wlr/types/wlr_switch.h index df1c8579..57f90384 100644 --- a/include/wlr/types/wlr_switch.h +++ b/include/wlr/types/wlr_switch.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_SWITCH_H #include <stdint.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_list.h> diff --git a/include/wlr/types/wlr_tablet_pad.h b/include/wlr/types/wlr_tablet_pad.h index d9bb284f..255fa89e 100644 --- a/include/wlr/types/wlr_tablet_pad.h +++ b/include/wlr/types/wlr_tablet_pad.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_TABLET_PAD_H #include <stdint.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_list.h> diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h index cb516ed9..f732ad40 100644 --- a/include/wlr/types/wlr_tablet_tool.h +++ b/include/wlr/types/wlr_tablet_tool.h @@ -10,7 +10,7 @@ #define WLR_TYPES_TABLET_TOOL_H #include <stdint.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_list.h> @@ -45,7 +45,7 @@ struct wlr_tablet_tool { struct { struct wl_signal destroy; } events; - + void *data; }; diff --git a/include/wlr/types/wlr_tablet_v2.h b/include/wlr/types/wlr_tablet_v2.h index d6fd646d..894b062d 100644 --- a/include/wlr/types/wlr_tablet_v2.h +++ b/include/wlr/types/wlr_tablet_v2.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_TABLET_V2_H #define WLR_TYPES_WLR_TABLET_V2_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> #include <wlr/types/wlr_input_device.h> diff --git a/include/wlr/types/wlr_text_input_v3.h b/include/wlr/types/wlr_text_input_v3.h index 0db0cf47..ac1b0a69 100644 --- a/include/wlr/types/wlr_text_input_v3.h +++ b/include/wlr/types/wlr_text_input_v3.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_TEXT_INPUT_V3_H #define WLR_TYPES_WLR_TEXT_INPUT_V3_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> #include <wlr/types/wlr_surface.h> diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h index 80ba768e..bb8a58c3 100644 --- a/include/wlr/types/wlr_touch.h +++ b/include/wlr/types/wlr_touch.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_TOUCH_H #include <stdint.h> -#include <wayland-server.h> +#include <wayland-server-core.h> struct wlr_touch_impl; diff --git a/include/wlr/types/wlr_virtual_keyboard_v1.h b/include/wlr/types/wlr_virtual_keyboard_v1.h index fbc9d223..ea172056 100644 --- a/include/wlr/types/wlr_virtual_keyboard_v1.h +++ b/include/wlr/types/wlr_virtual_keyboard_v1.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_VIRTUAL_KEYBOARD_V1_H #define WLR_TYPES_WLR_VIRTUAL_KEYBOARD_V1_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_keyboard.h> diff --git a/include/wlr/types/wlr_xcursor_manager.h b/include/wlr/types/wlr_xcursor_manager.h index 285006bf..25c277c1 100644 --- a/include/wlr/types/wlr_xcursor_manager.h +++ b/include/wlr/types/wlr_xcursor_manager.h @@ -9,7 +9,7 @@ #ifndef WLR_TYPES_WLR_XCURSOR_MANAGER_H #define WLR_TYPES_WLR_XCURSOR_MANAGER_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_cursor.h> #include <wlr/xcursor.h> diff --git a/include/wlr/types/wlr_xdg_decoration_v1.h b/include/wlr/types/wlr_xdg_decoration_v1.h index ba1ad84b..468872a5 100644 --- a/include/wlr/types/wlr_xdg_decoration_v1.h +++ b/include/wlr/types/wlr_xdg_decoration_v1.h @@ -1,7 +1,7 @@ #ifndef WLR_TYPES_WLR_XDG_DECORATION_V1 #define WLR_TYPES_WLR_XDG_DECORATION_V1 -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_xdg_shell.h> enum wlr_xdg_toplevel_decoration_v1_mode { diff --git a/include/wlr/types/wlr_xdg_output_v1.h b/include/wlr/types/wlr_xdg_output_v1.h index d4279fb9..d9e2b905 100644 --- a/include/wlr/types/wlr_xdg_output_v1.h +++ b/include/wlr/types/wlr_xdg_output_v1.h @@ -8,7 +8,7 @@ #ifndef WLR_TYPES_WLR_XDG_OUTPUT_V1_H #define WLR_TYPES_WLR_XDG_OUTPUT_V1_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_output_layout.h> struct wlr_xdg_output_v1 { diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h index 804b0083..16b6867b 100644 --- a/include/wlr/types/wlr_xdg_shell.h +++ b/include/wlr/types/wlr_xdg_shell.h @@ -10,7 +10,7 @@ #define WLR_TYPES_WLR_XDG_SHELL_H #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_seat.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include "xdg-shell-protocol.h" struct wlr_xdg_shell { diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index 2e3a5495..a73045f5 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -14,7 +14,7 @@ #ifndef WLR_TYPES_WLR_XDG_SHELL_V6_H #define WLR_TYPES_WLR_XDG_SHELL_V6_H -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_seat.h> #include "xdg-shell-unstable-v6-protocol.h" diff --git a/include/wlr/util/region.h b/include/wlr/util/region.h index 4aca07e1..c3dbd78a 100644 --- a/include/wlr/util/region.h +++ b/include/wlr/util/region.h @@ -19,7 +19,7 @@ #include <stdbool.h> #include <pixman.h> -#include <wayland-server.h> +#include <wayland-server-protocol.h> /** * Scales a region, ie. multiplies all its coordinates by `scale`. diff --git a/meson.build b/meson.build index 083d4728..cd280bf5 100644 --- a/meson.build +++ b/meson.build @@ -96,9 +96,6 @@ if cc.get_id() == 'clang' add_project_arguments('-Wno-missing-braces', language: 'c') endif -# Avoid wl_buffer deprecation warnings -add_project_arguments('-DWL_HIDE_DEPRECATED', language: 'c') - wayland_server = dependency('wayland-server', version: '>=1.16') wayland_client = dependency('wayland-client') wayland_egl = dependency('wayland-egl') diff --git a/rootston/input.c b/rootston/input.c index 757f1b35..d5e04d3d 100644 --- a/rootston/input.c +++ b/rootston/input.c @@ -2,7 +2,7 @@ #include <assert.h> #include <stdlib.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend/libinput.h> #include <wlr/config.h> #include <wlr/types/wlr_cursor.h> diff --git a/rootston/keyboard.c b/rootston/keyboard.c index 9d3fadf6..da88e914 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -2,7 +2,7 @@ #include <stdbool.h> #include <stdint.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend/session.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_pointer_constraints_v1.h> diff --git a/rootston/layer_shell.c b/rootston/layer_shell.c index 1a533755..278046a3 100644 --- a/rootston/layer_shell.c +++ b/rootston/layer_shell.c @@ -7,7 +7,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_layer_shell_v1.h> diff --git a/rootston/main.c b/rootston/main.c index b14989fa..350906e3 100644 --- a/rootston/main.c +++ b/rootston/main.c @@ -2,7 +2,7 @@ #include <assert.h> #include <stdlib.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/backend/headless.h> #include <wlr/backend/multi.h> diff --git a/rootston/seat.c b/rootston/seat.c index 719fc352..c51d6ee5 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -4,7 +4,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend/libinput.h> #include <wlr/config.h> #include <wlr/types/wlr_data_device.h> diff --git a/rootston/xdg_shell.c b/rootston/xdg_shell.c index 7b12ec70..7b565392 100644 --- a/rootston/xdg_shell.c +++ b/rootston/xdg_shell.c @@ -1,7 +1,7 @@ #include <assert.h> #include <stdbool.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_xdg_shell.h> diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c index 917ca3a0..5830d344 100644 --- a/rootston/xdg_shell_v6.c +++ b/rootston/xdg_shell_v6.c @@ -1,7 +1,7 @@ #include <assert.h> #include <stdbool.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_xdg_shell_v6.h> diff --git a/rootston/xwayland.c b/rootston/xwayland.c index 89d0e497..7dc637ce 100644 --- a/rootston/xwayland.c +++ b/rootston/xwayland.c @@ -1,7 +1,7 @@ #include <assert.h> #include <stdbool.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/config.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_surface.h> diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c index ca5cdc91..3ea7d073 100644 --- a/tinywl/tinywl.c +++ b/tinywl/tinywl.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <time.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/backend.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_cursor.h> diff --git a/types/data_device/wlr_data_device.c b/types/data_device/wlr_data_device.c index 57cc2081..4c908620 100644 --- a/types/data_device/wlr_data_device.c +++ b/types/data_device/wlr_data_device.c @@ -3,7 +3,7 @@ #include <string.h> #include <strings.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_seat.h> #include <wlr/util/log.h> diff --git a/types/data_device/wlr_data_offer.c b/types/data_device/wlr_data_offer.c index c0c008cb..ce28c6d6 100644 --- a/types/data_device/wlr_data_offer.c +++ b/types/data_device/wlr_data_offer.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include <strings.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_seat.h> #include <wlr/util/log.h> diff --git a/types/data_device/wlr_data_source.c b/types/data_device/wlr_data_source.c index 0ab0d7f7..1baaac60 100644 --- a/types/data_device/wlr_data_source.c +++ b/types/data_device/wlr_data_source.c @@ -4,7 +4,7 @@ #include <string.h> #include <strings.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_seat.h> #include <wlr/util/log.h> diff --git a/types/data_device/wlr_drag.c b/types/data_device/wlr_drag.c index ab0005d3..b4fe9a8a 100644 --- a/types/data_device/wlr_drag.c +++ b/types/data_device/wlr_drag.c @@ -3,7 +3,7 @@ #include <string.h> #include <strings.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_seat.h> #include <wlr/util/log.h> diff --git a/types/seat/wlr_seat.c b/types/seat/wlr_seat.c index 9605df32..0a5e2d4c 100644 --- a/types/seat/wlr_seat.c +++ b/types/seat/wlr_seat.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_primary_selection.h> diff --git a/types/seat/wlr_seat_keyboard.c b/types/seat/wlr_seat_keyboard.c index fef3b502..52a4222a 100644 --- a/types/seat/wlr_seat_keyboard.c +++ b/types/seat/wlr_seat_keyboard.c @@ -5,7 +5,7 @@ #include <sys/mman.h> #include <time.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_gtk_primary_selection.h> #include <wlr/types/wlr_input_device.h> diff --git a/types/seat/wlr_seat_pointer.c b/types/seat/wlr_seat_pointer.c index ac5ac88b..2a43e61b 100644 --- a/types/seat/wlr_seat_pointer.c +++ b/types/seat/wlr_seat_pointer.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_input_device.h> #include <wlr/util/log.h> #include "types/wlr_seat.h" diff --git a/types/seat/wlr_seat_touch.c b/types/seat/wlr_seat_touch.c index 6639aa6c..58db92cf 100644 --- a/types/seat/wlr_seat_touch.c +++ b/types/seat/wlr_seat_touch.c @@ -3,7 +3,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_input_device.h> #include <wlr/util/log.h> #include "types/wlr_seat.h" diff --git a/types/tablet_v2/wlr_tablet_v2.c b/types/tablet_v2/wlr_tablet_v2.c index 39db8d1f..b470d128 100644 --- a/types/tablet_v2/wlr_tablet_v2.c +++ b/types/tablet_v2/wlr_tablet_v2.c @@ -5,7 +5,7 @@ #include <assert.h> #include <stdlib.h> #include <string.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <types/wlr_tablet_v2.h> #include <wlr/config.h> #include <wlr/types/wlr_seat.h> diff --git a/types/wlr_compositor.c b/types/wlr_compositor.c index 7702a778..c4dba2b4 100644 --- a/types/wlr_compositor.c +++ b/types/wlr_compositor.c @@ -1,6 +1,6 @@ #include <assert.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_region.h> #include <wlr/types/wlr_surface.h> diff --git a/types/wlr_cursor.c b/types/wlr_cursor.c index 19176a13..03660917 100644 --- a/types/wlr_cursor.c +++ b/types/wlr_cursor.c @@ -2,7 +2,7 @@ #include <limits.h> #include <math.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_cursor.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_output_layout.h> diff --git a/types/wlr_gamma_control_v1.c b/types/wlr_gamma_control_v1.c index 8ccc96e5..4e8abaf2 100644 --- a/types/wlr_gamma_control_v1.c +++ b/types/wlr_gamma_control_v1.c @@ -2,7 +2,7 @@ #include <fcntl.h> #include <stdlib.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/types/wlr_gamma_control_v1.h> #include <wlr/types/wlr_output.h> diff --git a/types/wlr_idle.c b/types/wlr_idle.c index 7ea8cd76..ffa6131f 100644 --- a/types/wlr_idle.c +++ b/types/wlr_idle.c @@ -1,7 +1,7 @@ #include <assert.h> #include <stdlib.h> #include <string.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_idle.h> #include <wlr/util/log.h> #include "idle-protocol.h" diff --git a/types/wlr_idle_inhibit_v1.c b/types/wlr_idle_inhibit_v1.c index 5f3d3d40..72b9e540 100644 --- a/types/wlr_idle_inhibit_v1.c +++ b/types/wlr_idle_inhibit_v1.c @@ -1,11 +1,11 @@ #include <assert.h> #include <stdlib.h> -#include <wlr/util/log.h> #include <util/signal.h> -#include <wlr/types/wlr_surface.h> +#include <wayland-server-core.h> +#include <wayland-util.h> #include <wlr/types/wlr_idle_inhibit_v1.h> -#include "wayland-util.h" -#include "wayland-server.h" +#include <wlr/types/wlr_surface.h> +#include <wlr/util/log.h> #include "idle-inhibit-unstable-v1-protocol.h" static const struct zwp_idle_inhibit_manager_v1_interface idle_inhibit_impl; diff --git a/types/wlr_input_device.c b/types/wlr_input_device.c index 049135fb..1364aa3d 100644 --- a/types/wlr_input_device.c +++ b/types/wlr_input_device.c @@ -1,7 +1,7 @@ #define _POSIX_C_SOURCE 200809L #include <stdlib.h> #include <string.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_keyboard.h> #include <wlr/interfaces/wlr_pointer.h> diff --git a/types/wlr_input_inhibitor.c b/types/wlr_input_inhibitor.c index fa692d6c..699ec941 100644 --- a/types/wlr_input_inhibitor.c +++ b/types/wlr_input_inhibitor.c @@ -1,7 +1,7 @@ #include <assert.h> #include <stdbool.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include "wlr/types/wlr_input_inhibitor.h" #include "wlr-input-inhibitor-unstable-v1-protocol.h" #include "util/signal.h" diff --git a/types/wlr_keyboard.c b/types/wlr_keyboard.c index cffa3ec6..1235d0b0 100644 --- a/types/wlr_keyboard.c +++ b/types/wlr_keyboard.c @@ -2,7 +2,7 @@ #include <assert.h> #include <stdlib.h> #include <string.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/interfaces/wlr_keyboard.h> #include <wlr/types/wlr_keyboard.h> #include <wlr/util/log.h> diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c index ab9069e4..330caaf2 100644 --- a/types/wlr_layer_shell_v1.c +++ b/types/wlr_layer_shell_v1.c @@ -2,7 +2,7 @@ #include <assert.h> #include <stdlib.h> #include <string.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_layer_shell_v1.h> #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_surface.h> diff --git a/types/wlr_linux_dmabuf_v1.c b/types/wlr_linux_dmabuf_v1.c index 19eab3f1..76d80b83 100644 --- a/types/wlr_linux_dmabuf_v1.c +++ b/types/wlr_linux_dmabuf_v1.c @@ -3,7 +3,7 @@ #include <drm_fourcc.h> #include <stdlib.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/render/drm_format_set.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_linux_dmabuf_v1.h> diff --git a/types/wlr_output.c b/types/wlr_output.c index 22b22ef7..189b175c 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -4,7 +4,7 @@ #include <string.h> #include <tgmath.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/render/interface.h> #include <wlr/render/wlr_renderer.h> diff --git a/types/wlr_output_damage.c b/types/wlr_output_damage.c index a1fb6134..8c288e44 100644 --- a/types/wlr_output_damage.c +++ b/types/wlr_output_damage.c @@ -1,7 +1,7 @@ #include <stddef.h> #include <stdlib.h> #include <time.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_output_damage.h> #include <wlr/types/wlr_output.h> diff --git a/types/wlr_pointer.c b/types/wlr_pointer.c index 6d50ef0b..d18fe754 100644 --- a/types/wlr_pointer.c +++ b/types/wlr_pointer.c @@ -1,6 +1,6 @@ #include <stdlib.h> #include <string.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/interfaces/wlr_pointer.h> #include <wlr/types/wlr_pointer.h> diff --git a/types/wlr_pointer_constraints_v1.c b/types/wlr_pointer_constraints_v1.c index 196af92e..04e48416 100644 --- a/types/wlr_pointer_constraints_v1.c +++ b/types/wlr_pointer_constraints_v1.c @@ -3,7 +3,7 @@ #include <pixman.h> #include <stdbool.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_box.h> #include <wlr/types/wlr_pointer_constraints_v1.h> #include <wlr/types/wlr_region.h> diff --git a/types/wlr_pointer_gestures_v1.c b/types/wlr_pointer_gestures_v1.c index cbe951eb..6d453774 100644 --- a/types/wlr_pointer_gestures_v1.c +++ b/types/wlr_pointer_gestures_v1.c @@ -4,7 +4,7 @@ #include <assert.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_pointer.h> #include <wlr/types/wlr_pointer_gestures_v1.h> #include <wlr/util/log.h> diff --git a/types/wlr_region.c b/types/wlr_region.c index 6996ab14..808cbb72 100644 --- a/types/wlr_region.c +++ b/types/wlr_region.c @@ -2,7 +2,7 @@ #include <pixman.h> #include <stdio.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/types/wlr_region.h> static void region_add(struct wl_client *client, struct wl_resource *resource, diff --git a/types/wlr_relative_pointer_v1.c b/types/wlr_relative_pointer_v1.c index 04a44725..5210e0ce 100644 --- a/types/wlr_relative_pointer_v1.c +++ b/types/wlr_relative_pointer_v1.c @@ -1,12 +1,12 @@ -#include <stdlib.h> #include <assert.h> #include <inttypes.h> -#include <wlr/util/log.h> +#include <stdlib.h> #include <util/signal.h> +#include <wayland-server-core.h> +#include <wayland-util.h> #include <wlr/types/wlr_relative_pointer_v1.h> #include <wlr/types/wlr_seat.h> -#include "wayland-util.h" -#include "wayland-server.h" +#include <wlr/util/log.h> #include "relative-pointer-unstable-v1-protocol.h" #define RELATIVE_POINTER_MANAGER_VERSION 1 diff --git a/types/wlr_surface.c b/types/wlr_surface.c index febfcd43..7b5cea95 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -1,6 +1,6 @@ #include <assert.h> #include <stdlib.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/render/interface.h> #include <wlr/types/wlr_buffer.h> #include <wlr/types/wlr_compositor.h> diff --git a/types/wlr_switch.c b/types/wlr_switch.c index c6e7378f..248997a0 100644 --- a/types/wlr_switch.c +++ b/types/wlr_switch.c @@ -1,6 +1,6 @@ #include <stdlib.h> #include <string.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/interfaces/wlr_switch.h> #include <wlr/types/wlr_switch.h> diff --git a/types/wlr_tablet_pad.c b/types/wlr_tablet_pad.c index 804d6910..71421e72 100644 --- a/types/wlr_tablet_pad.c +++ b/types/wlr_tablet_pad.c @@ -1,6 +1,6 @@ #include <stdlib.h> #include <string.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/interfaces/wlr_tablet_pad.h> #include <wlr/types/wlr_tablet_pad.h> diff --git a/types/wlr_tablet_tool.c b/types/wlr_tablet_tool.c index ca92d4e2..6a5de4ee 100644 --- a/types/wlr_tablet_tool.c +++ b/types/wlr_tablet_tool.c @@ -1,6 +1,6 @@ #include <stdlib.h> #include <string.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/interfaces/wlr_tablet_tool.h> #include <wlr/types/wlr_tablet_tool.h> diff --git a/types/wlr_touch.c b/types/wlr_touch.c index f04a8ffe..9a6dacfa 100644 --- a/types/wlr_touch.c +++ b/types/wlr_touch.c @@ -1,6 +1,6 @@ #include <stdlib.h> #include <string.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/interfaces/wlr_touch.h> #include <wlr/types/wlr_touch.h> @@ -6,7 +6,7 @@ #include <string.h> #include <time.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/util/log.h> static bool colored = true; diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c index 489640d3..2018d341 100644 --- a/xwayland/xwayland.c +++ b/xwayland/xwayland.c @@ -10,7 +10,7 @@ #include <sys/wait.h> #include <time.h> #include <unistd.h> -#include <wayland-server.h> +#include <wayland-server-core.h> #include <wlr/util/log.h> #include <wlr/xwayland.h> #include "sockets.h" |