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.
swaywm · Jul 27, 2019 · ca45f44 · ca45f44
1 parent 76ef089
commit ca45f44
Show file tree

Hide file tree

Showing 129 changed files with 136 additions and 145 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
 
 /**