dbus should work on netbsd now

include/Mw/LowLevel.h

@@ -6,7 +6,7 @@
 #ifndef __MW_LOWLEVEL_H__
 #define __MW_LOWLEVEL_H__
 
-#include "Mw/BaseTypes.h"
+#include <Mw/BaseTypes.h>
 #include <Mw/MachDep.h>
 
 typedef struct _MwLLHandler*	  MwLLHandler;

pl/ostype/ClassicMacOS.pl

@@ -1,6 +1,8 @@
 use_backend("classicmacos");
 
-print("Compiling for Classic Mac OS via ./configure currently outputs a broken executable and it only supports PowerPC. Help is wanted. In the mean time, use CMake.")
+print(
+"Compiling for Classic Mac OS via ./configure currently outputs a broken executable and it only supports PowerPC. Help is wanted. In the mean time, use CMake."
+);
 
 $cc = $ENV{RETRO68_TOOLCHAIN_PATH} . "/bin/powerpc-apple-macos-gcc";
 $ar = $ENV{RETRO68_TOOLCHAIN_PATH} . "/bin/powerpc-apple-macos-ar";

pl/ostype/NetBSD.pl

@@ -4,4 +4,6 @@ add_libdir(
 use_backend("x11");
 add_libs("-lpthread");
 
+add_cflags("-DUSE_DBUS");
+
 1;

pl/rules.pl

@@ -31,6 +31,7 @@ if (grep(/^gdi$/, @backends)) {
 }
 
 if (grep(/^classicmacos$/, @backends)) {
+
     #add_cflags("-DCLASSIC_MAC_OS");
     new_object("src/backend/classicmacos.c");
 
@@ -56,11 +57,13 @@ if (grep(/^wayland$/, @backends)) {
     scan_wayland_protocol("unstable", "pointer-constraints", "-unstable-v1");
     scan_wayland_protocol("unstable", "relative-pointer",    "-unstable-v1");
 
-    add_cflags(`pkg-config --cflags dbus-1`);
-
     $gl_libs = "-lGL -lGLU";
 }
 
+if (grep(/( |^)-DUSE_DBUS( |$)/, $cflags)) {
+    add_cflags(`pkg-config --cflags dbus-1`);
+}
+
 if (grep(/^cocoa$/, @backends) || param_get("gnustep")) {
     add_cflags("-DUSE_COCOA");
     new_object("src/backend/cocoa.m");

src/backend/gdi.c

@@ -823,7 +823,6 @@ static void MwLLSetDarkThemeImpl(MwLL handle, int toggle){
 	BOOL v = toggle ? TRUE : FALSE;
 
 	DwmSetWindowAttribute(handle->gdi.hWnd, 20, &v, sizeof(v));
-
 }
 
 static int MwLLGDICallInitImpl(void) {

src/backend/wayland.c

@@ -1817,6 +1817,7 @@ static void widget_setup(MwLL r, MwLL parent, int x, int y, int width, int heigh
 	}
 }
 
+#ifdef USE_DBUS
 static void detect_dark_theme(MwLL handle) {
 	MwU32 value	 = 0;
 	MwU32 dark_theme = 0;
@@ -1826,6 +1827,7 @@ static void detect_dark_theme(MwLL handle) {
 
 	MwLLDispatch(handle, dark_theme, &dark_theme);
 }
+#endif
 
 static MwLL MwLLCreateImpl(MwLL parent, int x, int y, int width, int height) {
 	MwLL r;
@@ -1876,9 +1878,11 @@ static void MwLLDestroyImpl(MwLL handle) {
 	pthread_mutex_unlock(&handle->wayland.eventsMutex);
 	pthread_mutex_destroy(&handle->wayland.eventsMutex);
 
+#ifdef USE_DBUS
 	if(!wl_call_tbl.has_dbus) {
 		MwLLDBusFreeContext(&wl_call_tbl.dbus, &handle->wayland.dbus);
 	}
+#endif
 
 	buffer_destroy(&handle->wayland.cursor);
 	wl_region_destroy(handle->wayland.region);
@@ -2161,11 +2165,13 @@ static int MwLLPendingImpl(MwLL handle) {
 	int pending = 0;
 
 	if(handle->wayland.dark_theme_detection) {
+		handle->wayland.dark_theme_detection = MwFALSE;
+#ifdef USE_DBUS
 		if(wl_call_tbl.has_dbus) {
 			detect_dark_theme(handle);
-			handle->wayland.dark_theme_detection = MwFALSE;
 			MwLLDispatch(handle, draw, NULL);
 		}
+#endif
 	}
 
 	if(!handle->wayland.did_initial_resize) {

src/backend/x11.c

@@ -9,8 +9,10 @@ static struct symtbl {
 	void*  lib_xrender;
 	MwBool has_xrender;
 
+#ifdef USE_DBUS
 	MwLLDBusFuncTable dbus;
 	MwBool		  has_dbus;
+#endif
 
 	int (*XClearWindow)(Display* display, Window w);
 	XImage* (*XCreateImage)(Display*, Visual*, unsigned int, int, int, char*, unsigned int, unsigned int, int, int);
@@ -311,6 +313,7 @@ static XVisualInfo* get_visual_info(Display* display) {
 	return XGetVisualInfo(display, VisualIDMask, &xvi, &n);
 }
 
+#ifdef USE_DBUS
 static void detect_dark_theme(MwLL handle) {
 	MwU32 value	 = 0;
 	MwU32 dark_theme = 0;
@@ -320,6 +323,7 @@ static void detect_dark_theme(MwLL handle) {
 
 	MwLLDispatch(handle, dark_theme, &dark_theme);
 }
+#endif
 
 static MwLL MwLLCreateImpl(MwLL parent, int x, int y, int width, int height) {
 	MwLL	      r;
@@ -470,9 +474,11 @@ static void MwLLDestroyImpl(MwLL handle) {
 
 	if(handle->x11.toplevel) XCloseDisplay(handle->x11.display);
 
+#ifdef USE_DBUS
 	if(!xsymtbl.has_dbus) {
 		MwLLDBusFreeContext(&xsymtbl.dbus, &handle->x11.dbus);
 	}
+#endif
 
 	free(handle);
 }
@@ -633,11 +639,13 @@ static int MwLLPendingImpl(MwLL handle) {
 	XEvent ev;
 
 	if(handle->x11.dark_theme_detection) {
+		handle->x11.dark_theme_detection = MwFALSE;
+#ifdef USE_DBUS
 		if(xsymtbl.has_dbus) {
 			detect_dark_theme(handle);
-			handle->x11.dark_theme_detection = MwFALSE;
 			MwLLDispatch(handle, draw, NULL);
 		}
+#endif
 	}
 
 	if(handle->x11.clipboard_pending && (MwTimeGetTick() - handle->x11.clipboard_time) >= ClipboardTimeout) {
@@ -1258,9 +1266,12 @@ static void MwLLSetClipboardImpl(MwLL handle, const char* text, int clipboard_ty
 
 	(void)handle;
 	(void)text;
+	(void)clipboard_type;
 }
 
 static void MwLLGetClipboardImpl(MwLL handle, int clipboard_type) {
+	(void)clipboard_type;
+
 	if(handle->x11.clipboard_pending) return;
 
 	XConvertSelection(handle->x11.display, handle->x11.clipboard, handle->x11.utf8_string, handle->x11.selection, handle->x11.window, CurrentTime);
@@ -1427,7 +1438,9 @@ static int MwLLX11CallInitImpl(void) {
 	XRENDER_FUNC_LOAD(XRenderComposite)
 #endif
 
+#ifdef USE_DBUS
 	xsymtbl.has_dbus = MwLLDBusFuncSetup(&xsymtbl.dbus);
+#endif
 	return 0;
 }