fullscreenadpativesync: update & minor bug fixes

- Fixed logic error inside unmapnotify - Added no-op guards inside set_adaptive_sync - Added extra check for the config commit success
2026-06-11 10:23:19 +00:00 · 2026-05-18 00:29:39 +03:00
parent d7471ef29e
commit 7f06b4c1a3
4 changed files with 330 additions and 18 deletions
@@ -0,0 +1,144 @@
+From cf817259dbb1235d1ffc073d4e0f128676552666 Mon Sep 17 00:00:00 2001
+From: julmajustus <julmajustus@tutanota.com>
+Date: Mon, 18 May 2026 00:15:18 +0300
+Subject: [PATCH] fullscreen_adaptive_sync: Minor bug fixes
+
+- Fixed logic error inside unmapnotify
+- Added no-op guards inside set_adaptive_sync
+- Added extra check for the config commit success
+---
+ config.def.h |  1 +
+ dwl.c        | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 53 insertions(+)
+
+diff --git a/config.def.h b/config.def.h
+index 8a6eda0..06b3153 100644
+--- a/config.def.h
+++ b/config.def.h
+@@ -138,6 +138,7 @@ static const Key keys[] = {
+ 	{ MODKEY,                    XKB_KEY_space,       setlayout,        {0} },
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,       togglefloating,   {0} },
+ 	{ MODKEY,                    XKB_KEY_e,           togglefullscreen, {0} },
+	{ MODKEY,                    XKB_KEY_F5,          togglefullscreenadaptivesync, {0} },
+ 	{ MODKEY,                    XKB_KEY_0,           view,             {.ui = ~0} },
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright,  tag,              {.ui = ~0} },
+ 	{ MODKEY,                    XKB_KEY_comma,       focusmon,         {.i = WLR_DIRECTION_LEFT} },
+diff --git a/dwl.c b/dwl.c
+index 8101ffa..2f1c80b 100644
+--- a/dwl.c
+++ b/dwl.c
+@@ -323,6 +323,7 @@ static void requeststartdrag(struct wl_listener *listener, void *data);
+ static void requestmonstate(struct wl_listener *listener, void *data);
+ static void resize(Client *c, struct wlr_box geo, int interact);
+ static void run(char *startup_cmd);
+static void set_adaptive_sync(Monitor *m, int enabled);
+ static void setcursor(struct wl_listener *listener, void *data);
+ static void setcursorshape(struct wl_listener *listener, void *data);
+ static void setfloating(Client *c, int floating);
+@@ -340,6 +341,7 @@ static void tagmon(const Arg *arg);
+ static void tile(Monitor *m);
+ static void togglefloating(const Arg *arg);
+ static void togglefullscreen(const Arg *arg);
+static void togglefullscreenadaptivesync(const Arg *arg);
+ static void toggletag(const Arg *arg);
+ static void toggleview(const Arg *arg);
+ static void unlocksession(struct wl_listener *listener, void *data);
+@@ -440,6 +442,8 @@ static struct wl_listener request_start_drag = {.notify = requeststartdrag};
+ static struct wl_listener start_drag = {.notify = startdrag};
+ static struct wl_listener new_session_lock = {.notify = locksession};
+ 
+static int fullscreen_adaptive_sync_enabled = 1;
+
+ #ifdef XWAYLAND
+ static void activatex11(struct wl_listener *listener, void *data);
+ static void associatex11(struct wl_listener *listener, void *data);
+@@ -2300,6 +2304,42 @@ run(char *startup_cmd)
+ 	wl_display_run(dpy);
+ }
+ 
+set_adaptive_sync(Monitor *m, int enable)
+{
+	struct wlr_output_state state;
+	struct wlr_output_configuration_v1 *config;
+	struct wlr_output_configuration_head_v1 *config_head;
+
+	if (!m || !m->wlr_output || !m->wlr_output->enabled
+			|| !fullscreen_adaptive_sync_enabled)
+		return;
+
+    if (enable && m->wlr_output->adaptive_sync_status
+            == WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED)
+        return;
+
+    if (!enable && m->wlr_output->adaptive_sync_status
+            == WLR_OUTPUT_ADAPTIVE_SYNC_DISABLED)
+        return;
+
+	config = wlr_output_configuration_v1_create();
+	config_head = wlr_output_configuration_head_v1_create(config, m->wlr_output);
+
+	/* Set and commit the adaptive sync state change */
+	wlr_output_state_init(&state);
+	wlr_output_state_set_adaptive_sync_enabled(&state, enable);
+    if (!wlr_output_commit_state(m->wlr_output, &state)) {
+        wlr_output_state_finish(&state);
+        wlr_output_configuration_v1_destroy(config);
+        return;
+    }
+    wlr_output_state_finish(&state);
+
+	/* Broadcast the adaptive sync state change to output_mgr */
+	config_head->state.adaptive_sync_enabled = enable;
+	wlr_output_manager_v1_set_configuration(output_mgr, config);
+}
+
+ void
+ setcursor(struct wl_listener *listener, void *data)
+ {
+@@ -2363,10 +2403,12 @@ setfullscreen(Client *c, int fullscreen)
+ 	if (fullscreen) {
+ 		c->prev = c->geom;
+ 		resize(c, c->mon->m, 0);
+		set_adaptive_sync(c->mon, 1);
+ 	} else {
+ 		/* restore previous size instead of arrange for floating windows since
+ 		 * client positions are set by the user and cannot be recalculated */
+ 		resize(c, c->prev, 0);
+		set_adaptive_sync(c->mon, 0);
+ 	}
+ 	arrange(c->mon);
+ 	printstatus();
+@@ -2767,6 +2809,12 @@ togglefullscreen(const Arg *arg)
+ 		setfullscreen(sel, !sel->isfullscreen);
+ }
+ 
+void
+togglefullscreenadaptivesync(const Arg *arg)
+{
+	fullscreen_adaptive_sync_enabled = !fullscreen_adaptive_sync_enabled;
+}
+
+ void
+ toggletag(const Arg *arg)
+ {
+@@ -2822,6 +2870,7 @@ unmapnotify(struct wl_listener *listener, void *data)
+ {
+ 	/* Called when the surface is unmapped, and should no longer be shown. */
+ 	Client *c = wl_container_of(listener, c, unmap);
+    Monitor *lastmon = c->mon; // fullscreen_adaptive_sync
+ 	if (c == grabc) {
+ 		cursor_mode = CurNormal;
+ 		grabc = NULL;
+@@ -2837,6 +2886,9 @@ unmapnotify(struct wl_listener *listener, void *data)
+ 		setmon(c, NULL, 0);
+ 		wl_list_remove(&c->flink);
+ 	}
+	/* Toggle adaptive sync off when fullscreen client is unmapped */
+    if (c->isfullscreen)
+        set_adaptive_sync(lastmon, 0);
+ 
+ 	wlr_scene_node_destroy(&c->scene->node);
+ 	printstatus();
+-- 
+2.53.0
+