inaban

commit: 95ba44890a51bffb1516ebe043f7ebb51f7c1bca
parent 246febff44e9a9fec685d46e77dcba6344783945
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Thu,  3 Mar 2022 21:35:28 +0100

inaban.h: Separate unstable wlroots parts

Diffstat:
M
Makefile
2
+-
M
inaban.h
12
+++++++++---

2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ EXE   = inaban
 TRANS =
 SRC   = xdg-decoration.c commands.c inaban.c
 
-CDEPS  = -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_POSIX_C_SOURCE=200809L -DWLR_USE_UNSTABLE -I./protocols
+CDEPS  = -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_POSIX_C_SOURCE=200809L -I./protocols
 CDEPS += `pkg-config --cflags $(DEPS)`
 LIBS   = `pkg-config --libs $(DEPS)`
 
diff --git a/inaban.h b/inaban.h
@@ -5,6 +5,14 @@
 #define INABAN_H
 #include <stdbool.h>
 #include <wayland-server.h>
+#include <xkbcommon/xkbcommon.h>
+
+// stable wlroots interfaces
+#include <wlr/types/wlr_matrix.h>
+#include <wlr/util/log.h>
+
+// unstable wlroots interfaces
+#define WLR_USE_UNSTABLE
 #include <wlr/backend.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
@@ -13,7 +21,6 @@
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_keyboard.h>
-#include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_pointer.h>
@@ -24,8 +31,7 @@
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/types/wlr_xdg_decoration_v1.h>
 #include <wlr/types/wlr_xdg_shell.h>
-#include <wlr/util/log.h>
-#include <xkbcommon/xkbcommon.h>
+#undef WLR_USE_UNSTABLE
 
 enum inaban_input_mode
 {