From 2f82c92307271955b247e305ff3caf479d9a50de Mon Sep 17 00:00:00 2001
From: Kirill Primak <vyivel@eclair.cafe>
Date: Wed, 17 Apr 2024 16:04:36 +0300
Subject: [PATCH] Avoid using wayland-{client,server}.h

Their use is discouraged. Instead, include -core or -protocol headers.
---
 backend/wayland/output.c      | 2 +-
 backend/wayland/pointer.c     | 3 +--
 backend/wayland/seat.c        | 3 +--
 examples/embedded.c           | 4 ++--
 include/backend/wayland.h     | 2 +-
 include/wlr/backend/wayland.h | 3 ++-
 render/pixman/renderer.c      | 2 +-
 types/buffer/resource.c       | 2 +-
 types/wlr_shm.c               | 2 +-
 9 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index 2d3e3269..23c08bd4 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include <drm_fourcc.h>
-#include <wayland-client.h>
+#include <wayland-client-protocol.h>
 
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/render/wlr_renderer.h>
diff --git a/backend/wayland/pointer.c b/backend/wayland/pointer.c
index f795d12d..87383fa8 100644
--- a/backend/wayland/pointer.c
+++ b/backend/wayland/pointer.c
@@ -1,7 +1,6 @@
-
 #include <assert.h>
 #include <stdlib.h>
-#include <wayland-client.h>
+#include <wayland-client-protocol.h>
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/util/log.h>
 
diff --git a/backend/wayland/seat.c b/backend/wayland/seat.c
index 1fa7e3e4..b812b53a 100644
--- a/backend/wayland/seat.c
+++ b/backend/wayland/seat.c
@@ -1,4 +1,3 @@
-
 #include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -6,7 +5,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <wayland-client.h>
+#include <wayland-client-protocol.h>
 
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_output.h>
diff --git a/examples/embedded.c b/examples/embedded.c
index c488e011..f0f66119 100644
--- a/examples/embedded.c
+++ b/examples/embedded.c
@@ -4,9 +4,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wayland-client.h>
+#include <wayland-client-protocol.h>
 #include <wayland-egl.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/wayland.h>
 #include <wlr/render/allocator.h>
 #include <wlr/types/wlr_compositor.h>
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index a0bffcd4..003604df 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include <wayland-client.h>
+#include <wayland-client-protocol.h>
 #include <wayland-server-core.h>
 
 #include <wlr/backend/wayland.h>
diff --git a/include/wlr/backend/wayland.h b/include/wlr/backend/wayland.h
index f402693a..7e704130 100644
--- a/include/wlr/backend/wayland.h
+++ b/include/wlr/backend/wayland.h
@@ -1,7 +1,8 @@
 #ifndef WLR_BACKEND_WAYLAND_H
 #define WLR_BACKEND_WAYLAND_H
+
 #include <stdbool.h>
-#include <wayland-client.h>
+#include <wayland-client-protocol.h>
 #include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/types/wlr_output.h>
diff --git a/render/pixman/renderer.c b/render/pixman/renderer.c
index 27cde939..683f1bb5 100644
--- a/render/pixman/renderer.c
+++ b/render/pixman/renderer.c
@@ -2,7 +2,7 @@
 #include <drm_fourcc.h>
 #include <pixman.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-util.h>
 #include <wlr/render/interface.h>
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>
diff --git a/types/buffer/resource.c b/types/buffer/resource.c
index 294bac19..14d8f82d 100644
--- a/types/buffer/resource.c
+++ b/types/buffer/resource.c
@@ -1,6 +1,6 @@
 #include <assert.h>
 #include <string.h>
-#include <wayland-server.h>
+#include <wayland-server-protocol.h>
 #include <wlr/interfaces/wlr_buffer.h>
 #include <wlr/util/log.h>
 #include "types/wlr_buffer.h"
diff --git a/types/wlr_shm.c b/types/wlr_shm.c
index 47820c65..8ad9d7f5 100644
--- a/types/wlr_shm.c
+++ b/types/wlr_shm.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-protocol.h>
 #include <wlr/interfaces/wlr_buffer.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_shm.h>