Wayland: fix wayland-only mode again

include/rofi.h

@@ -34,7 +34,6 @@
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
-#include <xcb/xcb.h>
 #include <xkbcommon/xkbcommon.h>
 
 /**

include/view-internal.h

@@ -36,7 +36,12 @@
 #include "widgets/listview.h"
 #include "widgets/textbox.h"
 #include "widgets/widget.h"
+
+#ifdef ENABLE_XCB
 #include "xcb.h"
+#else
+#include "xcb-dummy.h"
+#endif
 
 #ifdef ENABLE_WAYLAND
 #include "wayland.h"

include/view.h

@@ -31,7 +31,11 @@
 #include "mode.h"
 #include "widgets/widget.h"
 #include <pango/pango.h>
+#ifdef ENABLE_XCB
 #include <xcb/xcb.h>
+#else
+#include "xcb-dummy.h"
+#endif
 /**
  * @defgroup View View
  *

include/wayland-internal.h

@@ -6,7 +6,6 @@
 #include <libgwater-wayland.h>
 #include <nkutils-bindings.h>
 #include <wayland-client.h>
-#include <xcb/xkb.h>
 #include <xkbcommon/xkbcommon.h>
 
 #include "wayland.h"

include/xcb-dummy.h

@@ -0,0 +1,13 @@
+#ifndef ROFI_XCB_DUMMY_H
+#define ROFI_XCB_DUMMY_H
+
+// Dummy types for xcb values shared in view interface (not used in wayland mode)
+// This header exists so that rofi can be built without xcb headers present
+
+typedef int xcb_configure_notify_event_t;
+typedef int xcb_window_t;
+typedef int xcb_timestamp_t;
+
+#define XCB_WINDOW_NONE 0
+
+#endif

source/display.c

@@ -45,4 +45,4 @@ char *display_get_clipboard_data(enum clipboard_type type) {
   return proxy->get_clipboard_data(type);
 }
 
-void display_set_fullscreen_mode(void) { return proxy->set_fullscreen_mode(); }
+void display_set_fullscreen_mode(void) { proxy->set_fullscreen_mode(); }

source/view.c

@@ -60,6 +60,8 @@
 #ifdef ENABLE_XCB
 #include "xcb-internal.h"
 #include "xcb.h"
+#else
+#include "xcb-dummy.h"
 #endif
 
 static const view_proxy *proxy;

source/wayland/display.c

@@ -40,7 +40,6 @@
 #include <glib/gstdio.h>
 #include <wayland-client.h>
 #include <wayland-cursor.h>
-#include <xcb/xkb.h>
 #include <xkbcommon/xkbcommon-compose.h>
 #include <xkbcommon/xkbcommon.h>
 

test/helper-config-cmdline-parser.c

@@ -31,7 +31,6 @@
 #include "rofi.h"
 #include "settings.h"
 #include "widgets/textbox.h"
-#include "xcb.h"
 #include <assert.h>
 #include <glib.h>
 #include <helper.h>

test/helper-expand.c

@@ -31,7 +31,6 @@
 #include "settings.h"
 #include "theme.h"
 #include "widgets/textbox.h"
-#include "xcb.h"
 #include <assert.h>
 #include <glib.h>
 #include <helper.h>

test/helper-test.c

@@ -32,7 +32,6 @@
 #include "rofi.h"
 #include "settings.h"
 #include "theme.h"
-#include "xcb.h"
 #include <assert.h>
 #include <glib.h>
 #include <helper.h>

test/helper-tokenize.c

@@ -32,7 +32,6 @@
 #include "settings.h"
 #include "theme.h"
 #include "widgets/textbox.h"
-#include "xcb.h"
 #include <assert.h>
 #include <glib.h>
 #include <helper.h>

test/mode-test.c

@@ -37,7 +37,6 @@
 #include "rofi.h"
 #include "theme.h"
 #include "widgets/textbox.h"
-#include "xcb.h"
 #include <helper.h>
 #include <keyb.h>
 #include <mode-private.h>

test/textbox-test.c

@@ -31,10 +31,8 @@
 
 #include "display.h"
 #include "settings.h"
-#include "xcb.h"
 #include "xrmoptions.h"
 #include <assert.h>
-#include <cairo-xlib.h>
 #include <glib.h>
 #include <history.h>
 #include <rofi.h>

test/widget-test.c

@@ -28,7 +28,6 @@
 #include "display.h"
 #include "rofi-icon-fetcher.h"
 #include "rofi.h"
-#include "xcb.h"
 #include "xrmoptions.h"
 #include <assert.h>
 #include <glib.h>