mirror of https://github.com/bakkeby/patches
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
273 lines
7.6 KiB
Diff
273 lines
7.6 KiB
Diff
From 112abfec73e12282e4b0288f2e7739000ad135b6 Mon Sep 17 00:00:00 2001
|
|
From: Bakkeby <bakkeby@gmail.com>
|
|
Date: Mon, 10 Jan 2022 11:21:06 +0100
|
|
Subject: [PATCH 1/2] Adding cfacts patch which provides the ability to assign
|
|
different weights to clients in their respective stack in tiled layout.
|
|
|
|
Refer to https://dwm.suckless.org/patches/cfacts/
|
|
---
|
|
config.def.h | 3 +++
|
|
dwm.c | 35 ++++++++++++++++++++++++++++++++---
|
|
2 files changed, 35 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/config.def.h b/config.def.h
|
|
index a2ac963..5b0cfde 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -71,6 +71,9 @@ static Key keys[] = {
|
|
{ MODKEY, XK_d, incnmaster, {.i = -1 } },
|
|
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
|
|
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
|
|
+ { MODKEY|ShiftMask, XK_h, setcfact, {.f = +0.25} },
|
|
+ { MODKEY|ShiftMask, XK_l, setcfact, {.f = -0.25} },
|
|
+ { MODKEY|ShiftMask, XK_o, setcfact, {.f = 0.00} },
|
|
{ MODKEY, XK_Return, zoom, {0} },
|
|
{ MODKEY, XK_Tab, view, {0} },
|
|
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
|
|
diff --git a/dwm.c b/dwm.c
|
|
index a96f33c..bcb155d 100644
|
|
--- a/dwm.c
|
|
+++ b/dwm.c
|
|
@@ -87,6 +87,7 @@ typedef struct Client Client;
|
|
struct Client {
|
|
char name[256];
|
|
float mina, maxa;
|
|
+ float cfact;
|
|
int x, y, w, h;
|
|
int oldx, oldy, oldw, oldh;
|
|
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
|
|
@@ -201,6 +202,7 @@ static void setclientstate(Client *c, long state);
|
|
static void setfocus(Client *c);
|
|
static void setfullscreen(Client *c, int fullscreen);
|
|
static void setlayout(const Arg *arg);
|
|
+static void setcfact(const Arg *arg);
|
|
static void setmfact(const Arg *arg);
|
|
static void setup(void);
|
|
static void seturgent(Client *c, int urg);
|
|
@@ -1033,6 +1035,7 @@ manage(Window w, XWindowAttributes *wa)
|
|
c->w = c->oldw = wa->width;
|
|
c->h = c->oldh = wa->height;
|
|
c->oldbw = wa->border_width;
|
|
+ c->cfact = 1.0;
|
|
|
|
updatetitle(c);
|
|
if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
|
|
@@ -1515,6 +1518,24 @@ setlayout(const Arg *arg)
|
|
drawbar(selmon);
|
|
}
|
|
|
|
+void
|
|
+setcfact(const Arg *arg) {
|
|
+ float f;
|
|
+ Client *c;
|
|
+
|
|
+ c = selmon->sel;
|
|
+
|
|
+ if(!arg || !c || !selmon->lt[selmon->sellt]->arrange)
|
|
+ return;
|
|
+ f = arg->f + c->cfact;
|
|
+ if(arg->f == 0.0)
|
|
+ f = 1.0;
|
|
+ else if(f < 0.25 || f > 4.0)
|
|
+ return;
|
|
+ c->cfact = f;
|
|
+ arrange(selmon);
|
|
+}
|
|
+
|
|
/* arg > 1.0 will set mfact absolutely */
|
|
void
|
|
setmfact(const Arg *arg)
|
|
@@ -1678,9 +1699,15 @@ void
|
|
tile(Monitor *m)
|
|
{
|
|
unsigned int i, n, h, mw, my, ty;
|
|
+ float mfacts = 0, sfacts = 0;
|
|
Client *c;
|
|
|
|
- for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) {
|
|
+ if (n < m->nmaster)
|
|
+ mfacts += c->cfact;
|
|
+ else
|
|
+ sfacts += c->cfact;
|
|
+ }
|
|
if (n == 0)
|
|
return;
|
|
|
|
@@ -1690,15 +1717,17 @@ tile(Monitor *m)
|
|
mw = m->ww;
|
|
for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
if (i < m->nmaster) {
|
|
- h = (m->wh - my) / (MIN(n, m->nmaster) - i);
|
|
+ h = (m->wh - my) * (c->cfact / mfacts);
|
|
resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
|
|
if (my + HEIGHT(c) < m->wh)
|
|
my += HEIGHT(c);
|
|
+ mfacts -= c->cfact;
|
|
} else {
|
|
- h = (m->wh - ty) / (n - i);
|
|
+ h = (m->wh - ty) * (c->cfact / sfacts);
|
|
resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
|
|
if (ty + HEIGHT(c) < m->wh)
|
|
ty += HEIGHT(c);
|
|
+ sfacts -= c->cfact;
|
|
}
|
|
}
|
|
|
|
--
|
|
2.19.1
|
|
|
|
|
|
From 39647ff8b155bdff072e32d04ca4e1c5e27873d5 Mon Sep 17 00:00:00 2001
|
|
From: Bakkeby <bakkeby@gmail.com>
|
|
Date: Mon, 10 Jan 2022 11:22:21 +0100
|
|
Subject: [PATCH 2/2] The dragcfact patch allow you resize clients' size (i.e.
|
|
modify cfact) by holding modkey + shift + right-click and dragging the mouse.
|
|
|
|
---
|
|
config.def.h | 1 +
|
|
dwm.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++----
|
|
2 files changed, 89 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/config.def.h b/config.def.h
|
|
index 5b0cfde..595cf43 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -111,6 +111,7 @@ static Button buttons[] = {
|
|
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
|
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
|
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
|
+ { ClkClientWin, MODKEY|ShiftMask, Button3, dragcfact, {0} },
|
|
{ ClkTagBar, 0, Button1, view, {0} },
|
|
{ ClkTagBar, 0, Button3, toggleview, {0} },
|
|
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
|
diff --git a/dwm.c b/dwm.c
|
|
index bcb155d..54f7320 100644
|
|
--- a/dwm.c
|
|
+++ b/dwm.c
|
|
@@ -162,6 +162,7 @@ static void destroynotify(XEvent *e);
|
|
static void detach(Client *c);
|
|
static void detachstack(Client *c);
|
|
static Monitor *dirtomon(int dir);
|
|
+static void dragcfact(const Arg *arg);
|
|
static void drawbar(Monitor *m);
|
|
static void drawbars(void);
|
|
static void enternotify(XEvent *e);
|
|
@@ -695,6 +696,81 @@ dirtomon(int dir)
|
|
return m;
|
|
}
|
|
|
|
+void
|
|
+dragcfact(const Arg *arg)
|
|
+{
|
|
+ int prev_x, prev_y, dist_x, dist_y;
|
|
+ float fact;
|
|
+ Client *c;
|
|
+ XEvent ev;
|
|
+ Time lasttime = 0;
|
|
+
|
|
+ if (!(c = selmon->sel))
|
|
+ return;
|
|
+ if (c->isfloating) {
|
|
+ resizemouse(arg);
|
|
+ return;
|
|
+ }
|
|
+ #if !FAKEFULLSCREEN_PATCH
|
|
+ #if FAKEFULLSCREEN_CLIENT_PATCH
|
|
+ if (c->isfullscreen && !c->fakefullscreen) /* no support resizing fullscreen windows by mouse */
|
|
+ return;
|
|
+ #else
|
|
+ if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
|
|
+ return;
|
|
+ #endif // FAKEFULLSCREEN_CLIENT_PATCH
|
|
+ #endif // !FAKEFULLSCREEN_PATCH
|
|
+ restack(selmon);
|
|
+
|
|
+ if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
|
|
+ None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
|
|
+ return;
|
|
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w/2, c->h/2);
|
|
+
|
|
+ prev_x = prev_y = -999999;
|
|
+
|
|
+ do {
|
|
+ XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
|
|
+ switch(ev.type) {
|
|
+ case ConfigureRequest:
|
|
+ case Expose:
|
|
+ case MapRequest:
|
|
+ handler[ev.type](&ev);
|
|
+ break;
|
|
+ case MotionNotify:
|
|
+ if ((ev.xmotion.time - lasttime) <= (1000 / 60))
|
|
+ continue;
|
|
+ lasttime = ev.xmotion.time;
|
|
+ if (prev_x == -999999) {
|
|
+ prev_x = ev.xmotion.x_root;
|
|
+ prev_y = ev.xmotion.y_root;
|
|
+ }
|
|
+
|
|
+ dist_x = ev.xmotion.x - prev_x;
|
|
+ dist_y = ev.xmotion.y - prev_y;
|
|
+
|
|
+ if (abs(dist_x) > abs(dist_y)) {
|
|
+ fact = (float) 4.0 * dist_x / c->mon->ww;
|
|
+ } else {
|
|
+ fact = (float) -4.0 * dist_y / c->mon->wh;
|
|
+ }
|
|
+
|
|
+ if (fact)
|
|
+ setcfact(&((Arg) { .f = fact }));
|
|
+
|
|
+ prev_x = ev.xmotion.x;
|
|
+ prev_y = ev.xmotion.y;
|
|
+ break;
|
|
+ }
|
|
+ } while (ev.type != ButtonRelease);
|
|
+
|
|
+
|
|
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w/2, c->h/2);
|
|
+
|
|
+ XUngrabPointer(dpy, CurrentTime);
|
|
+ while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
|
+}
|
|
+
|
|
void
|
|
drawbar(Monitor *m)
|
|
{
|
|
@@ -1519,19 +1595,25 @@ setlayout(const Arg *arg)
|
|
}
|
|
|
|
void
|
|
-setcfact(const Arg *arg) {
|
|
+setcfact(const Arg *arg)
|
|
+{
|
|
float f;
|
|
Client *c;
|
|
|
|
c = selmon->sel;
|
|
|
|
- if(!arg || !c || !selmon->lt[selmon->sellt]->arrange)
|
|
+ if (!arg || !c || !selmon->lt[selmon->sellt]->arrange)
|
|
return;
|
|
- f = arg->f + c->cfact;
|
|
- if(arg->f == 0.0)
|
|
+ if (!arg->f)
|
|
f = 1.0;
|
|
- else if(f < 0.25 || f > 4.0)
|
|
- return;
|
|
+ else if (arg->f > 4.0) // set fact absolutely
|
|
+ f = arg->f - 4.0;
|
|
+ else
|
|
+ f = arg->f + c->cfact;
|
|
+ if (f < 0.25)
|
|
+ f = 0.25;
|
|
+ else if (f > 4.0)
|
|
+ f = 4.0;
|
|
c->cfact = f;
|
|
arrange(selmon);
|
|
}
|
|
--
|
|
2.19.1
|
|
|