diff --git a/patches/borders/borders.patch b/patches/borders/borders.patch index b55abfb..c8cc847 100644 --- a/patches/borders/borders.patch +++ b/patches/borders/borders.patch @@ -1,19 +1,21 @@ -From 18abc170273690fd3fbbdcbe88b348a0b802ba91 Mon Sep 17 00:00:00 2001 +From b12cfff672f0705d8259cf26b3a574faa5ca43ae Mon Sep 17 00:00:00 2001 From: wochap -Date: Wed, 6 Mar 2024 11:45:30 -0500 -Subject: [PATCH] add 2 more borders for each side +Date: Tue, 4 Jun 2024 16:02:25 -0500 +Subject: [PATCH] implement borders patch +tihs patch adds 2 extra borders relative to the client, they don't +change the size of the client --- client.h | 16 +++++++++++++--- - config.def.h | 7 +++++++ - dwl.c | 41 +++++++++++++++++++++++++++++++++++++---- - 3 files changed, 57 insertions(+), 7 deletions(-) + config.def.h | 8 ++++++++ + dwl.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++---- + 3 files changed, 70 insertions(+), 7 deletions(-) diff --git a/client.h b/client.h -index 71c7d76..c65f3ec 100644 +index 800b867..33fd579 100644 --- a/client.h +++ b/client.h -@@ -309,11 +309,21 @@ client_send_close(Client *c) +@@ -325,11 +325,21 @@ client_send_close(Client *c) } static inline void @@ -39,10 +41,10 @@ index 71c7d76..c65f3ec 100644 static inline void diff --git a/config.def.h b/config.def.h -index db0babc..bc03d24 100644 +index 8847e58..2d6bbe5 100644 --- a/config.def.h +++ b/config.def.h -@@ -7,7 +7,14 @@ +@@ -7,8 +7,16 @@ static const int sloppyfocus = 1; /* focus follows mouse */ static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */ static const unsigned int borderpx = 1; /* border pixel of windows */ @@ -50,18 +52,20 @@ index db0babc..bc03d24 100644 +static const unsigned int borderepx = 0; /* width of the border that start from inside the windows */ +static const unsigned int borderspx_offset = 0; /* offset of the border that start from outside the windows */ +static const unsigned int borderepx_negative_offset = 0; /* offset of the border that start from inside the windows */ + static const float rootcolor[] = COLOR(0x222222ff); static const float bordercolor[] = COLOR(0x444444ff); +static const float borderscolor[] = COLOR(0x444444ff); /* color of the border that start from outside the windows */ +static const float borderecolor[] = COLOR(0x444444ff); /* color of the border that start from inside the windows */ +static const int border_color_type = BrdOriginal; /* borders to be colored (focuscolor, urgentcolor) */ ++static const int borders_only_floating = 0; static const float focuscolor[] = COLOR(0x005577ff); static const float urgentcolor[] = COLOR(0xff0000ff); - /* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */ + /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ diff --git a/dwl.c b/dwl.c -index ef27a1d..e11b185 100644 +index bf763df..303832a 100644 --- a/dwl.c +++ b/dwl.c -@@ -80,6 +80,7 @@ enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrFS, LyrTop, LyrOverlay, LyrBlock, +@@ -86,6 +86,7 @@ enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrOverlay, LyrBlock, enum { NetWMWindowTypeDialog, NetWMWindowTypeSplash, NetWMWindowTypeToolbar, NetWMWindowTypeUtility, NetLast }; /* EWMH atoms */ #endif @@ -69,7 +73,7 @@ index ef27a1d..e11b185 100644 typedef union { int i; -@@ -103,6 +104,8 @@ typedef struct { +@@ -109,6 +110,8 @@ typedef struct { Monitor *mon; struct wlr_scene_tree *scene; struct wlr_scene_rect *border[4]; /* top, bottom, left, right */ @@ -78,7 +82,7 @@ index ef27a1d..e11b185 100644 struct wlr_scene_tree *scene_surface; struct wl_list link; struct wl_list flink; -@@ -127,6 +130,8 @@ typedef struct { +@@ -136,6 +139,8 @@ typedef struct { struct wl_listener set_hints; #endif unsigned int bw; @@ -87,16 +91,16 @@ index ef27a1d..e11b185 100644 uint32_t tags; int isfloating, isurgent, isfullscreen; uint32_t resize; /* configure serial of a pending resize */ -@@ -971,6 +976,8 @@ createnotify(struct wl_listener *listener, void *data) +@@ -973,6 +978,8 @@ createnotify(struct wl_listener *listener, void *data) c = xdg_surface->data = ecalloc(1, sizeof(*c)); c->surface.xdg = xdg_surface; c->bw = borderpx; -+ c->bws = borderspx; -+ c->bwe = borderepx; ++ c->bws = borders_only_floating ? 0 : borderspx; ++ c->bwe = borders_only_floating ? 0 : borderepx; wlr_xdg_toplevel_set_wm_capabilities(xdg_surface->toplevel, WLR_XDG_TOPLEVEL_WM_CAPABILITIES_FULLSCREEN); -@@ -1205,7 +1212,7 @@ focusclient(Client *c, int lift) +@@ -1268,7 +1275,7 @@ focusclient(Client *c, int lift) /* Don't change border color if there is an exclusive focus or we are * handling a drag operation */ if (!exclusive_focus && !seat->drag) @@ -105,7 +109,7 @@ index ef27a1d..e11b185 100644 } /* Deactivate old client if focus is changing */ -@@ -1222,7 +1229,7 @@ focusclient(Client *c, int lift) +@@ -1285,7 +1292,7 @@ focusclient(Client *c, int lift) /* Don't deactivate old client if the new one wants focus, as this causes issues with winecfg * and probably other clients */ } else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) { @@ -114,9 +118,9 @@ index ef27a1d..e11b185 100644 client_activate_surface(old, 0); } -@@ -1535,6 +1542,12 @@ mapnotify(struct wl_listener *listener, void *data) - for (i = 0; i < 4; i++) { - c->border[i] = wlr_scene_rect_create(c->scene, 0, 0, bordercolor); +@@ -1597,6 +1604,12 @@ mapnotify(struct wl_listener *listener, void *data) + c->border[i] = wlr_scene_rect_create(c->scene, 0, 0, + c->isurgent ? urgentcolor : bordercolor); c->border[i]->node.data = c; + + c->borders[i] = wlr_scene_rect_create(c->scene, 0, 0, borderscolor); @@ -127,7 +131,20 @@ index ef27a1d..e11b185 100644 } /* Initialize client geometry with room for border */ -@@ -1951,6 +1964,24 @@ resize(Client *c, struct wlr_box geo, int interact) +@@ -1618,6 +1631,12 @@ mapnotify(struct wl_listener *listener, void *data) + } else { + applyrules(c); + } ++ ++ if (borders_only_floating) { ++ c->bws = c->isfloating ? borderspx : 0; ++ c->bwe = c->isfloating ? borderepx : 0; ++ } ++ + printstatus(); + + unset_fullscreen: +@@ -2051,6 +2070,24 @@ resize(Client *c, struct wlr_box geo, int interact) wlr_scene_node_set_position(&c->border[2]->node, 0, c->bw); wlr_scene_node_set_position(&c->border[3]->node, c->geom.width - c->bw, c->bw); @@ -152,7 +169,20 @@ index ef27a1d..e11b185 100644 /* this is a no-op if size hasn't changed */ c->resize = client_set_size(c, c->geom.width - 2 * c->bw, c->geom.height - 2 * c->bw); -@@ -2063,6 +2094,8 @@ setfullscreen(Client *c, int fullscreen) +@@ -2151,6 +2188,12 @@ setfloating(Client *c, int floating) + c->isfloating = floating; + if (!c->mon) + return; ++ ++ if (borders_only_floating) { ++ c->bws = c->isfloating ? borderspx : 0; ++ c->bwe = c->isfloating ? borderepx : 0; ++ } ++ + wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen || + (p && p->isfullscreen) ? LyrFS + : c->isfloating ? LyrFloat : LyrTile]); +@@ -2165,6 +2208,8 @@ setfullscreen(Client *c, int fullscreen) if (!c->mon) return; c->bw = fullscreen ? 0 : borderpx; @@ -161,24 +191,23 @@ index ef27a1d..e11b185 100644 client_set_fullscreen(c, fullscreen); wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen ? LyrFS : c->isfloating ? LyrFloat : LyrTile]); -@@ -2651,7 +2684,7 @@ urgent(struct wl_listener *listener, void *data) - return; +@@ -2819,7 +2864,7 @@ urgent(struct wl_listener *listener, void *data) + printstatus(); if (client_surface(c)->mapped) - client_set_border_color(c, urgentcolor); + client_set_border_color(c, urgentcolor, urgentcolor, urgentcolor); - c->isurgent = 1; - printstatus(); } -@@ -2835,7 +2868,7 @@ sethints(struct wl_listener *listener, void *data) - c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints); + + void +@@ -3023,7 +3068,7 @@ sethints(struct wl_listener *listener, void *data) + printstatus(); if (c->isurgent && surface && surface->mapped) - client_set_border_color(c, urgentcolor); + client_set_border_color(c, urgentcolor, urgentcolor, urgentcolor); - - printstatus(); } + + void -- -2.42.0 - +2.44.1