From d05e31b154baea11d14f76c99deb00b682e56f8f Mon Sep 17 00:00:00 2001
From: IoI_xD <alphaproject217@gmail.com>
Date: Wed, 15 Apr 2026 13:00:59 -0700
Subject: [PATCH] wayland: don't poll for dark theme, that doesn't work

---
 include/Mw/LowLevel/Wayland.h |  2 ++
 src/backend/wayland.c         | 49 +++++++++++++++++++++--------------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/include/Mw/LowLevel/Wayland.h b/include/Mw/LowLevel/Wayland.h
index 9377bc8..d4ebdef 100644
--- a/include/Mw/LowLevel/Wayland.h
+++ b/include/Mw/LowLevel/Wayland.h
@@ -479,6 +479,8 @@ struct _MwLLWayland {
 	struct zwp_locked_pointer_v1*		locked_pointer;
 	MwBool					pointer_constrained;
 
+	MwBool		dark_theme_detection;
+	time_t		dbus_timer;
 	DBusConnection* dbus_conn;
 	DBusError	dbus_err;
 	DBusMessage*	dbus_msg;
diff --git a/src/backend/wayland.c b/src/backend/wayland.c
index e1e8ee4..68207b8 100644
--- a/src/backend/wayland.c
+++ b/src/backend/wayland.c
@@ -1831,11 +1831,17 @@ static void widget_setup(MwLL r, MwLL parent, int x, int y, int width, int heigh
 }
 
 static void dark_theme_detection_setup(MwLL handle) {
+	const char* namespace	     = "org.freedesktop.appearance";
+	const char* key		     = "color-scheme"; /* 0=no preference, 1=dark, 2=light */
+	MwU32	    value	     = 0;
+	int	    translated_value = 0;
 
 	if(!wl_call_tbl.dbus_lib) {
 		return;
 	}
 
+	time(&handle->wayland.dbus_timer);
+
 	wl_call_tbl.dbus_error_init(&handle->wayland.dbus_err);
 
 	handle->wayland.dbus_conn = wl_call_tbl.dbus_bus_get(0 /* DBUS_BUS_SESSION */, &handle->wayland.dbus_err);
@@ -1848,17 +1854,6 @@ static void dark_theme_detection_setup(MwLL handle) {
 		fprintf(stderr, "[WARNING] Could not detect dark theme: Failed to connect to session bus\n");
 		return;
 	}
-}
-
-static void detect_dark_theme(MwLL handle) {
-	const char* namespace	     = "org.freedesktop.appearance";
-	const char* key		     = "color-scheme"; /* 0=no preference, 1=dark, 2=light */
-	MwU32	    value	     = 0;
-	int	    translated_value = 0;
-
-	if(!handle->wayland.dbus_conn) {
-		return;
-	}
 
 	handle->wayland.dbus_msg = wl_call_tbl.dbus_message_new_method_call(
 	    "org.freedesktop.portal.Desktop",
@@ -1873,9 +1868,18 @@ static void detect_dark_theme(MwLL handle) {
 	wl_call_tbl.dbus_message_iter_init_append(handle->wayland.dbus_msg, &handle->wayland.dbus_args);
 	wl_call_tbl.dbus_message_iter_append_basic(&handle->wayland.dbus_args, 's', &namespace);
 	wl_call_tbl.dbus_message_iter_append_basic(&handle->wayland.dbus_args, 's', &key);
+}
+
+static void detect_dark_theme(MwLL handle) {
+	const char* namespace = "org.freedesktop.appearance";
+	const char* key	      = "color-scheme"; /* 0=no preference, 1=dark, 2=light */
+	MwU32	    value     = 0;
+
+	if(!handle->wayland.dbus_conn) {
+		return;
+	}
 
 	handle->wayland.dbus_reply = wl_call_tbl.dbus_connection_send_with_reply_and_block(handle->wayland.dbus_conn, handle->wayland.dbus_msg, 100, &handle->wayland.dbus_err);
-	wl_call_tbl.dbus_message_unref(handle->wayland.dbus_msg);
 
 	if(wl_call_tbl.dbus_error_is_set(&handle->wayland.dbus_err)) {
 		fprintf(stderr, "[WARNING] Could not detect dark theme: Send error: %s\n", handle->wayland.dbus_err.message);
@@ -1908,18 +1912,16 @@ static void detect_dark_theme(MwLL handle) {
 		wl_call_tbl.dbus_message_iter_get_basic(&handle->wayland.dbus_variant, &value);
 	}
 
-	translated_value = (value == 1) ? 1 : 0;
-
-	MwLLDispatch(handle, dark_theme, &translated_value);
+	MwLLDispatch(handle, dark_theme, &value);
 }
 
 static void dark_theme_detection_destroy(MwLL handle) {
 	if(!wl_call_tbl.dbus_lib) {
 		return;
 	}
-
-	wl_call_tbl.dbus_message_unref(handle->wayland.dbus_reply);
-	wl_call_tbl.dbus_connection_unref(handle->wayland.dbus_conn);
+	if(handle->wayland.dbus_msg) wl_call_tbl.dbus_message_unref(handle->wayland.dbus_msg);
+	if(handle->wayland.dbus_reply) wl_call_tbl.dbus_message_unref(handle->wayland.dbus_reply);
+	if(handle->wayland.dbus_conn) wl_call_tbl.dbus_connection_unref(handle->wayland.dbus_conn);
 }
 
 static MwLL MwLLCreateImpl(MwLL parent, int x, int y, int width, int height) {
@@ -1932,6 +1934,7 @@ static MwLL MwLLCreateImpl(MwLL parent, int x, int y, int width, int height) {
 
 	if(!parent) {
 		dark_theme_detection_setup(r);
+		r->wayland.dark_theme_detection = MwTRUE;
 	}
 
 	return r;
@@ -2245,8 +2248,11 @@ static int MwLLPendingImpl(MwLL handle) {
 	};
 	int pending = 0;
 
-	if(handle->wayland.dbus_conn) {
-		detect_dark_theme(handle);
+	if(handle->wayland.dark_theme_detection) {
+		if(handle->wayland.dbus_conn) {
+			detect_dark_theme(handle);
+			handle->wayland.dark_theme_detection = MwFALSE;
+		}
 	}
 
 	if(!handle->wayland.did_initial_resize) {
@@ -2652,6 +2658,9 @@ static void MwLLEndStateChangeImpl(MwLL handle) {
 
 		widget_setup(handle, handle->wayland.parent, handle->wayland.detach_point.x, handle->wayland.detach_point.y, handle->wayland.ww, handle->wayland.wh, handle->wayland.type_to_be);
 
+		if(!handle->wayland.parent)
+			handle->wayland.dark_theme_detection = MwTRUE;
+
 		if(handle->common.user) {
 			MwWidget w = handle->common.user;
 			int	 i;