From 175f61c2a47eefbd1b6aa247d72b817411af6cf6 Mon Sep 17 00:00:00 2001
From: Ethan Lee <flibitijibibo@gmail.com>
Date: Wed, 3 Feb 2021 17:55:45 -0500
Subject: [PATCH] API: Avoid stdbool, do not include wayland-client.h

---
 demo/demo.c                |  1 +
 demo/egl.c                 |  1 +
 src/libdecoration-plugin.h |  2 ++
 src/libdecoration.c        |  8 ++++----
 src/libdecoration.h        | 17 +++++++++++------
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/demo/demo.c b/demo/demo.c
index 8d0d987..ffbf6fd 100644
--- a/demo/demo.c
+++ b/demo/demo.c
@@ -36,6 +36,7 @@
 #include <sys/mman.h>
 #include <unistd.h>
 #include <wayland-cursor.h>
+#include <wayland-client.h>
 
 #include "libdecoration.h"
 #include "utils.h"
diff --git a/demo/egl.c b/demo/egl.c
index 1670beb..0d582ea 100644
--- a/demo/egl.c
+++ b/demo/egl.c
@@ -25,6 +25,7 @@
  * SOFTWARE.
  */
 
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/libdecoration-plugin.h b/src/libdecoration-plugin.h
index 7a8658c..f88d94a 100644
--- a/src/libdecoration-plugin.h
+++ b/src/libdecoration-plugin.h
@@ -28,6 +28,8 @@
 #define LIBDECORATION_PLUGIN_H
 
 #include "libdecoration.h"
+#include <stdbool.h>
+#include <wayland-client.h>
 
 struct libdecor_frame_private;
 
diff --git a/src/libdecoration.c b/src/libdecoration.c
index 639914f..78e430b 100644
--- a/src/libdecoration.c
+++ b/src/libdecoration.c
@@ -181,7 +181,7 @@ window_size_to_content_size(struct libdecor_configuration *configuration,
 	}
 }
 
-LIBDECOR_EXPORT bool
+LIBDECOR_EXPORT uint8_t
 libdecor_configuration_get_content_size(struct libdecor_configuration *configuration,
 					struct libdecor_frame *frame,
 					int *width,
@@ -207,7 +207,7 @@ libdecor_configuration_get_content_size(struct libdecor_configuration *configura
 	return true;
 }
 
-LIBDECOR_EXPORT bool
+LIBDECOR_EXPORT uint8_t
 libdecor_configuration_get_window_size(struct libdecor_configuration *configuration,
 				       int *width,
 				       int *height)
@@ -223,7 +223,7 @@ libdecor_configuration_get_window_size(struct libdecor_configuration *configurat
 	return true;
 }
 
-LIBDECOR_EXPORT bool
+LIBDECOR_EXPORT uint8_t
 libdecor_configuration_get_window_state(struct libdecor_configuration *configuration,
 					enum libdecor_window_state *window_state)
 {
@@ -578,7 +578,7 @@ libdecor_frame_unset_capabilities(struct libdecor_frame *frame,
 	frame->priv->capabilities &= ~capabilities;
 }
 
-LIBDECOR_EXPORT bool
+LIBDECOR_EXPORT uint8_t
 libdecor_frame_has_capability(struct libdecor_frame *frame,
 			      enum libdecor_capabilities capability)
 {
diff --git a/src/libdecoration.h b/src/libdecoration.h
index 95379c4..535ec07 100644
--- a/src/libdecoration.h
+++ b/src/libdecoration.h
@@ -27,8 +27,13 @@
 #ifndef LIBDECORATION_H
 #define LIBDECORATION_H
 
-#include <stdbool.h>
-#include <wayland-client.h>
+#include <stdint.h>
+#if !defined(WAYLAND_CLIENT_H)
+struct wl_display;
+struct wl_surface;
+struct wl_seat;
+struct wl_output;
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -140,7 +145,7 @@ void
 libdecor_frame_unset_capabilities(struct libdecor_frame *frame,
 				  enum libdecor_capabilities capabilities);
 
-bool
+uint8_t
 libdecor_frame_has_capability(struct libdecor_frame *frame,
 			      enum libdecor_capabilities capability);
 
@@ -216,18 +221,18 @@ libdecor_state_new(int width,
 void
 libdecor_state_free(struct libdecor_state *state);
 
-bool
+uint8_t
 libdecor_configuration_get_content_size(struct libdecor_configuration *configuration,
 					struct libdecor_frame *frame,
 					int *width,
 					int *height);
 
-bool
+uint8_t
 libdecor_configuration_get_window_size(struct libdecor_configuration *configuration,
 				       int *width,
 				       int *height);
 
-bool
+uint8_t
 libdecor_configuration_get_window_state(struct libdecor_configuration *configuration,
 					enum libdecor_window_state *window_state);
 
-- 
2.26.2