jachym/dwl-patches
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl-patches.git synced 2025-10-27 10:14:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update smartborders

Browse Source 
dd00d994ce4c53829d0b871622dc05e90a6f58c3
This commit is contained in:
Leonardo Hernández Hernández 2024-03-31 22:17:06 -06:00
parent 486c375d0d
commit 36b055f18e
No known key found for this signature in database
GPG Key ID: E538897EE11B9624
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
patches/smartborders/smartborders.patch
View File

@ -1,4 +1,4 @@
From c7120b651b1a6f1ae3277088d4de9af9686c71ae Mon Sep 17 00:00:00 2001 From 8eb0a8b1f69a79c429224a7613edbca8efb9e8ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
<leohdz172@protonmail.com> <leohdz172@protonmail.com>
Date: Tue, 16 Aug 2022 15:28:00 -0500 Date: Tue, 16 Aug 2022 15:28:00 -0500
@ -16,7 +16,7 @@ Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
2 files changed, 33 insertions(+), 16 deletions(-) 2 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index a8ed61d..f07cf07 100644 index 8847e58f..46de18d3 100644
--- a/config.def.h --- a/config.def.h
+++ b/config.def.h +++ b/config.def.h
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
@ -28,10 +28,10 @@ index a8ed61d..f07cf07 100644
static const float rootcolor[] = COLOR(0x222222ff); static const float rootcolor[] = COLOR(0x222222ff);
static const float bordercolor[] = COLOR(0x444444ff); static const float bordercolor[] = COLOR(0x444444ff);
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index 10d5a5b..903afc6 100644 index 39ce68c0..7a76f3b2 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -297,7 +297,7 @@ static void rendermon(struct wl_listener *listener, void *data); @@ -312,7 +312,7 @@ static void rendermon(struct wl_listener *listener, void *data);
static void requestdecorationmode(struct wl_listener *listener, void *data); static void requestdecorationmode(struct wl_listener *listener, void *data);
static void requeststartdrag(struct wl_listener *listener, void *data); static void requeststartdrag(struct wl_listener *listener, void *data);
static void requestmonstate(struct wl_listener *listener, void *data); static void requestmonstate(struct wl_listener *listener, void *data);
@ -40,7 +40,7 @@ index 10d5a5b..903afc6 100644
static void run(char *startup_cmd); static void run(char *startup_cmd);
static void setcursor(struct wl_listener *listener, void *data); static void setcursor(struct wl_listener *listener, void *data);
static void setcursorshape(struct wl_listener *listener, void *data); static void setcursorshape(struct wl_listener *listener, void *data);
@@ -696,7 +696,7 @@ closemon(Monitor *m) @@ -721,7 +721,7 @@ closemon(Monitor *m)
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (c->isfloating && c->geom.x > m->m.width) if (c->isfloating && c->geom.x > m->m.width)
resize(c, (struct wlr_box){.x = c->geom.x - m->w.width, .y = c->geom.y, resize(c, (struct wlr_box){.x = c->geom.x - m->w.width, .y = c->geom.y,
@ -49,14 +49,14 @@ index 10d5a5b..903afc6 100644
if (c->mon == m) if (c->mon == m)
setmon(c, selmon, c->tags); setmon(c, selmon, c->tags);
} }
@@ -731,8 +731,12 @@ commitnotify(struct wl_listener *listener, void *data) @@ -756,8 +756,12 @@ commitnotify(struct wl_listener *listener, void *data)
{ {
Client *c = wl_container_of(listener, c, commit); Client *c = wl_container_of(listener, c, commit);
- if (client_surface(c)->mapped) - if (client_surface(c)->mapped && c->mon)
- resize(c, c->geom, (c->isfloating && !c->isfullscreen)); - resize(c, c->geom, (c->isfloating && !c->isfullscreen));
+ if (client_surface(c)->mapped) { + if (client_surface(c)->mapped && c->mon) {
+ if (c->mon && c->mon->lt[c->mon->sellt]->arrange && !c->isfullscreen && !c->isfloating) + if (c->mon->lt[c->mon->sellt]->arrange && !c->isfullscreen && !c->isfloating)
+ c->mon->lt[c->mon->sellt]->arrange(c->mon); + c->mon->lt[c->mon->sellt]->arrange(c->mon);
+ else + else
+ resize(c, c->geom, (c->isfloating && !c->isfullscreen), (c->isfloating && !c->isfullscreen)); + resize(c, c->geom, (c->isfloating && !c->isfullscreen), (c->isfloating && !c->isfullscreen));
@ -64,7 +64,7 @@ index 10d5a5b..903afc6 100644
/* mark a pending resize as completed */ /* mark a pending resize as completed */
if (c->resize && c->resize <= c->surface.xdg->current.configure_serial) if (c->resize && c->resize <= c->surface.xdg->current.configure_serial)
@@ -1579,7 +1583,7 @@ monocle(Monitor *m) @@ -1654,7 +1658,7 @@ monocle(Monitor *m)
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
continue; continue;
@ -73,21 +73,21 @@ index 10d5a5b..903afc6 100644
n++; n++;
} }
if (n) if (n)
@@ -1626,11 +1630,11 @@ motionnotify(uint32_t time) @@ -1734,11 +1738,11 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
if (cursor_mode == CurMove) { if (cursor_mode == CurMove) {
/* Move the grabbed client to the new position. */ /* Move the grabbed client to the new position. */
resize(grabc, (struct wlr_box){.x = cursor->x - grabcx, .y = cursor->y - grabcy, resize(grabc, (struct wlr_box){.x = ROUND(cursor->x) - grabcx, .y = ROUND(cursor->y) - grabcy,
- .width = grabc->geom.width, .height = grabc->geom.height}, 1); - .width = grabc->geom.width, .height = grabc->geom.height}, 1);
+ .width = grabc->geom.width, .height = grabc->geom.height}, 1, 1); + .width = grabc->geom.width, .height = grabc->geom.height}, 1, 1);
return; return;
} else if (cursor_mode == CurResize) { } else if (cursor_mode == CurResize) {
resize(grabc, (struct wlr_box){.x = grabc->geom.x, .y = grabc->geom.y, resize(grabc, (struct wlr_box){.x = grabc->geom.x, .y = grabc->geom.y,
- .width = cursor->x - grabc->geom.x, .height = cursor->y - grabc->geom.y}, 1); - .width = ROUND(cursor->x) - grabc->geom.x, .height = ROUND(cursor->y) - grabc->geom.y}, 1);
+ .width = cursor->x - grabc->geom.x, .height = cursor->y - grabc->geom.y}, 1, 1); + .width = ROUND(cursor->x) - grabc->geom.x, .height = ROUND(cursor->y) - grabc->geom.y}, 1, 1);
return; return;
} }
@@ -1924,12 +1928,13 @@ requestmonstate(struct wl_listener *listener, void *data) @@ -2032,12 +2036,13 @@ requestmonstate(struct wl_listener *listener, void *data)
} }
void void
@ -102,16 +102,16 @@ index 10d5a5b..903afc6 100644
applybounds(c, bbox); applybounds(c, bbox);
/* Update scene-graph, including borders */ /* Update scene-graph, including borders */
@@ -2044,6 +2049,8 @@ setfloating(Client *c, int floating) @@ -2154,6 +2159,8 @@ setfloating(Client *c, int floating)
return; wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen ||
wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen (p && p->isfullscreen) ? LyrFS
? LyrFS : c->isfloating ? LyrFloat : LyrTile]); : c->isfloating ? LyrFloat : LyrTile]);
+ if (c->isfloating && !c->bw) + if (c->isfloating && !c->bw)
+ resize(c, c->mon->m, 0, 1); + resize(c, c->mon->m, 0, 1);
arrange(c->mon); arrange(c->mon);
printstatus(); printstatus();
} }
@@ -2061,11 +2068,11 @@ setfullscreen(Client *c, int fullscreen) @@ -2171,11 +2178,11 @@ setfullscreen(Client *c, int fullscreen)
if (fullscreen) { if (fullscreen) {
c->prev = c->geom; c->prev = c->geom;
@ -125,7 +125,7 @@ index 10d5a5b..903afc6 100644
} }
arrange(c->mon); arrange(c->mon);
printstatus(); printstatus();
@@ -2090,6 +2097,12 @@ setlayout(const Arg *arg) @@ -2202,6 +2209,12 @@ setlayout(const Arg *arg)
if (arg && arg->v) if (arg && arg->v)
selmon->lt[selmon->sellt] = (Layout *)arg->v; selmon->lt[selmon->sellt] = (Layout *)arg->v;
strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol)); strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol));
@ -138,7 +138,7 @@ index 10d5a5b..903afc6 100644
arrange(selmon); arrange(selmon);
printstatus(); printstatus();
} }
@@ -2124,7 +2137,7 @@ setmon(Client *c, Monitor *m, uint32_t newtags) @@ -2236,7 +2249,7 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
arrange(oldmon); arrange(oldmon);
if (m) { if (m) {
/* Make sure window actually overlaps with the monitor */ /* Make sure window actually overlaps with the monitor */
@ -147,16 +147,16 @@ index 10d5a5b..903afc6 100644
c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */ c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */
setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */ setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
setfloating(c, c->isfloating); setfloating(c, c->isfloating);
@@ -2452,7 +2465,7 @@ tagmon(const Arg *arg) @@ -2572,7 +2585,7 @@ tagmon(const Arg *arg)
void void
tile(Monitor *m) tile(Monitor *m)
{ {
- unsigned int i, n = 0, mw, my, ty; - unsigned int mw, my, ty;
+ unsigned int i, n = 0, mw, my, ty, draw_borders = 1; + unsigned int mw, my, ty, draw_borders = 1;
int i, n = 0;
Client *c; Client *c;
wl_list_for_each(c, &clients, link) @@ -2582,6 +2595,9 @@ tile(Monitor *m)
@@ -2461,6 +2474,9 @@ tile(Monitor *m)
if (n == 0) if (n == 0)
return; return;
@ -164,9 +164,9 @@ index 10d5a5b..903afc6 100644
+ draw_borders = 0; + draw_borders = 0;
+ +
if (n > m->nmaster) if (n > m->nmaster)
mw = m->nmaster ? m->w.width * m->mfact : 0; mw = m->nmaster ? ROUND(m->w.width * m->mfact) : 0;
else else
@@ -2471,11 +2487,11 @@ tile(Monitor *m) @@ -2592,11 +2608,11 @@ tile(Monitor *m)
continue; continue;
if (i < m->nmaster) { if (i < m->nmaster) {
resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw, resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw,
@ -180,7 +180,7 @@ index 10d5a5b..903afc6 100644
ty += c->geom.height; ty += c->geom.height;
} }
i++; i++;
@@ -2644,7 +2660,7 @@ updatemons(struct wl_listener *listener, void *data) @@ -2765,7 +2781,7 @@ updatemons(struct wl_listener *listener, void *data)
arrange(m); arrange(m);
/* make sure fullscreen clients have the right size */ /* make sure fullscreen clients have the right size */
if ((c = focustop(m)) && c->isfullscreen) if ((c = focustop(m)) && c->isfullscreen)
@ -189,15 +189,15 @@ index 10d5a5b..903afc6 100644
/* Try to re-set the gamma LUT when updating monitors, /* Try to re-set the gamma LUT when updating monitors,
* it's only really needed when enabling a disabled output, but meh. */ * it's only really needed when enabling a disabled output, but meh. */
@@ -2826,7 +2842,7 @@ configurex11(struct wl_listener *listener, void *data) @@ -2962,7 +2978,7 @@ configurex11(struct wl_listener *listener, void *data)
return; }
if (c->isfloating || client_is_unmanaged(c)) if (c->isfloating || client_is_unmanaged(c))
resize(c, (struct wlr_box){.x = event->x, .y = event->y, resize(c, (struct wlr_box){.x = event->x, .y = event->y,
- .width = event->width, .height = event->height}, 0); - .width = event->width + c->bw * 2, .height = event->height + c->bw * 2}, 0);
+ .width = event->width, .height = event->height}, 0, 1); + .width = event->width + c->bw * 2, .height = event->height + c->bw * 2}, 0, 1);
else else
arrange(c->mon); arrange(c->mon);
} }
-- --
2.43.0 2.44.0