mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2026-08-04 19:24:15 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ba9c29477d | |||
| 706d6350cb |
@@ -1,24 +1,24 @@
|
||||
From 1520d1f200ef0fb381683c1bcd58e553b52ac289 Mon Sep 17 00:00:00 2001
|
||||
From 42e35a6a8a93f0e6d886ad69686c85c1d58536d6 Mon Sep 17 00:00:00 2001
|
||||
From: julmajustus <julmajustus@tutanota.com>
|
||||
Date: Thu, 21 May 2026 00:42:07 +0300
|
||||
Subject: [PATCH] btrtile: Spring update pt2
|
||||
Date: Mon, 22 Jun 2026 22:54:11 +0300
|
||||
Subject: [PATCH] btrtile: bug fixes and readability improvement
|
||||
|
||||
- Simplified the resizing logic to avoid full arrange calls from
|
||||
motionnotify
|
||||
- Minor intend fixes
|
||||
- Removed client old_geom caching for simplicity fixes: https://codeberg.org/dwl/dwl-patches/issues/647
|
||||
- Improved readability of the client sanitization loop inside btrtile function
|
||||
- Removed fullscreened client's from the sanitization loop to retain their geometry
|
||||
---
|
||||
btrtile.c | 583 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
btrtile.c | 575 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
config.def.h | 12 ++
|
||||
dwl.c | 152 +++++++++++---
|
||||
3 files changed, 720 insertions(+), 27 deletions(-)
|
||||
dwl.c | 151 +++++++++++---
|
||||
3 files changed, 711 insertions(+), 27 deletions(-)
|
||||
create mode 100644 btrtile.c
|
||||
|
||||
diff --git a/btrtile.c b/btrtile.c
|
||||
new file mode 100644
|
||||
index 0000000..f05a30f
|
||||
index 0000000..24bf4d9
|
||||
--- /dev/null
|
||||
+++ b/btrtile.c
|
||||
@@ -0,0 +1,583 @@
|
||||
@@ -0,0 +1,575 @@
|
||||
+/* ************************************************************************** */
|
||||
+/* @@@ @@@@@@@@ */
|
||||
+/* @@@ @@@@@@@@@@ */
|
||||
@@ -29,7 +29,7 @@ index 0000000..f05a30f
|
||||
+/* By: julmajustus <julmajustus@tutanota.com> !!: !!:! !!! */
|
||||
+/* ::! :!: !:! */
|
||||
+/* Created: 2024/12/15 00:26:07 by julmajustus :: ::::::: :: */
|
||||
+/* Updated: 2026/05/20 22:38:02 by julmajustus : : : : : : */
|
||||
+/* Updated: 2026/06/22 22:54:06 by julmajustus : : : : : : */
|
||||
+/* */
|
||||
+/* ************************************************************************** */
|
||||
+
|
||||
@@ -91,11 +91,7 @@ index 0000000..f05a30f
|
||||
+ c = node->client;
|
||||
+ if (!c || !VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
|
||||
+ return;
|
||||
+ if (area.x == c->old_geom.x && area.y == c->old_geom.y &&
|
||||
+ area.width == c->old_geom.width && area.height == c->old_geom.height)
|
||||
+ return;
|
||||
+ resize(c, area, 0);
|
||||
+ c->old_geom = area;
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
@@ -175,12 +171,10 @@ index 0000000..f05a30f
|
||||
+ if (!m)
|
||||
+ return;
|
||||
+
|
||||
+ /* Remove non tiled clients from tree. */
|
||||
+ /* Remove floating and moved clients */
|
||||
+ wl_list_for_each(c, &clients, link) {
|
||||
+ if (c->mon == m && !c->isfloating && !c->isfullscreen) {
|
||||
+ } else {
|
||||
+ if (c->mon != m || c->isfloating)
|
||||
+ remove_client(m, c);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* If no client is found under cursor, fallback to focustop(m) */
|
||||
@@ -464,8 +458,6 @@ index 0000000..f05a30f
|
||||
+ split_node->split_ratio = new_ratio;
|
||||
+
|
||||
+ apply_layout(selmon, selmon->root, selmon->w, 1);
|
||||
+ /* Skip the arrange when called from motionnotify; that path calls
|
||||
+ * arrange itself after rate-limiting. */
|
||||
+}
|
||||
+
|
||||
+void
|
||||
@@ -641,7 +633,7 @@ index 8a6eda0..bc04e3f 100644
|
||||
TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1),
|
||||
TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2),
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 44f3ad9..a121efc 100644
|
||||
index 44f3ad9..2529e1f 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -1,6 +1,7 @@
|
||||
@@ -660,18 +652,16 @@ index 44f3ad9..a121efc 100644
|
||||
typedef struct Monitor Monitor;
|
||||
typedef struct {
|
||||
/* Must keep this field first */
|
||||
@@ -137,8 +139,9 @@ typedef struct {
|
||||
@@ -137,7 +139,7 @@ typedef struct {
|
||||
#endif
|
||||
unsigned int bw;
|
||||
uint32_t tags;
|
||||
- int isfloating, isurgent, isfullscreen;
|
||||
+ int isfloating, isurgent, isfullscreen, was_tiled;
|
||||
uint32_t resize; /* configure serial of a pending resize */
|
||||
+ struct wlr_box old_geom;
|
||||
} Client;
|
||||
|
||||
typedef struct {
|
||||
@@ -205,6 +208,7 @@ struct Monitor {
|
||||
@@ -205,6 +207,7 @@ struct Monitor {
|
||||
int nmaster;
|
||||
char ltsymbol[16];
|
||||
int asleep;
|
||||
@@ -679,7 +669,7 @@ index 44f3ad9..a121efc 100644
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
@@ -247,6 +251,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
|
||||
@@ -247,6 +250,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
|
||||
struct wlr_box *usable_area, int exclusive);
|
||||
static void arrangelayers(Monitor *m);
|
||||
static void axisnotify(struct wl_listener *listener, void *data);
|
||||
@@ -687,7 +677,7 @@ index 44f3ad9..a121efc 100644
|
||||
static void buttonpress(struct wl_listener *listener, void *data);
|
||||
static void chvt(const Arg *arg);
|
||||
static void checkidleinhibitor(struct wlr_surface *exclude);
|
||||
@@ -329,6 +334,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
|
||||
@@ -329,6 +333,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
|
||||
static void setpsel(struct wl_listener *listener, void *data);
|
||||
static void setsel(struct wl_listener *listener, void *data);
|
||||
static void setup(void);
|
||||
@@ -697,7 +687,7 @@ index 44f3ad9..a121efc 100644
|
||||
static void spawn(const Arg *arg);
|
||||
static void startdrag(struct wl_listener *listener, void *data);
|
||||
static void tag(const Arg *arg);
|
||||
@@ -454,6 +462,7 @@ static struct wlr_xwayland *xwayland;
|
||||
@@ -454,6 +461,7 @@ static struct wlr_xwayland *xwayland;
|
||||
|
||||
/* attempt to encapsulate suck into one file */
|
||||
#include "client.h"
|
||||
@@ -705,7 +695,7 @@ index 44f3ad9..a121efc 100644
|
||||
|
||||
/* function implementations */
|
||||
void
|
||||
@@ -624,7 +633,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -624,7 +632,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
struct wlr_pointer_button_event *event = data;
|
||||
struct wlr_keyboard *keyboard;
|
||||
uint32_t mods;
|
||||
@@ -714,7 +704,7 @@ index 44f3ad9..a121efc 100644
|
||||
const Button *b;
|
||||
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
@@ -645,7 +654,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -645,7 +653,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0;
|
||||
for (b = buttons; b < END(buttons); b++) {
|
||||
if (CLEANMASK(mods) == CLEANMASK(b->mod) &&
|
||||
@@ -723,7 +713,7 @@ index 44f3ad9..a121efc 100644
|
||||
b->func(&b->arg);
|
||||
return;
|
||||
}
|
||||
@@ -655,6 +664,21 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -655,6 +663,21 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
/* If you released any buttons, we exit interactive move/resize mode. */
|
||||
/* TODO: should reset to the pointer focus's current setcursor */
|
||||
if (!locked && cursor_mode != CurNormal && cursor_mode != CurPressed) {
|
||||
@@ -745,7 +735,7 @@ index 44f3ad9..a121efc 100644
|
||||
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
|
||||
cursor_mode = CurNormal;
|
||||
/* Drop the window off on its new monitor */
|
||||
@@ -746,6 +770,7 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
@@ -746,6 +769,7 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
wlr_output_layout_remove(output_layout, m->wlr_output);
|
||||
wlr_scene_output_destroy(m->scene_output);
|
||||
|
||||
@@ -753,7 +743,7 @@ index 44f3ad9..a121efc 100644
|
||||
closemon(m);
|
||||
wlr_scene_node_destroy(&m->fullscreen_bg->node);
|
||||
free(m);
|
||||
@@ -1090,6 +1115,7 @@ createmon(struct wl_listener *listener, void *data)
|
||||
@@ -1090,6 +1114,7 @@ createmon(struct wl_listener *listener, void *data)
|
||||
|
||||
wl_list_insert(&mons, &m->link);
|
||||
printstatus();
|
||||
@@ -761,7 +751,7 @@ index 44f3ad9..a121efc 100644
|
||||
|
||||
/* The xdg-protocol specifies:
|
||||
*
|
||||
@@ -1329,9 +1355,17 @@ destroynotify(struct wl_listener *listener, void *data)
|
||||
@@ -1329,9 +1354,17 @@ destroynotify(struct wl_listener *listener, void *data)
|
||||
{
|
||||
/* Called when the xdg_toplevel is destroyed. */
|
||||
Client *c = wl_container_of(listener, c, destroy);
|
||||
@@ -779,7 +769,7 @@ index 44f3ad9..a121efc 100644
|
||||
#ifdef XWAYLAND
|
||||
if (c->type != XDGShell) {
|
||||
wl_list_remove(&c->activate.link);
|
||||
@@ -1862,7 +1896,8 @@ void
|
||||
@@ -1862,7 +1895,8 @@ void
|
||||
motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
|
||||
double dx_unaccel, double dy_unaccel)
|
||||
{
|
||||
@@ -789,7 +779,7 @@ index 44f3ad9..a121efc 100644
|
||||
Client *c = NULL, *w = NULL;
|
||||
LayerSurface *l = NULL;
|
||||
struct wlr_surface *surface = NULL;
|
||||
@@ -1916,18 +1951,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
|
||||
@@ -1916,18 +1950,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
|
||||
/* Update drag icon's position */
|
||||
wlr_scene_node_set_position(&drag_icon->node, (int)round(cursor->x), (int)round(cursor->y));
|
||||
|
||||
@@ -852,7 +842,7 @@ index 44f3ad9..a121efc 100644
|
||||
/* If there's no client surface under the cursor, set the cursor image to a
|
||||
* default. This is what makes the cursor image appear when you move it
|
||||
* off of a client or over its border. */
|
||||
@@ -1961,22 +2033,40 @@ moveresize(const Arg *arg)
|
||||
@@ -1961,22 +2032,40 @@ moveresize(const Arg *arg)
|
||||
if (!grabc || client_is_unmanaged(grabc) || grabc->isfullscreen)
|
||||
return;
|
||||
|
||||
@@ -909,7 +899,7 @@ index 44f3ad9..a121efc 100644
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2826,6 +2916,14 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
@@ -2826,6 +2915,14 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
focusclient(focustop(selmon), 1);
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
From 618e3b70204520b6eb2c5040e072087ac0a3b3f7 Mon Sep 17 00:00:00 2001
|
||||
From 04d7c04a0a88e381df788e1ec60398d956543f8b Mon Sep 17 00:00:00 2001
|
||||
From: julmajustus <julmajustus@tutanota.com>
|
||||
Date: Thu, 21 May 2026 00:40:54 +0300
|
||||
Subject: [PATCH] btrtile: Spring update pt2
|
||||
Date: Mon, 22 Jun 2026 22:52:57 +0300
|
||||
Subject: [PATCH] btrtile: bug fixes and readability improvement
|
||||
|
||||
- Simplified the resizing logic to avoid full arrange calls from
|
||||
motionnotify
|
||||
- Minor intend fixes
|
||||
- Removed client old_geom caching for simplicity fixes: https://codeberg.org/dwl/dwl-patches/issues/647
|
||||
- Improved readability of the client sanitization loop inside btrtile function
|
||||
- Removed fullscreened client's from the sanitization loop to retain their geometry
|
||||
---
|
||||
btrtile.c | 564 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
btrtile.c | 556 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
config.def.h | 12 ++
|
||||
dwl.c | 152 +++++++++++---
|
||||
3 files changed, 701 insertions(+), 27 deletions(-)
|
||||
dwl.c | 151 +++++++++++---
|
||||
3 files changed, 692 insertions(+), 27 deletions(-)
|
||||
create mode 100644 btrtile.c
|
||||
|
||||
diff --git a/btrtile.c b/btrtile.c
|
||||
new file mode 100644
|
||||
index 0000000..357ffb9
|
||||
index 0000000..6055871
|
||||
--- /dev/null
|
||||
+++ b/btrtile.c
|
||||
@@ -0,0 +1,564 @@
|
||||
@@ -0,0 +1,556 @@
|
||||
+/* ************************************************************************** */
|
||||
+/* @@@ @@@@@@@@ */
|
||||
+/* @@@ @@@@@@@@@@ */
|
||||
@@ -29,7 +29,7 @@ index 0000000..357ffb9
|
||||
+/* By: julmajustus <julmajustus@tutanota.com> !!: !!:! !!! */
|
||||
+/* ::! :!: !:! */
|
||||
+/* Created: 2024/12/15 00:26:07 by julmajustus :: ::::::: :: */
|
||||
+/* Updated: 2026/05/20 22:51:54 by julmajustus : : : : : : */
|
||||
+/* Updated: 2026/06/22 22:52:52 by julmajustus : : : : : : */
|
||||
+/* */
|
||||
+/* ************************************************************************** */
|
||||
+
|
||||
@@ -84,11 +84,7 @@ index 0000000..357ffb9
|
||||
+ c = node->client;
|
||||
+ if (!c || !VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
|
||||
+ return;
|
||||
+ if (area.x == c->old_geom.x && area.y == c->old_geom.y &&
|
||||
+ area.width == c->old_geom.width && area.height == c->old_geom.height)
|
||||
+ return;
|
||||
+ resize(c, area, 0);
|
||||
+ c->old_geom = area;
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
@@ -156,12 +152,10 @@ index 0000000..357ffb9
|
||||
+ if (!m)
|
||||
+ return;
|
||||
+
|
||||
+ /* Remove non tiled clients from tree. */
|
||||
+ /* Remove floating and moved clients */
|
||||
+ wl_list_for_each(c, &clients, link) {
|
||||
+ if (c->mon == m && !c->isfloating && !c->isfullscreen) {
|
||||
+ } else {
|
||||
+ if (c->mon != m || c->isfloating)
|
||||
+ remove_client(m, c);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* If no client is found under cursor, fallback to focustop(m) */
|
||||
@@ -445,8 +439,6 @@ index 0000000..357ffb9
|
||||
+ split_node->split_ratio = new_ratio;
|
||||
+
|
||||
+ apply_layout(selmon, selmon->root, selmon->w, 1);
|
||||
+ /* Skip the arrange when called from motionnotify; that path calls
|
||||
+ * arrange itself after rate-limiting. */
|
||||
+}
|
||||
+
|
||||
+void
|
||||
@@ -622,7 +614,7 @@ index 8a6eda0..bc04e3f 100644
|
||||
TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1),
|
||||
TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2),
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 44f3ad9..a121efc 100644
|
||||
index 44f3ad9..2529e1f 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -1,6 +1,7 @@
|
||||
@@ -641,18 +633,16 @@ index 44f3ad9..a121efc 100644
|
||||
typedef struct Monitor Monitor;
|
||||
typedef struct {
|
||||
/* Must keep this field first */
|
||||
@@ -137,8 +139,9 @@ typedef struct {
|
||||
@@ -137,7 +139,7 @@ typedef struct {
|
||||
#endif
|
||||
unsigned int bw;
|
||||
uint32_t tags;
|
||||
- int isfloating, isurgent, isfullscreen;
|
||||
+ int isfloating, isurgent, isfullscreen, was_tiled;
|
||||
uint32_t resize; /* configure serial of a pending resize */
|
||||
+ struct wlr_box old_geom;
|
||||
} Client;
|
||||
|
||||
typedef struct {
|
||||
@@ -205,6 +208,7 @@ struct Monitor {
|
||||
@@ -205,6 +207,7 @@ struct Monitor {
|
||||
int nmaster;
|
||||
char ltsymbol[16];
|
||||
int asleep;
|
||||
@@ -660,7 +650,7 @@ index 44f3ad9..a121efc 100644
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
@@ -247,6 +251,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
|
||||
@@ -247,6 +250,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
|
||||
struct wlr_box *usable_area, int exclusive);
|
||||
static void arrangelayers(Monitor *m);
|
||||
static void axisnotify(struct wl_listener *listener, void *data);
|
||||
@@ -668,7 +658,7 @@ index 44f3ad9..a121efc 100644
|
||||
static void buttonpress(struct wl_listener *listener, void *data);
|
||||
static void chvt(const Arg *arg);
|
||||
static void checkidleinhibitor(struct wlr_surface *exclude);
|
||||
@@ -329,6 +334,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
|
||||
@@ -329,6 +333,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
|
||||
static void setpsel(struct wl_listener *listener, void *data);
|
||||
static void setsel(struct wl_listener *listener, void *data);
|
||||
static void setup(void);
|
||||
@@ -678,7 +668,7 @@ index 44f3ad9..a121efc 100644
|
||||
static void spawn(const Arg *arg);
|
||||
static void startdrag(struct wl_listener *listener, void *data);
|
||||
static void tag(const Arg *arg);
|
||||
@@ -454,6 +462,7 @@ static struct wlr_xwayland *xwayland;
|
||||
@@ -454,6 +461,7 @@ static struct wlr_xwayland *xwayland;
|
||||
|
||||
/* attempt to encapsulate suck into one file */
|
||||
#include "client.h"
|
||||
@@ -686,7 +676,7 @@ index 44f3ad9..a121efc 100644
|
||||
|
||||
/* function implementations */
|
||||
void
|
||||
@@ -624,7 +633,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -624,7 +632,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
struct wlr_pointer_button_event *event = data;
|
||||
struct wlr_keyboard *keyboard;
|
||||
uint32_t mods;
|
||||
@@ -695,7 +685,7 @@ index 44f3ad9..a121efc 100644
|
||||
const Button *b;
|
||||
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
@@ -645,7 +654,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -645,7 +653,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0;
|
||||
for (b = buttons; b < END(buttons); b++) {
|
||||
if (CLEANMASK(mods) == CLEANMASK(b->mod) &&
|
||||
@@ -704,7 +694,7 @@ index 44f3ad9..a121efc 100644
|
||||
b->func(&b->arg);
|
||||
return;
|
||||
}
|
||||
@@ -655,6 +664,21 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -655,6 +663,21 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
/* If you released any buttons, we exit interactive move/resize mode. */
|
||||
/* TODO: should reset to the pointer focus's current setcursor */
|
||||
if (!locked && cursor_mode != CurNormal && cursor_mode != CurPressed) {
|
||||
@@ -726,7 +716,7 @@ index 44f3ad9..a121efc 100644
|
||||
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
|
||||
cursor_mode = CurNormal;
|
||||
/* Drop the window off on its new monitor */
|
||||
@@ -746,6 +770,7 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
@@ -746,6 +769,7 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
wlr_output_layout_remove(output_layout, m->wlr_output);
|
||||
wlr_scene_output_destroy(m->scene_output);
|
||||
|
||||
@@ -734,7 +724,7 @@ index 44f3ad9..a121efc 100644
|
||||
closemon(m);
|
||||
wlr_scene_node_destroy(&m->fullscreen_bg->node);
|
||||
free(m);
|
||||
@@ -1090,6 +1115,7 @@ createmon(struct wl_listener *listener, void *data)
|
||||
@@ -1090,6 +1114,7 @@ createmon(struct wl_listener *listener, void *data)
|
||||
|
||||
wl_list_insert(&mons, &m->link);
|
||||
printstatus();
|
||||
@@ -742,7 +732,7 @@ index 44f3ad9..a121efc 100644
|
||||
|
||||
/* The xdg-protocol specifies:
|
||||
*
|
||||
@@ -1329,9 +1355,17 @@ destroynotify(struct wl_listener *listener, void *data)
|
||||
@@ -1329,9 +1354,17 @@ destroynotify(struct wl_listener *listener, void *data)
|
||||
{
|
||||
/* Called when the xdg_toplevel is destroyed. */
|
||||
Client *c = wl_container_of(listener, c, destroy);
|
||||
@@ -760,7 +750,7 @@ index 44f3ad9..a121efc 100644
|
||||
#ifdef XWAYLAND
|
||||
if (c->type != XDGShell) {
|
||||
wl_list_remove(&c->activate.link);
|
||||
@@ -1862,7 +1896,8 @@ void
|
||||
@@ -1862,7 +1895,8 @@ void
|
||||
motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
|
||||
double dx_unaccel, double dy_unaccel)
|
||||
{
|
||||
@@ -770,7 +760,7 @@ index 44f3ad9..a121efc 100644
|
||||
Client *c = NULL, *w = NULL;
|
||||
LayerSurface *l = NULL;
|
||||
struct wlr_surface *surface = NULL;
|
||||
@@ -1916,18 +1951,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
|
||||
@@ -1916,18 +1950,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
|
||||
/* Update drag icon's position */
|
||||
wlr_scene_node_set_position(&drag_icon->node, (int)round(cursor->x), (int)round(cursor->y));
|
||||
|
||||
@@ -833,7 +823,7 @@ index 44f3ad9..a121efc 100644
|
||||
/* If there's no client surface under the cursor, set the cursor image to a
|
||||
* default. This is what makes the cursor image appear when you move it
|
||||
* off of a client or over its border. */
|
||||
@@ -1961,22 +2033,40 @@ moveresize(const Arg *arg)
|
||||
@@ -1961,22 +2032,40 @@ moveresize(const Arg *arg)
|
||||
if (!grabc || client_is_unmanaged(grabc) || grabc->isfullscreen)
|
||||
return;
|
||||
|
||||
@@ -890,7 +880,7 @@ index 44f3ad9..a121efc 100644
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2826,6 +2916,14 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
@@ -2826,6 +2915,14 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
focusclient(focustop(selmon), 1);
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -1,24 +1,26 @@
|
||||
From c11b1a8c93c27fad3782e9dbc1b094a4a7b78088 Mon Sep 17 00:00:00 2001
|
||||
From efb796ce92e7212aa392141705c7322fedc45dba Mon Sep 17 00:00:00 2001
|
||||
From: julmajustus <julmajustus@tutanota.com>
|
||||
Date: Thu, 21 May 2026 00:38:45 +0300
|
||||
Subject: [PATCH] btrtile: Spring update pt2
|
||||
Date: Mon, 22 Jun 2026 22:46:19 +0300
|
||||
Subject: [PATCH] btrtile: bug fixes and readability improvement
|
||||
|
||||
- Simplified the resizing logic to avoid full arrange calls from
|
||||
motionnotify
|
||||
- Minor intend fixes
|
||||
- Removed client old_geom caching for simplicity fixes: https://codeberg.org/dwl/dwl-patches/issues/647
|
||||
- Improved readability of the client sanitization loop inside btrtile function
|
||||
- Removed fullscreened client's from the sanitization loop to retain simple_scratchpad: Spring update scratchpad V2
|
||||
|
||||
- Added support for multiple scratchpads their geometry
|
||||
---
|
||||
btrtile.c | 583 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
btrtile.c | 575 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
config.def.h | 12 ++
|
||||
dwl.c | 152 +++++++++++---
|
||||
3 files changed, 720 insertions(+), 27 deletions(-)
|
||||
dwl.c | 151 +++++++++++---
|
||||
3 files changed, 711 insertions(+), 27 deletions(-)
|
||||
create mode 100644 btrtile.c
|
||||
|
||||
diff --git a/btrtile.c b/btrtile.c
|
||||
new file mode 100644
|
||||
index 0000000..f05a30f
|
||||
index 0000000..645b741
|
||||
--- /dev/null
|
||||
+++ b/btrtile.c
|
||||
@@ -0,0 +1,583 @@
|
||||
@@ -0,0 +1,575 @@
|
||||
+/* ************************************************************************** */
|
||||
+/* @@@ @@@@@@@@ */
|
||||
+/* @@@ @@@@@@@@@@ */
|
||||
@@ -29,7 +31,7 @@ index 0000000..f05a30f
|
||||
+/* By: julmajustus <julmajustus@tutanota.com> !!: !!:! !!! */
|
||||
+/* ::! :!: !:! */
|
||||
+/* Created: 2024/12/15 00:26:07 by julmajustus :: ::::::: :: */
|
||||
+/* Updated: 2026/05/20 22:38:02 by julmajustus : : : : : : */
|
||||
+/* Updated: 2026/06/22 22:34:11 by julmajustus : : : : : : */
|
||||
+/* */
|
||||
+/* ************************************************************************** */
|
||||
+
|
||||
@@ -91,11 +93,7 @@ index 0000000..f05a30f
|
||||
+ c = node->client;
|
||||
+ if (!c || !VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
|
||||
+ return;
|
||||
+ if (area.x == c->old_geom.x && area.y == c->old_geom.y &&
|
||||
+ area.width == c->old_geom.width && area.height == c->old_geom.height)
|
||||
+ return;
|
||||
+ resize(c, area, 0);
|
||||
+ c->old_geom = area;
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
@@ -175,12 +173,10 @@ index 0000000..f05a30f
|
||||
+ if (!m)
|
||||
+ return;
|
||||
+
|
||||
+ /* Remove non tiled clients from tree. */
|
||||
+ /* Remove floating and moved clients */
|
||||
+ wl_list_for_each(c, &clients, link) {
|
||||
+ if (c->mon == m && !c->isfloating && !c->isfullscreen) {
|
||||
+ } else {
|
||||
+ if (c->mon != m || c->isfloating)
|
||||
+ remove_client(m, c);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* If no client is found under cursor, fallback to focustop(m) */
|
||||
@@ -464,8 +460,6 @@ index 0000000..f05a30f
|
||||
+ split_node->split_ratio = new_ratio;
|
||||
+
|
||||
+ apply_layout(selmon, selmon->root, selmon->w, 1);
|
||||
+ /* Skip the arrange when called from motionnotify; that path calls
|
||||
+ * arrange itself after rate-limiting. */
|
||||
+}
|
||||
+
|
||||
+void
|
||||
@@ -641,7 +635,7 @@ index 8a6eda0..bc04e3f 100644
|
||||
TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1),
|
||||
TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2),
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 8101ffa..c9650c1 100644
|
||||
index 8101ffa..7abf390 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -1,6 +1,7 @@
|
||||
@@ -660,18 +654,16 @@ index 8101ffa..c9650c1 100644
|
||||
typedef struct Monitor Monitor;
|
||||
typedef struct {
|
||||
/* Must keep this field first */
|
||||
@@ -141,8 +143,9 @@ typedef struct {
|
||||
@@ -141,7 +143,7 @@ typedef struct {
|
||||
#endif
|
||||
unsigned int bw;
|
||||
uint32_t tags;
|
||||
- int isfloating, isurgent, isfullscreen;
|
||||
+ int isfloating, isurgent, isfullscreen, was_tiled;
|
||||
uint32_t resize; /* configure serial of a pending resize */
|
||||
+ struct wlr_box old_geom;
|
||||
} Client;
|
||||
|
||||
typedef struct {
|
||||
@@ -209,6 +212,7 @@ struct Monitor {
|
||||
@@ -209,6 +211,7 @@ struct Monitor {
|
||||
int nmaster;
|
||||
char ltsymbol[16];
|
||||
int asleep;
|
||||
@@ -679,7 +671,7 @@ index 8101ffa..c9650c1 100644
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
@@ -251,6 +255,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
|
||||
@@ -251,6 +254,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
|
||||
struct wlr_box *usable_area, int exclusive);
|
||||
static void arrangelayers(Monitor *m);
|
||||
static void axisnotify(struct wl_listener *listener, void *data);
|
||||
@@ -687,7 +679,7 @@ index 8101ffa..c9650c1 100644
|
||||
static void buttonpress(struct wl_listener *listener, void *data);
|
||||
static void chvt(const Arg *arg);
|
||||
static void checkidleinhibitor(struct wlr_surface *exclude);
|
||||
@@ -333,6 +338,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
|
||||
@@ -333,6 +337,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
|
||||
static void setpsel(struct wl_listener *listener, void *data);
|
||||
static void setsel(struct wl_listener *listener, void *data);
|
||||
static void setup(void);
|
||||
@@ -697,7 +689,7 @@ index 8101ffa..c9650c1 100644
|
||||
static void spawn(const Arg *arg);
|
||||
static void startdrag(struct wl_listener *listener, void *data);
|
||||
static void tag(const Arg *arg);
|
||||
@@ -458,6 +466,7 @@ static struct wlr_xwayland *xwayland;
|
||||
@@ -458,6 +465,7 @@ static struct wlr_xwayland *xwayland;
|
||||
|
||||
/* attempt to encapsulate suck into one file */
|
||||
#include "client.h"
|
||||
@@ -705,7 +697,7 @@ index 8101ffa..c9650c1 100644
|
||||
|
||||
/* function implementations */
|
||||
void
|
||||
@@ -628,7 +637,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -628,7 +636,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
struct wlr_pointer_button_event *event = data;
|
||||
struct wlr_keyboard *keyboard;
|
||||
uint32_t mods;
|
||||
@@ -714,7 +706,7 @@ index 8101ffa..c9650c1 100644
|
||||
const Button *b;
|
||||
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
@@ -649,7 +658,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -649,7 +657,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0;
|
||||
for (b = buttons; b < END(buttons); b++) {
|
||||
if (CLEANMASK(mods) == CLEANMASK(b->mod) &&
|
||||
@@ -723,7 +715,7 @@ index 8101ffa..c9650c1 100644
|
||||
b->func(&b->arg);
|
||||
return;
|
||||
}
|
||||
@@ -659,6 +668,21 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -659,6 +667,21 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
/* If you released any buttons, we exit interactive move/resize mode. */
|
||||
/* TODO: should reset to the pointer focus's current setcursor */
|
||||
if (!locked && cursor_mode != CurNormal && cursor_mode != CurPressed) {
|
||||
@@ -745,7 +737,7 @@ index 8101ffa..c9650c1 100644
|
||||
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
|
||||
cursor_mode = CurNormal;
|
||||
/* Drop the window off on its new monitor */
|
||||
@@ -750,6 +774,7 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
@@ -750,6 +773,7 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
wlr_output_layout_remove(output_layout, m->wlr_output);
|
||||
wlr_scene_output_destroy(m->scene_output);
|
||||
|
||||
@@ -753,7 +745,7 @@ index 8101ffa..c9650c1 100644
|
||||
closemon(m);
|
||||
wlr_scene_node_destroy(&m->fullscreen_bg->node);
|
||||
free(m);
|
||||
@@ -1094,6 +1119,7 @@ createmon(struct wl_listener *listener, void *data)
|
||||
@@ -1094,6 +1118,7 @@ createmon(struct wl_listener *listener, void *data)
|
||||
|
||||
wl_list_insert(&mons, &m->link);
|
||||
printstatus();
|
||||
@@ -761,7 +753,7 @@ index 8101ffa..c9650c1 100644
|
||||
|
||||
/* The xdg-protocol specifies:
|
||||
*
|
||||
@@ -1332,10 +1358,18 @@ void
|
||||
@@ -1332,10 +1357,18 @@ void
|
||||
destroynotify(struct wl_listener *listener, void *data)
|
||||
{
|
||||
/* Called when the xdg_toplevel is destroyed. */
|
||||
@@ -780,7 +772,7 @@ index 8101ffa..c9650c1 100644
|
||||
#ifdef XWAYLAND
|
||||
if (c->type != XDGShell) {
|
||||
wl_list_remove(&c->activate.link);
|
||||
@@ -1866,7 +1900,8 @@ void
|
||||
@@ -1866,7 +1899,8 @@ void
|
||||
motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
|
||||
double dx_unaccel, double dy_unaccel)
|
||||
{
|
||||
@@ -790,7 +782,7 @@ index 8101ffa..c9650c1 100644
|
||||
Client *c = NULL, *w = NULL;
|
||||
LayerSurface *l = NULL;
|
||||
struct wlr_surface *surface = NULL;
|
||||
@@ -1920,18 +1955,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
|
||||
@@ -1920,18 +1954,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
|
||||
/* Update drag icon's position */
|
||||
wlr_scene_node_set_position(&drag_icon->node, (int)round(cursor->x), (int)round(cursor->y));
|
||||
|
||||
@@ -853,7 +845,7 @@ index 8101ffa..c9650c1 100644
|
||||
/* If there's no client surface under the cursor, set the cursor image to a
|
||||
* default. This is what makes the cursor image appear when you move it
|
||||
* off of a client or over its border. */
|
||||
@@ -1965,22 +2037,40 @@ moveresize(const Arg *arg)
|
||||
@@ -1965,22 +2036,40 @@ moveresize(const Arg *arg)
|
||||
if (!grabc || client_is_unmanaged(grabc) || grabc->isfullscreen)
|
||||
return;
|
||||
|
||||
@@ -910,7 +902,7 @@ index 8101ffa..c9650c1 100644
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2833,6 +2923,14 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
@@ -2833,6 +2922,14 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
focusclient(focustop(selmon), 1);
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
From 47cb7ad9f669643765cafa4c2ecd1a4850bca893 Mon Sep 17 00:00:00 2001
|
||||
From 3500e732fc34aa849cd3babeff7d2545a0230fa9 Mon Sep 17 00:00:00 2001
|
||||
From: julmajustus <julmajustus@tutanota.com>
|
||||
Date: Thu, 21 May 2026 00:39:56 +0300
|
||||
Subject: [PATCH] btrtile: Spring update pt2
|
||||
Date: Mon, 22 Jun 2026 22:33:17 +0300
|
||||
Subject: [PATCH] btrtile: bug fixes and readability improvement
|
||||
|
||||
- Simplified the resizing logic to avoid full arrange calls from
|
||||
motionnotify
|
||||
- Minor intend fixes
|
||||
- Removed client old_geom caching for simplicity fixes: https://codeberg.org/dwl/dwl-patches/issues/647
|
||||
- Improved readability of the client sanitization loop inside btrtile function
|
||||
- Removed fullscreened client's from the sanitization loop to retain their geometry
|
||||
---
|
||||
btrtile.c | 564 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
btrtile.c | 556 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
config.def.h | 12 ++
|
||||
dwl.c | 152 +++++++++++---
|
||||
3 files changed, 701 insertions(+), 27 deletions(-)
|
||||
dwl.c | 151 +++++++++++---
|
||||
3 files changed, 692 insertions(+), 27 deletions(-)
|
||||
create mode 100644 btrtile.c
|
||||
|
||||
diff --git a/btrtile.c b/btrtile.c
|
||||
new file mode 100644
|
||||
index 0000000..357ffb9
|
||||
index 0000000..b4f6f43
|
||||
--- /dev/null
|
||||
+++ b/btrtile.c
|
||||
@@ -0,0 +1,564 @@
|
||||
@@ -0,0 +1,556 @@
|
||||
+/* ************************************************************************** */
|
||||
+/* @@@ @@@@@@@@ */
|
||||
+/* @@@ @@@@@@@@@@ */
|
||||
@@ -29,7 +29,7 @@ index 0000000..357ffb9
|
||||
+/* By: julmajustus <julmajustus@tutanota.com> !!: !!:! !!! */
|
||||
+/* ::! :!: !:! */
|
||||
+/* Created: 2024/12/15 00:26:07 by julmajustus :: ::::::: :: */
|
||||
+/* Updated: 2026/05/20 22:51:54 by julmajustus : : : : : : */
|
||||
+/* Updated: 2026/06/22 22:30:19 by julmajustus : : : : : : */
|
||||
+/* */
|
||||
+/* ************************************************************************** */
|
||||
+
|
||||
@@ -84,11 +84,7 @@ index 0000000..357ffb9
|
||||
+ c = node->client;
|
||||
+ if (!c || !VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
|
||||
+ return;
|
||||
+ if (area.x == c->old_geom.x && area.y == c->old_geom.y &&
|
||||
+ area.width == c->old_geom.width && area.height == c->old_geom.height)
|
||||
+ return;
|
||||
+ resize(c, area, 0);
|
||||
+ c->old_geom = area;
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
@@ -156,12 +152,10 @@ index 0000000..357ffb9
|
||||
+ if (!m)
|
||||
+ return;
|
||||
+
|
||||
+ /* Remove non tiled clients from tree. */
|
||||
+ /* Remove floating and moved clients */
|
||||
+ wl_list_for_each(c, &clients, link) {
|
||||
+ if (c->mon == m && !c->isfloating && !c->isfullscreen) {
|
||||
+ } else {
|
||||
+ if (c->mon != m || c->isfloating)
|
||||
+ remove_client(m, c);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* If no client is found under cursor, fallback to focustop(m) */
|
||||
@@ -445,8 +439,6 @@ index 0000000..357ffb9
|
||||
+ split_node->split_ratio = new_ratio;
|
||||
+
|
||||
+ apply_layout(selmon, selmon->root, selmon->w, 1);
|
||||
+ /* Skip the arrange when called from motionnotify; that path calls
|
||||
+ * arrange itself after rate-limiting. */
|
||||
+}
|
||||
+
|
||||
+void
|
||||
@@ -622,7 +614,7 @@ index 8a6eda0..bc04e3f 100644
|
||||
TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1),
|
||||
TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2),
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index 8101ffa..bf52c6c 100644
|
||||
index 8101ffa..31446ed 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -1,6 +1,7 @@
|
||||
@@ -641,18 +633,16 @@ index 8101ffa..bf52c6c 100644
|
||||
typedef struct Monitor Monitor;
|
||||
typedef struct {
|
||||
/* Must keep this field first */
|
||||
@@ -141,8 +143,9 @@ typedef struct {
|
||||
@@ -141,7 +143,7 @@ typedef struct {
|
||||
#endif
|
||||
unsigned int bw;
|
||||
uint32_t tags;
|
||||
- int isfloating, isurgent, isfullscreen;
|
||||
+ int isfloating, isurgent, isfullscreen, was_tiled;
|
||||
uint32_t resize; /* configure serial of a pending resize */
|
||||
+ struct wlr_box old_geom;
|
||||
} Client;
|
||||
|
||||
typedef struct {
|
||||
@@ -209,6 +212,7 @@ struct Monitor {
|
||||
@@ -209,6 +211,7 @@ struct Monitor {
|
||||
int nmaster;
|
||||
char ltsymbol[16];
|
||||
int asleep;
|
||||
@@ -660,7 +650,7 @@ index 8101ffa..bf52c6c 100644
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
@@ -251,6 +255,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
|
||||
@@ -251,6 +254,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
|
||||
struct wlr_box *usable_area, int exclusive);
|
||||
static void arrangelayers(Monitor *m);
|
||||
static void axisnotify(struct wl_listener *listener, void *data);
|
||||
@@ -668,7 +658,7 @@ index 8101ffa..bf52c6c 100644
|
||||
static void buttonpress(struct wl_listener *listener, void *data);
|
||||
static void chvt(const Arg *arg);
|
||||
static void checkidleinhibitor(struct wlr_surface *exclude);
|
||||
@@ -333,6 +338,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
|
||||
@@ -333,6 +337,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
|
||||
static void setpsel(struct wl_listener *listener, void *data);
|
||||
static void setsel(struct wl_listener *listener, void *data);
|
||||
static void setup(void);
|
||||
@@ -678,7 +668,7 @@ index 8101ffa..bf52c6c 100644
|
||||
static void spawn(const Arg *arg);
|
||||
static void startdrag(struct wl_listener *listener, void *data);
|
||||
static void tag(const Arg *arg);
|
||||
@@ -458,6 +466,7 @@ static struct wlr_xwayland *xwayland;
|
||||
@@ -458,6 +465,7 @@ static struct wlr_xwayland *xwayland;
|
||||
|
||||
/* attempt to encapsulate suck into one file */
|
||||
#include "client.h"
|
||||
@@ -686,7 +676,7 @@ index 8101ffa..bf52c6c 100644
|
||||
|
||||
/* function implementations */
|
||||
void
|
||||
@@ -628,7 +637,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -628,7 +636,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
struct wlr_pointer_button_event *event = data;
|
||||
struct wlr_keyboard *keyboard;
|
||||
uint32_t mods;
|
||||
@@ -695,7 +685,7 @@ index 8101ffa..bf52c6c 100644
|
||||
const Button *b;
|
||||
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
@@ -649,7 +658,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -649,7 +657,7 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0;
|
||||
for (b = buttons; b < END(buttons); b++) {
|
||||
if (CLEANMASK(mods) == CLEANMASK(b->mod) &&
|
||||
@@ -704,7 +694,7 @@ index 8101ffa..bf52c6c 100644
|
||||
b->func(&b->arg);
|
||||
return;
|
||||
}
|
||||
@@ -659,6 +668,21 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
@@ -659,6 +667,21 @@ buttonpress(struct wl_listener *listener, void *data)
|
||||
/* If you released any buttons, we exit interactive move/resize mode. */
|
||||
/* TODO: should reset to the pointer focus's current setcursor */
|
||||
if (!locked && cursor_mode != CurNormal && cursor_mode != CurPressed) {
|
||||
@@ -726,7 +716,7 @@ index 8101ffa..bf52c6c 100644
|
||||
wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
|
||||
cursor_mode = CurNormal;
|
||||
/* Drop the window off on its new monitor */
|
||||
@@ -750,6 +774,7 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
@@ -750,6 +773,7 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
wlr_output_layout_remove(output_layout, m->wlr_output);
|
||||
wlr_scene_output_destroy(m->scene_output);
|
||||
|
||||
@@ -734,7 +724,7 @@ index 8101ffa..bf52c6c 100644
|
||||
closemon(m);
|
||||
wlr_scene_node_destroy(&m->fullscreen_bg->node);
|
||||
free(m);
|
||||
@@ -1094,6 +1119,7 @@ createmon(struct wl_listener *listener, void *data)
|
||||
@@ -1094,6 +1118,7 @@ createmon(struct wl_listener *listener, void *data)
|
||||
|
||||
wl_list_insert(&mons, &m->link);
|
||||
printstatus();
|
||||
@@ -742,7 +732,7 @@ index 8101ffa..bf52c6c 100644
|
||||
|
||||
/* The xdg-protocol specifies:
|
||||
*
|
||||
@@ -1333,9 +1359,17 @@ destroynotify(struct wl_listener *listener, void *data)
|
||||
@@ -1333,9 +1358,17 @@ destroynotify(struct wl_listener *listener, void *data)
|
||||
{
|
||||
/* Called when the xdg_toplevel is destroyed. */
|
||||
Client *c = wl_container_of(listener, c, destroy);
|
||||
@@ -760,7 +750,7 @@ index 8101ffa..bf52c6c 100644
|
||||
#ifdef XWAYLAND
|
||||
if (c->type != XDGShell) {
|
||||
wl_list_remove(&c->activate.link);
|
||||
@@ -1866,7 +1900,8 @@ void
|
||||
@@ -1866,7 +1899,8 @@ void
|
||||
motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
|
||||
double dx_unaccel, double dy_unaccel)
|
||||
{
|
||||
@@ -770,7 +760,7 @@ index 8101ffa..bf52c6c 100644
|
||||
Client *c = NULL, *w = NULL;
|
||||
LayerSurface *l = NULL;
|
||||
struct wlr_surface *surface = NULL;
|
||||
@@ -1920,18 +1955,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
|
||||
@@ -1920,18 +1954,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
|
||||
/* Update drag icon's position */
|
||||
wlr_scene_node_set_position(&drag_icon->node, (int)round(cursor->x), (int)round(cursor->y));
|
||||
|
||||
@@ -833,7 +823,7 @@ index 8101ffa..bf52c6c 100644
|
||||
/* If there's no client surface under the cursor, set the cursor image to a
|
||||
* default. This is what makes the cursor image appear when you move it
|
||||
* off of a client or over its border. */
|
||||
@@ -1965,22 +2037,40 @@ moveresize(const Arg *arg)
|
||||
@@ -1965,22 +2036,40 @@ moveresize(const Arg *arg)
|
||||
if (!grabc || client_is_unmanaged(grabc) || grabc->isfullscreen)
|
||||
return;
|
||||
|
||||
@@ -890,7 +880,7 @@ index 8101ffa..bf52c6c 100644
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2833,6 +2923,14 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
@@ -2833,6 +2922,14 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
focusclient(focustop(selmon), 1);
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -23,7 +23,6 @@ Adds a function that automatically enables adaptive sync/VRR when a fullscreen c
|
||||
|
||||
### Download
|
||||
- [git branch](https://codeberg.org/julmajustus/dwl/src/branch/fullscreenadaptivesync-wlroots-next)
|
||||
- [0.7](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/fullscreenadaptivesync/fullscreenadaptivesync-v0.7.patch)
|
||||
- [0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/fullscreenadaptivesync/fullscreenadaptivesync-v0.8.patch)
|
||||
- [wlroots-next-d41ecb7](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/fullscreenadaptivesync/fullscreenadaptivesync-wlroots-next-d41ecb7.patch)
|
||||
|
||||
|
||||
@@ -1,144 +0,0 @@
|
||||
From 85dccbec7e6d2e967646a8c182a7a24224632c68 Mon Sep 17 00:00:00 2001
|
||||
From: julmajustus <julmajustus@tutanota.com>
|
||||
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 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 53 insertions(+)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 22d2171..886f1ab 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -142,6 +142,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 a2711f6..1b0682d 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -322,6 +322,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);
|
||||
@@ -413,6 +415,8 @@ static struct wlr_box sgeom;
|
||||
static struct wl_list mons;
|
||||
static Monitor *selmon;
|
||||
|
||||
+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);
|
||||
@@ -2269,6 +2273,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)
|
||||
{
|
||||
@@ -2332,10 +2372,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();
|
||||
@@ -2739,6 +2781,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)
|
||||
{
|
||||
@@ -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(lastmon, 0);
|
||||
|
||||
wlr_scene_node_destroy(&c->scene->node);
|
||||
printstatus();
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
From 60af6f9dab09710234475b51393a104c21918db3 Mon Sep 17 00:00:00 2001
|
||||
From b9bb8d48e1be3008d72da414f6f418d77f3ca16b Mon Sep 17 00:00:00 2001
|
||||
From: julmajustus <julmajustus@tutanota.com>
|
||||
Date: Mon, 18 May 2026 00:12:31 +0300
|
||||
Date: Mon, 22 Jun 2026 23:01:00 +0300
|
||||
Subject: [PATCH] fullscreen_adaptive_sync: Minor bug fixes
|
||||
|
||||
- Fixed logic error inside unmapnotify
|
||||
@@ -8,8 +8,8 @@ Subject: [PATCH] fullscreen_adaptive_sync: Minor bug fixes
|
||||
- Added extra check for the config commit success
|
||||
---
|
||||
config.def.h | 1 +
|
||||
dwl.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 53 insertions(+)
|
||||
dwl.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 54 insertions(+)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 8a6eda0..06b3153 100644
|
||||
@@ -24,7 +24,7 @@ index 8a6eda0..06b3153 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 44f3ad9..737f089 100644
|
||||
index 44f3ad9..e4f6a9d 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -319,6 +319,7 @@ static void requeststartdrag(struct wl_listener *listener, void *data);
|
||||
@@ -52,10 +52,11 @@ index 44f3ad9..737f089 100644
|
||||
#ifdef XWAYLAND
|
||||
static void activatex11(struct wl_listener *listener, void *data);
|
||||
static void associatex11(struct wl_listener *listener, void *data);
|
||||
@@ -2296,6 +2300,42 @@ run(char *startup_cmd)
|
||||
@@ -2296,6 +2300,43 @@ run(char *startup_cmd)
|
||||
wl_display_run(dpy);
|
||||
}
|
||||
|
||||
+void
|
||||
+set_adaptive_sync(Monitor *m, int enable)
|
||||
+{
|
||||
+ struct wlr_output_state state;
|
||||
@@ -66,13 +67,13 @@ index 44f3ad9..737f089 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_ENABLED)
|
||||
+ return;
|
||||
+
|
||||
+ if (!enable && m->wlr_output->adaptive_sync_status
|
||||
+ == WLR_OUTPUT_ADAPTIVE_SYNC_DISABLED)
|
||||
+ 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);
|
||||
@@ -80,12 +81,12 @@ index 44f3ad9..737f089 100644
|
||||
+ /* 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);
|
||||
+ 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;
|
||||
@@ -95,7 +96,7 @@ index 44f3ad9..737f089 100644
|
||||
void
|
||||
setcursor(struct wl_listener *listener, void *data)
|
||||
{
|
||||
@@ -2359,10 +2399,12 @@ setfullscreen(Client *c, int fullscreen)
|
||||
@@ -2359,10 +2400,12 @@ setfullscreen(Client *c, int fullscreen)
|
||||
if (fullscreen) {
|
||||
c->prev = c->geom;
|
||||
resize(c, c->mon->m, 0);
|
||||
@@ -108,7 +109,7 @@ index 44f3ad9..737f089 100644
|
||||
}
|
||||
arrange(c->mon);
|
||||
printstatus();
|
||||
@@ -2760,6 +2802,12 @@ togglefullscreen(const Arg *arg)
|
||||
@@ -2760,6 +2803,12 @@ togglefullscreen(const Arg *arg)
|
||||
setfullscreen(sel, !sel->isfullscreen);
|
||||
}
|
||||
|
||||
@@ -121,21 +122,21 @@ index 44f3ad9..737f089 100644
|
||||
void
|
||||
toggletag(const Arg *arg)
|
||||
{
|
||||
@@ -2815,6 +2863,7 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
@@ -2815,6 +2864,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
|
||||
+ Monitor *lastmon = c->mon; // fullscreen_adaptive_sync
|
||||
if (c == grabc) {
|
||||
cursor_mode = CurNormal;
|
||||
grabc = NULL;
|
||||
@@ -2830,6 +2879,9 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
@@ -2830,6 +2880,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);
|
||||
+ if (c->isfullscreen)
|
||||
+ set_adaptive_sync(lastmon, 0);
|
||||
|
||||
wlr_scene_node_destroy(&c->scene->node);
|
||||
printstatus();
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
From cf817259dbb1235d1ffc073d4e0f128676552666 Mon Sep 17 00:00:00 2001
|
||||
From 5d475f7afe7ba7cee389a5c5ed4fa676b408fee5 Mon Sep 17 00:00:00 2001
|
||||
From: julmajustus <julmajustus@tutanota.com>
|
||||
Date: Mon, 18 May 2026 00:15:18 +0300
|
||||
Date: Mon, 22 Jun 2026 23:02:25 +0300
|
||||
Subject: [PATCH] fullscreen_adaptive_sync: Minor bug fixes
|
||||
|
||||
- Fixed logic error inside unmapnotify
|
||||
@@ -8,8 +8,8 @@ Subject: [PATCH] fullscreen_adaptive_sync: Minor bug fixes
|
||||
- Added extra check for the config commit success
|
||||
---
|
||||
config.def.h | 1 +
|
||||
dwl.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 53 insertions(+)
|
||||
dwl.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++---
|
||||
2 files changed, 57 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 8a6eda0..06b3153 100644
|
||||
@@ -24,7 +24,7 @@ index 8a6eda0..06b3153 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 8101ffa..2f1c80b 100644
|
||||
index 8101ffa..aabd882 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -323,6 +323,7 @@ static void requeststartdrag(struct wl_listener *listener, void *data);
|
||||
@@ -52,10 +52,11 @@ index 8101ffa..2f1c80b 100644
|
||||
#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)
|
||||
@@ -2300,6 +2304,43 @@ run(char *startup_cmd)
|
||||
wl_display_run(dpy);
|
||||
}
|
||||
|
||||
+void
|
||||
+set_adaptive_sync(Monitor *m, int enable)
|
||||
+{
|
||||
+ struct wlr_output_state state;
|
||||
@@ -66,13 +67,13 @@ index 8101ffa..2f1c80b 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_ENABLED)
|
||||
+ return;
|
||||
+
|
||||
+ if (!enable && m->wlr_output->adaptive_sync_status
|
||||
+ == WLR_OUTPUT_ADAPTIVE_SYNC_DISABLED)
|
||||
+ 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);
|
||||
@@ -80,12 +81,12 @@ index 8101ffa..2f1c80b 100644
|
||||
+ /* 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);
|
||||
+ 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;
|
||||
@@ -95,7 +96,7 @@ index 8101ffa..2f1c80b 100644
|
||||
void
|
||||
setcursor(struct wl_listener *listener, void *data)
|
||||
{
|
||||
@@ -2363,10 +2403,12 @@ setfullscreen(Client *c, int fullscreen)
|
||||
@@ -2363,10 +2404,12 @@ setfullscreen(Client *c, int fullscreen)
|
||||
if (fullscreen) {
|
||||
c->prev = c->geom;
|
||||
resize(c, c->mon->m, 0);
|
||||
@@ -108,7 +109,27 @@ index 8101ffa..2f1c80b 100644
|
||||
}
|
||||
arrange(c->mon);
|
||||
printstatus();
|
||||
@@ -2767,6 +2809,12 @@ togglefullscreen(const Arg *arg)
|
||||
@@ -2546,7 +2589,7 @@ setup(void)
|
||||
output_layout = wlr_output_layout_create(dpy);
|
||||
wl_signal_add(&output_layout->events.change, &layout_change);
|
||||
|
||||
- wlr_xdg_output_manager_v1_create(dpy, output_layout);
|
||||
+ wlr_xdg_output_manager_v1_create(dpy, output_layout);
|
||||
|
||||
/* Configure a listener to be notified when new outputs are available on the
|
||||
* backend. */
|
||||
@@ -2636,8 +2679,8 @@ setup(void)
|
||||
wl_signal_add(&virtual_keyboard_mgr->events.new_virtual_keyboard,
|
||||
&new_virtual_keyboard);
|
||||
virtual_pointer_mgr = wlr_virtual_pointer_manager_v1_create(dpy);
|
||||
- wl_signal_add(&virtual_pointer_mgr->events.new_virtual_pointer,
|
||||
- &new_virtual_pointer);
|
||||
+ wl_signal_add(&virtual_pointer_mgr->events.new_virtual_pointer,
|
||||
+ &new_virtual_pointer);
|
||||
|
||||
seat = wlr_seat_create(dpy, "seat0");
|
||||
wl_signal_add(&seat->events.request_set_cursor, &request_cursor);
|
||||
@@ -2767,6 +2810,12 @@ togglefullscreen(const Arg *arg)
|
||||
setfullscreen(sel, !sel->isfullscreen);
|
||||
}
|
||||
|
||||
@@ -121,21 +142,21 @@ index 8101ffa..2f1c80b 100644
|
||||
void
|
||||
toggletag(const Arg *arg)
|
||||
{
|
||||
@@ -2822,6 +2870,7 @@ unmapnotify(struct wl_listener *listener, void *data)
|
||||
@@ -2822,6 +2871,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
|
||||
+ 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)
|
||||
@@ -2837,6 +2887,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);
|
||||
+ if (c->isfullscreen)
|
||||
+ set_adaptive_sync(lastmon, 0);
|
||||
|
||||
wlr_scene_node_destroy(&c->scene->node);
|
||||
printstatus();
|
||||
|
||||
Reference in New Issue
Block a user