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

smartborders: rebase against 9c05b9622c7aa3a0874c49231249cf1859e2d031

Browse Source
This commit is contained in:
Leonardo Hernández Hernández 2024-09-02 23:47:16 -06:00
parent 4326f809d9
commit 7c0a9f154a
No known key found for this signature in database
GPG Key ID: E538897EE11B9624
2 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/smartborders/README.md
View File

@ -4,7 +4,7 @@ in its tag OR if the window is in a monocle layout.
### Download ### Download
- [git branch](https://codeberg.org/sevz/dwl/src/branch/smartborders) - [git branch](https://codeberg.org/sevz/dwl/src/branch/smartborders)
- [2024-06-07](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/smartborders/smartborders.patch) - [main 2024-09-02](/dwl/dwl-patches/raw/branch/main/patches/smartborders/smartborders.patch)
- [smartborders-0.7.patch](/dwl/dwl-patches/raw/branch/main/patches/smartborders/smartborders-0.7.patch) - [smartborders-0.7.patch](/dwl/dwl-patches/raw/branch/main/patches/smartborders/smartborders-0.7.patch)
### Authors ### Authors

88
patches/smartborders/smartborders.patch
View File

@ -1,8 +1,8 @@
From d758d9e3fabcd6cba73c08b0404d48fe07f9b624 Mon Sep 17 00:00:00 2001 From e9ae9a7da8638f6562cddee91eeb4d4d9d9545f5 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
Subject: [PATCH] don't draw borders if there is only one window Subject: [PATCH] don't draw borders if there is only one window
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
@ -12,11 +12,11 @@ Co-authored-by: Andrey Proskurin <andreyproskurin@protonmail.com>
Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me> Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
--- ---
config.def.h | 1 + config.def.h | 1 +
dwl.c | 48 ++++++++++++++++++++++++++++++++---------------- dwl.c | 46 +++++++++++++++++++++++++++++++---------------
2 files changed, 33 insertions(+), 16 deletions(-) 2 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index a784eb4f..c9cff440 100644 index 22d2171d..632f151f 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 a784eb4f..c9cff440 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 6f041a0d..b91134fd 100644 index 9021e442..67714759 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -315,7 +315,7 @@ static void rendermon(struct wl_listener *listener, void *data); @@ -321,7 +321,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 6f041a0d..b91134fd 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);
@@ -735,7 +735,7 @@ closemon(Monitor *m) @@ -740,7 +740,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,22 +49,20 @@ index 6f041a0d..b91134fd 100644
if (c->mon == m) if (c->mon == m)
setmon(c, selmon, c->tags); setmon(c, selmon, c->tags);
} }
@@ -770,8 +770,12 @@ commitnotify(struct wl_listener *listener, void *data) @@ -809,7 +809,11 @@ commitnotify(struct wl_listener *listener, void *data)
{ return;
Client *c = wl_container_of(listener, c, commit); }
- 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 && c->mon && c->mon->lt[c->mon->sellt]->arrange
+ if (client_surface(c)->mapped && c->mon) { + && !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));
+ }
/* 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)
@@ -1717,7 +1721,7 @@ monocle(Monitor *m) @@ -1773,7 +1777,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,36 +71,38 @@ index 6f041a0d..b91134fd 100644
n++; n++;
} }
if (n) if (n)
@@ -1797,11 +1801,11 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d @@ -1865,11 +1869,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 = ROUND(cursor->x) - grabcx, .y = ROUND(cursor->y) - grabcy, resize(grabc, (struct wlr_box){.x = (int)round(cursor->x) - grabcx, .y = (int)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 = ROUND(cursor->x) - grabc->geom.x, .height = ROUND(cursor->y) - grabc->geom.y}, 1); - .width = (int)round(cursor->x) - grabc->geom.x, .height = (int)round(cursor->y) - grabc->geom.y}, 1);
+ .width = ROUND(cursor->x) - grabc->geom.x, .height = ROUND(cursor->y) - grabc->geom.y}, 1, 1); + .width = (int)round(cursor->x) - grabc->geom.x, .height = (int)round(cursor->y) - grabc->geom.y}, 1, 1);
return; return;
} }
@@ -2095,12 +2099,13 @@ requestmonstate(struct wl_listener *listener, void *data) @@ -2147,7 +2151,7 @@ requestmonstate(struct wl_listener *listener, void *data)
} }
void void
-resize(Client *c, struct wlr_box geo, int interact) -resize(Client *c, struct wlr_box geo, int interact)
+resize(Client *c, struct wlr_box geo, int interact, int draw_borders) +resize(Client *c, struct wlr_box geo, int interact, int draw_borders)
{ {
struct wlr_box *bbox = interact ? &sgeom : &c->mon->w; struct wlr_box *bbox;
struct wlr_box clip; struct wlr_box clip;
@@ -2159,6 +2163,7 @@ resize(Client *c, struct wlr_box geo, int interact)
client_set_bounds(c, geo.width, geo.height); client_set_bounds(c, geo.width, geo.height);
c->geom = geo; c->geom = geo;
+ c->bw = draw_borders ? borderpx : 0; + c->bw = draw_borders ? borderpx : 0;
applybounds(c, bbox); applybounds(c, bbox);
/* Update scene-graph, including borders */ /* Update scene-graph, including borders */
@@ -2218,6 +2223,8 @@ setfloating(Client *c, int floating) @@ -2283,6 +2288,8 @@ setfloating(Client *c, int floating)
wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen || wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen ||
(p && p->isfullscreen) ? LyrFS (p && p->isfullscreen) ? LyrFS
: c->isfloating ? LyrFloat : LyrTile]); : c->isfloating ? LyrFloat : LyrTile]);
@ -111,7 +111,7 @@ index 6f041a0d..b91134fd 100644
arrange(c->mon); arrange(c->mon);
printstatus(); printstatus();
} }
@@ -2235,11 +2242,11 @@ setfullscreen(Client *c, int fullscreen) @@ -2300,11 +2307,11 @@ setfullscreen(Client *c, int fullscreen)
if (fullscreen) { if (fullscreen) {
c->prev = c->geom; c->prev = c->geom;
@ -125,7 +125,7 @@ index 6f041a0d..b91134fd 100644
} }
arrange(c->mon); arrange(c->mon);
printstatus(); printstatus();
@@ -2266,6 +2273,12 @@ setlayout(const Arg *arg) @@ -2320,6 +2327,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 6f041a0d..b91134fd 100644
arrange(selmon); arrange(selmon);
printstatus(); printstatus();
} }
@@ -2300,7 +2313,7 @@ setmon(Client *c, Monitor *m, uint32_t newtags) @@ -2354,7 +2367,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,7 +147,7 @@ index 6f041a0d..b91134fd 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);
@@ -2589,7 +2602,7 @@ tagmon(const Arg *arg) @@ -2651,7 +2664,7 @@ tagmon(const Arg *arg)
void void
tile(Monitor *m) tile(Monitor *m)
{ {
@ -156,7 +156,7 @@ index 6f041a0d..b91134fd 100644
int i, n = 0; int i, n = 0;
Client *c; Client *c;
@@ -2599,6 +2612,9 @@ tile(Monitor *m) @@ -2661,6 +2674,9 @@ tile(Monitor *m)
if (n == 0) if (n == 0)
return; return;
@ -164,9 +164,9 @@ index 6f041a0d..b91134fd 100644
+ draw_borders = 0; + draw_borders = 0;
+ +
if (n > m->nmaster) if (n > m->nmaster)
mw = m->nmaster ? ROUND(m->w.width * m->mfact) : 0; mw = m->nmaster ? (int)roundf(m->w.width * m->mfact) : 0;
else else
@@ -2609,11 +2625,11 @@ tile(Monitor *m) @@ -2671,11 +2687,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 6f041a0d..b91134fd 100644
ty += c->geom.height; ty += c->geom.height;
} }
i++; i++;
@@ -2782,7 +2798,7 @@ updatemons(struct wl_listener *listener, void *data) @@ -2844,7 +2860,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 6f041a0d..b91134fd 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. */
@@ -2981,7 +2997,7 @@ configurex11(struct wl_listener *listener, void *data) @@ -3053,7 +3069,7 @@ configurex11(struct wl_listener *listener, void *data)
} if ((c->isfloating && c != grabc) || !c->mon->lt[c->mon->sellt]->arrange) {
if (c->isfloating || client_is_unmanaged(c)) resize(c, (struct wlr_box){.x = event->x - c->bw,
resize(c, (struct wlr_box){.x = event->x, .y = event->y, .y = event->y - c->bw, .width = event->width + c->bw * 2,
- .width = event->width + c->bw * 2, .height = event->height + c->bw * 2}, 0); - .height = event->height + c->bw * 2}, 0);
+ .width = event->width + c->bw * 2, .height = event->height + c->bw * 2}, 0, 1); + .height = event->height + c->bw * 2}, 0, 1);
else } else {
arrange(c->mon); arrange(c->mon);
} }
-- --
2.45.2 2.46.0