commit 300d37ded6be5e7edf6cafc0d52d4fa07c24ef50
Author: mssx86 <[email protected]>
Date: Tue Feb 18 03:29:48 2020 +0300
[dwm][patch][cfacts] added cfacts patch for 6.2
diff --git a/dwm.suckless.org/patches/cfacts/dwm-cfacts-6.2.diff
b/dwm.suckless.org/patches/cfacts/dwm-cfacts-6.2.diff
new file mode 100644
index 00000000..c55b10ed
--- /dev/null
+++ b/dwm.suckless.org/patches/cfacts/dwm-cfacts-6.2.diff
@@ -0,0 +1,220 @@
+diff -uraN a/config.def.h b/config.def.h
+--- a/config.def.h 2019-02-02 15:55:28.000000000 +0300
++++ b/config.def.h 2020-02-18 01:27:11.199157459 +0300
+@@ -70,6 +70,9 @@
+ { 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 -uraN a/config.h b/config.h
+--- a/config.h 1970-01-01 02:00:00.000000000 +0200
++++ b/config.h 2020-02-18 01:31:17.584440814 +0300
+@@ -0,0 +1,118 @@
++/* See LICENSE file for copyright and license details. */
++
++/* appearance */
++static const unsigned int borderpx = 1; /* border pixel of windows */
++static const unsigned int snap = 32; /* snap pixel */
++static const int showbar = 1; /* 0 means no bar */
++static const int topbar = 1; /* 0 means bottom bar */
++static const char *fonts[] = { "monospace:size=10" };
++static const char dmenufont[] = "monospace:size=10";
++static const char col_gray1[] = "#222222";
++static const char col_gray2[] = "#444444";
++static const char col_gray3[] = "#bbbbbb";
++static const char col_gray4[] = "#eeeeee";
++static const char col_cyan[] = "#005577";
++static const char *colors[][3] = {
++ /* fg bg border */
++ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
++ [SchemeSel] = { col_gray4, col_cyan, col_cyan },
++};
++
++/* tagging */
++static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
++
++static const Rule rules[] = {
++ /* xprop(1):
++ * WM_CLASS(STRING) = instance, class
++ * WM_NAME(STRING) = title
++ */
++ /* class instance title tags mask isfloating
monitor */
++ { "Gimp", NULL, NULL, 0, 1, -1 },
++ { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
++};
++
++/* layout(s) */
++static const float mfact = 0.55; /* factor of master area size
[0.05..0.95] */
++static const int nmaster = 1; /* number of clients in master area */
++static const int resizehints = 1; /* 1 means respect size hints in tiled
resizals */
++
++static const Layout layouts[] = {
++ /* symbol arrange function */
++ { "[]=", tile }, /* first entry is default */
++ { "><>", NULL }, /* no layout function means floating behavior
*/
++ { "[M]", monocle },
++};
++
++/* key definitions */
++#define MODKEY Mod1Mask
++#define TAGKEYS(KEY,TAG) \
++ { MODKEY, KEY, view, {.ui = 1 <<
TAG} }, \
++ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 <<
TAG} }, \
++ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 <<
TAG} }, \
++ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 <<
TAG} },
++
++/* helper for spawning shell commands in the pre dwm-5.0 fashion */
++#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
++
++/* commands */
++static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in
spawn() */
++static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn",
dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf",
col_gray4, NULL };
++static const char *termcmd[] = { "st", NULL };
++
++static Key keys[] = {
++ /* modifier key function argument */
++ { MODKEY, XK_p, spawn, {.v =
dmenucmd } },
++ { MODKEY|ShiftMask, XK_Return, spawn, {.v =
termcmd } },
++ { MODKEY, XK_b, togglebar, {0} },
++ { MODKEY, XK_j, focusstack, {.i = +1 } },
++ { MODKEY, XK_k, focusstack, {.i = -1 } },
++ { MODKEY, XK_i, incnmaster, {.i = +1 } },
++ { 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} },
++ { MODKEY, XK_t, setlayout, {.v =
&layouts[0]} },
++ { MODKEY, XK_f, setlayout, {.v =
&layouts[1]} },
++ { MODKEY, XK_m, setlayout, {.v =
&layouts[2]} },
++ { MODKEY, XK_space, setlayout, {0} },
++ { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
++ { MODKEY, XK_0, view, {.ui = ~0 }
},
++ { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 }
},
++ { MODKEY, XK_comma, focusmon, {.i = -1 } },
++ { MODKEY, XK_period, focusmon, {.i = +1 } },
++ { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
++ { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
++ TAGKEYS( XK_1, 0)
++ TAGKEYS( XK_2, 1)
++ TAGKEYS( XK_3, 2)
++ TAGKEYS( XK_4, 3)
++ TAGKEYS( XK_5, 4)
++ TAGKEYS( XK_6, 5)
++ TAGKEYS( XK_7, 6)
++ TAGKEYS( XK_8, 7)
++ TAGKEYS( XK_9, 8)
++ { MODKEY|ShiftMask, XK_q, quit, {0} },
++};
++
++/* button definitions */
++/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
ClkClientWin, or ClkRootWin */
++static Button buttons[] = {
++ /* click event mask button function
argument */
++ { ClkLtSymbol, 0, Button1, setlayout,
{0} },
++ { ClkLtSymbol, 0, Button3, setlayout,
{.v = &layouts[2]} },
++ { ClkWinTitle, 0, Button2, zoom,
{0} },
++ { ClkStatusText, 0, Button2, spawn,
{.v = termcmd } },
++ { ClkClientWin, MODKEY, Button1, movemouse,
{0} },
++ { ClkClientWin, MODKEY, Button2, togglefloating,
{0} },
++ { ClkClientWin, MODKEY, Button3, resizemouse,
{0} },
++ { ClkTagBar, 0, Button1, view,
{0} },
++ { ClkTagBar, 0, Button3, toggleview,
{0} },
++ { ClkTagBar, MODKEY, Button1, tag,
{0} },
++ { ClkTagBar, MODKEY, Button3, toggletag,
{0} },
++};
++
+diff -uraN a/dwm.c b/dwm.c
+--- a/dwm.c 2019-02-02 15:55:28.000000000 +0300
++++ b/dwm.c 2020-02-18 01:31:15.612430542 +0300
+@@ -87,6 +87,7 @@
+ 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;
+@@ -200,6 +201,7 @@
+ 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);
+@@ -1029,6 +1031,7 @@
+ 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))) {
+@@ -1511,6 +1514,23 @@
+ 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)
+@@ -1674,9 +1694,15 @@
+ 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;
+
+@@ -1686,13 +1712,15 @@
+ 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);
+ my += HEIGHT(c);
++ mfacts -= c->cfact;
+ } else {
+ h = (m->wh - ty) / (n - i);
+ resize(c, m->wx + mw, m->wy + ty, m->ww - mw -
(2*c->bw), h - (2*c->bw), 0);
+ ty += HEIGHT(c);
++ sfacts -= c->cfact;
+ }
+ }
+
diff --git a/dwm.suckless.org/patches/cfacts/index.md
b/dwm.suckless.org/patches/cfacts/index.md
index 6dd01adc..bc0954e3 100644
--- a/dwm.suckless.org/patches/cfacts/index.md
+++ b/dwm.suckless.org/patches/cfacts/index.md
@@ -43,6 +43,7 @@ Default key bindings
Download
--------
* [dwm-cfacts-6.1.diff](dwm-cfacts-6.1.diff)
+* [dwm-cfacts-6.2.diff](dwm-cfacts-6.2.diff)
Additional layouts with cfact support
-------------------------------------
@@ -55,3 +56,4 @@ Author
------
* Patrick Steinhardt (pks) <[email protected]>
* Aaron Duxler <[email protected]> - Additional layouts bottomstack +
centeredmaster
+* mss <[email protected]> - dwm-6.2 port.
