mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2025-10-31 12:04:23 +00:00
122 lines
4.2 KiB
Diff
122 lines
4.2 KiB
Diff
From e82e15860c36a70539625b8fe7b4bd54d0721705 Mon Sep 17 00:00:00 2001
|
|
From: Palanix <palanixyt@gmail.com>
|
|
Date: Fri, 24 Nov 2023 21:16:56 +0100
|
|
Subject: [PATCH] cweights to allow different size clients in normal layouts
|
|
|
|
---
|
|
config.def.h | 3 +++
|
|
dwl.c | 32 ++++++++++++++++++++++++++++++--
|
|
2 files changed, 33 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/config.def.h b/config.def.h
|
|
index 22d2171..d1bc596 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -133,6 +133,9 @@ static const Key keys[] = {
|
|
{ MODKEY, XKB_KEY_d, incnmaster, {.i = -1} },
|
|
{ MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} },
|
|
{ MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} },
|
|
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_H, setcfact, {.f = +0.25f} },
|
|
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_L, setcfact, {.f = -0.25f} },
|
|
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_K, setcfact, {.f = 0.0f} },
|
|
{ MODKEY, XKB_KEY_Return, zoom, {0} },
|
|
{ MODKEY, XKB_KEY_Tab, view, {0} },
|
|
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} },
|
|
diff --git a/dwl.c b/dwl.c
|
|
index 5bf995e..5a17343 100644
|
|
--- a/dwl.c
|
|
+++ b/dwl.c
|
|
@@ -141,6 +141,7 @@ typedef struct {
|
|
uint32_t tags;
|
|
int isfloating, isurgent, isfullscreen;
|
|
uint32_t resize; /* configure serial of a pending resize */
|
|
+ float cweight;
|
|
} Client;
|
|
|
|
typedef struct {
|
|
@@ -322,6 +323,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 setcfact(const Arg *arg);
|
|
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);
|
|
@@ -1060,6 +1062,7 @@ createnotify(struct wl_listener *listener, void *data)
|
|
c = toplevel->base->data = ecalloc(1, sizeof(*c));
|
|
c->surface.xdg = toplevel->base;
|
|
c->bw = borderpx;
|
|
+ c->cweight = 1.0;
|
|
|
|
LISTEN(&toplevel->base->surface->events.commit, &c->commit, commitnotify);
|
|
LISTEN(&toplevel->base->surface->events.map, &c->map, mapnotify);
|
|
@@ -2268,6 +2271,19 @@ run(char *startup_cmd)
|
|
wl_display_run(dpy);
|
|
}
|
|
|
|
+void
|
|
+setcfact(const Arg *arg)
|
|
+{
|
|
+ Client *sel = focustop(selmon);
|
|
+
|
|
+ if(!arg || !sel || !selmon->lt[selmon->sellt]->arrange)
|
|
+ return;
|
|
+ sel->cweight = (float) (arg->f ? sel->cweight + arg->f : 1.0);
|
|
+ if (sel->cweight < 0)
|
|
+ sel->cweight = 0;
|
|
+ arrange(selmon);
|
|
+}
|
|
+
|
|
void
|
|
setcursor(struct wl_listener *listener, void *data)
|
|
{
|
|
@@ -2692,6 +2708,7 @@ tile(Monitor *m)
|
|
{
|
|
unsigned int mw, my, ty;
|
|
int i, n = 0;
|
|
+ float mweight = 0, tweight = 0;
|
|
Client *c;
|
|
|
|
wl_list_for_each(c, &clients, link)
|
|
@@ -2704,17 +2721,27 @@ tile(Monitor *m)
|
|
mw = m->nmaster ? (int)roundf(m->w.width * m->mfact) : 0;
|
|
else
|
|
mw = m->w.width;
|
|
+ i = 0;
|
|
+ wl_list_for_each(c, &clients, link){
|
|
+ if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
|
|
+ continue;
|
|
+ if (i < m->nmaster)
|
|
+ mweight += c->cweight;
|
|
+ else
|
|
+ tweight += c->cweight;
|
|
+ i++;
|
|
+ }
|
|
i = my = ty = 0;
|
|
wl_list_for_each(c, &clients, link) {
|
|
if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
|
|
continue;
|
|
if (i < m->nmaster) {
|
|
resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw,
|
|
- .height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0);
|
|
+ .height = (int) ((c->cweight / mweight) * m->w.height)}, 0);
|
|
my += c->geom.height;
|
|
} else {
|
|
resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y + ty,
|
|
- .width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0);
|
|
+ .width = m->w.width - mw, .height = (int) ((c->cweight / tweight) * m->w.height) }, 0);
|
|
ty += c->geom.height;
|
|
}
|
|
i++;
|
|
@@ -3102,6 +3129,7 @@ createnotifyx11(struct wl_listener *listener, void *data)
|
|
c->surface.xwayland = xsurface;
|
|
c->type = X11;
|
|
c->bw = client_is_unmanaged(c) ? 0 : borderpx;
|
|
+ c->cweight = 1.0;
|
|
|
|
/* Listen to the various events it can emit */
|
|
LISTEN(&xsurface->events.associate, &c->associate, associatex11);
|
|
--
|
|
2.45.2
|
|
|