mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2026-06-11 10:23:19 +00:00
'minimalborders' patch to stale-patches; closes #130
This commit is contained in:
A Frederick Christensen
@@ -1,34 +0,0 @@
|
||||
### Description
|
||||
Dynamically adjusts the borders between adjacent windows to make them visually merge
|
||||
|
||||
**NOTE:** to disable minimalborders after applying this patch, set `draw_minimal_borders` to `0`
|
||||
|
||||
```c
|
||||
static const int draw_minimal_borders = 0; /* disable minimalborders */
|
||||
```
|
||||
|
||||
<details>
|
||||
<summary>Preview:</summary>
|
||||
<pre>
|
||||
with:
|
||||
|
||||
```c
|
||||
static const unsigned int borderpx = 10; /* border pixel of windows */
|
||||
```
|
||||
|
||||
Before applying the patch
|
||||
<img src="https://i.imgur.com/VQfXCjp.png"/>
|
||||
|
||||
After applying the patch
|
||||
<img src="https://i.imgur.com/I7s0Xkv.png"/>
|
||||
</pre>
|
||||
</details>
|
||||
|
||||
### Download
|
||||
- [git branch](https://codeberg.org/wochap/dwl/src/branch/v0.5/minimalborders)
|
||||
- [2024-07-09](https://codeberg.org/dwl/dwl-patches/raw/commit/13d96b51b54500dd24544cf3a73c61b7a1414bc6/patches/minimalborders/minimalborders.patch)
|
||||
- [2024-04-11](https://codeberg.org/dwl/dwl-patches/raw/commit/7a5c3420822074c544fa102e030b7c30aa6b6be8/minimalborders/minimalborders.patch)
|
||||
- [v0.5](https://codeberg.org/dwl/dwl-patches/raw/commit/be3735bc6a5c64ff76c200a8679453bd179be456/minimalborders/minimalborders.patch)
|
||||
|
||||
### Authors
|
||||
- [wochap](https://codeberg.org/wochap)
|
||||
@@ -1,161 +0,0 @@
|
||||
From ce0eb92fb100801f343fbe9b76639847a9e39160 Mon Sep 17 00:00:00 2001
|
||||
From: wochap <gean.marroquin@gmail.com>
|
||||
Date: Fri, 5 Jul 2024 11:22:57 -0500
|
||||
Subject: [PATCH] implement minimalborders
|
||||
|
||||
---
|
||||
config.def.h | 1 +
|
||||
dwl.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++----
|
||||
2 files changed, 72 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 22d2171..0322dbf 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -7,6 +7,7 @@
|
||||
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 */
|
||||
+static const int draw_minimal_borders = 1; /* merge adjacent borders */
|
||||
static const float rootcolor[] = COLOR(0x222222ff);
|
||||
static const float bordercolor[] = COLOR(0x444444ff);
|
||||
static const float focuscolor[] = COLOR(0x005577ff);
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index dc0437e..198061b 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -106,6 +106,7 @@ typedef struct Monitor Monitor;
|
||||
typedef struct {
|
||||
/* Must keep these three elements in this order */
|
||||
unsigned int type; /* XDGShell or X11* */
|
||||
+ int interact;
|
||||
struct wlr_box geom; /* layout-relative, includes border */
|
||||
Monitor *mon;
|
||||
struct wlr_scene_tree *scene;
|
||||
@@ -316,7 +317,8 @@ static void rendermon(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 requestmonstate(struct wl_listener *listener, void *data);
|
||||
-static void resize(Client *c, struct wlr_box geo, int interact);
|
||||
+static void resizeapply(Client *c, struct wlr_box geo, int interact);
|
||||
+static void resizenoapply(Client *c, struct wlr_box geo, int interact);
|
||||
static void run(char *startup_cmd);
|
||||
static void setcursor(struct wl_listener *listener, void *data);
|
||||
static void setcursorshape(struct wl_listener *listener, void *data);
|
||||
@@ -408,6 +410,8 @@ static struct wlr_box sgeom;
|
||||
static struct wl_list mons;
|
||||
static Monitor *selmon;
|
||||
|
||||
+static void (*resize)(Client *c, struct wlr_box geo, int interact) = resizeapply;
|
||||
+
|
||||
#ifdef XWAYLAND
|
||||
static void activatex11(struct wl_listener *listener, void *data);
|
||||
static void associatex11(struct wl_listener *listener, void *data);
|
||||
@@ -476,6 +480,35 @@ applyrules(Client *c)
|
||||
setmon(c, mon, newtags);
|
||||
}
|
||||
|
||||
+void
|
||||
+applyminimalborders(Client *c, Monitor *m)
|
||||
+{
|
||||
+ struct wlr_box geom = c->geom;
|
||||
+
|
||||
+ geom.x -= borderpx;
|
||||
+ geom.width += borderpx;
|
||||
+ geom.y -= borderpx;
|
||||
+ geom.height += borderpx;
|
||||
+
|
||||
+ if (geom.x < m->w.x) {
|
||||
+ geom.x += borderpx;
|
||||
+ geom.width -= borderpx;
|
||||
+ }
|
||||
+ if (geom.x + geom.width > m->w.width - (int)borderpx) {
|
||||
+ geom.width -= borderpx;
|
||||
+ }
|
||||
+
|
||||
+ if (geom.y < m->w.y) {
|
||||
+ geom.y += borderpx;
|
||||
+ geom.height -= borderpx;
|
||||
+ }
|
||||
+ if (geom.y + geom.height > m->w.height - (int)borderpx) {
|
||||
+ geom.height -= borderpx;
|
||||
+ }
|
||||
+
|
||||
+ resize(c, geom, 0);
|
||||
+}
|
||||
+
|
||||
void
|
||||
arrange(Monitor *m)
|
||||
{
|
||||
@@ -510,8 +543,28 @@ arrange(Monitor *m)
|
||||
: c->scene->node.parent);
|
||||
}
|
||||
|
||||
- if (m->lt[m->sellt]->arrange)
|
||||
- m->lt[m->sellt]->arrange(m);
|
||||
+ if (m->lt[m->sellt]->arrange) {
|
||||
+ if (draw_minimal_borders) {
|
||||
+ int save_width = m->w.width;
|
||||
+ int save_height = m->w.height;
|
||||
+ m->w.width += borderpx;
|
||||
+ m->w.height += borderpx;
|
||||
+ resize = resizenoapply;
|
||||
+ m->lt[m->sellt]->arrange(m);
|
||||
+ wl_list_for_each(c, &clients, link) {
|
||||
+ if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
|
||||
+ continue;
|
||||
+ if (draw_minimal_borders)
|
||||
+ applyminimalborders(c, m);
|
||||
+ resizeapply(c, c->geom, c->interact);
|
||||
+ }
|
||||
+ m->w.width = save_width;
|
||||
+ m->w.height = save_height;
|
||||
+ resize = resizeapply;
|
||||
+ } else {
|
||||
+ m->lt[m->sellt]->arrange(m);
|
||||
+ }
|
||||
+ }
|
||||
motionnotify(0, NULL, 0, 0, 0, 0);
|
||||
checkidleinhibitor(NULL);
|
||||
}
|
||||
@@ -1962,8 +2015,13 @@ pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy,
|
||||
struct timespec now;
|
||||
|
||||
if (surface != seat->pointer_state.focused_surface &&
|
||||
- sloppyfocus && time && c && !client_is_unmanaged(c))
|
||||
- focusclient(c, 0);
|
||||
+ sloppyfocus && time && c && !client_is_unmanaged(c)) {
|
||||
+ if (c->isfloating || c->isfullscreen) {
|
||||
+ focusclient(c, 0);
|
||||
+ } else {
|
||||
+ focusclient(c, 1);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
/* If surface is NULL, clear pointer focus */
|
||||
if (!surface) {
|
||||
@@ -2128,7 +2186,7 @@ requestmonstate(struct wl_listener *listener, void *data)
|
||||
}
|
||||
|
||||
void
|
||||
-resize(Client *c, struct wlr_box geo, int interact)
|
||||
+resizeapply(Client *c, struct wlr_box geo, int interact)
|
||||
{
|
||||
struct wlr_box *bbox;
|
||||
struct wlr_box clip;
|
||||
@@ -2160,6 +2218,13 @@ resize(Client *c, struct wlr_box geo, int interact)
|
||||
wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip);
|
||||
}
|
||||
|
||||
+void
|
||||
+resizenoapply(Client *c, struct wlr_box geo, int interact)
|
||||
+{
|
||||
+ c->geom = geo;
|
||||
+ c->interact = interact;
|
||||
+}
|
||||
+
|
||||
void
|
||||
run(char *startup_cmd)
|
||||
{
|
||||
--
|
||||
2.45.1
|
||||
Reference in New Issue
Block a user