pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 5 Pull requests Projects Releases 7 Packages Wiki Activity Actions

wayland: don't poll for dark theme, that doesn't work
Some checks failed
pyrite-dev/milsko/pipeline/head There was a failure building this commit
Details

Browse source
This commit is contained in:
IoI_xD 2026-04-15 13:00:59 -07:00
commit d05e31b154
2 changed files with 31 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/Mw/LowLevel/Wayland.h
View file

@ -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;

49
src/backend/wayland.c
View file

@ -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;