mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2026-06-11 10:23:19 +00:00
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
This commit is contained in:
@@ -1,12 +1,15 @@
|
||||
From c003f450c197a0c960bbb355511f8dca7a35e3c3 Mon Sep 17 00:00:00 2001
|
||||
From 85dccbec7e6d2e967646a8c182a7a24224632c68 Mon Sep 17 00:00:00 2001
|
||||
From: julmajustus <julmajustus@tutanota.com>
|
||||
Date: Sat, 4 Jan 2025 14:24:59 +0200
|
||||
Subject: [PATCH] add fullscreenadaptivesync
|
||||
Date: Mon, 18 May 2026 00:03:41 +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 | 40 ++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 41 insertions(+)
|
||||
dwl.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 53 insertions(+)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 22d2171..886f1ab 100644
|
||||
@@ -21,7 +24,7 @@ index 22d2171..886f1ab 100644
|
||||
{ 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 a2711f6..7be05ef 100644
|
||||
index a2711f6..1b0682d 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -322,6 +322,7 @@ static void requeststartdrag(struct wl_listener *listener, void *data);
|
||||
@@ -49,11 +52,10 @@ index a2711f6..7be05ef 100644
|
||||
#ifdef XWAYLAND
|
||||
static void activatex11(struct wl_listener *listener, void *data);
|
||||
static void associatex11(struct wl_listener *listener, void *data);
|
||||
@@ -2269,6 +2273,31 @@ run(char *startup_cmd)
|
||||
@@ -2269,6 +2273,42 @@ run(char *startup_cmd)
|
||||
wl_display_run(dpy);
|
||||
}
|
||||
|
||||
+void
|
||||
+set_adaptive_sync(Monitor *m, int enable)
|
||||
+{
|
||||
+ struct wlr_output_state state;
|
||||
@@ -64,14 +66,26 @@ index a2711f6..7be05ef 100644
|
||||
+ || !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);
|
||||
+ wlr_output_commit_state(m->wlr_output, &state);
|
||||
+ wlr_output_state_finish(&state);
|
||||
+ 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;
|
||||
@@ -81,7 +95,7 @@ index a2711f6..7be05ef 100644
|
||||
void
|
||||
setcursor(struct wl_listener *listener, void *data)
|
||||
{
|
||||
@@ -2332,10 +2361,12 @@ setfullscreen(Client *c, int fullscreen)
|
||||
@@ -2332,10 +2372,12 @@ setfullscreen(Client *c, int fullscreen)
|
||||
if (fullscreen) {
|
||||
c->prev = c->geom;
|
||||
resize(c, c->mon->m, 0);
|
||||
@@ -94,7 +108,7 @@ index a2711f6..7be05ef 100644
|
||||
}
|
||||
arrange(c->mon);
|
||||
printstatus();
|
||||
@@ -2739,6 +2770,12 @@ togglefullscreen(const Arg *arg)
|
||||
@@ -2739,6 +2781,12 @@ togglefullscreen(const Arg *arg)
|
||||
setfullscreen(sel, !sel->isfullscreen);
|
||||
}
|
||||
|
||||
@@ -107,16 +121,24 @@ index a2711f6..7be05ef 100644
|
||||
void
|
||||
toggletag(const Arg *arg)
|
||||
{
|
||||
@@ -2809,6 +2846,9 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
@@ -2794,6 +2842,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;
|
||||
@@ -2809,6 +2858,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(selmon, 0);
|
||||
+ if (c->isfullscreen)
|
||||
+ set_adaptive_sync(lastmon, 0);
|
||||
|
||||
wlr_scene_node_destroy(&c->scene->node);
|
||||
printstatus();
|
||||
--
|
||||
2.45.2
|
||||
2.53.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user