You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
180 lines
5.3 KiB
180 lines
5.3 KiB
diff -up a/config.def.h b/config.def.h
|
|
--- a/config.def.h 2019-06-05 02:24:05.503321320 +0200
|
|
+++ b/config.def.h 2019-06-05 10:46:48.099997829 +0200
|
|
@@ -41,6 +41,8 @@ static const Layout layouts[] = {
|
|
{ "[]=", tile }, /* first entry is default */
|
|
{ "><>", NULL }, /* no layout function means floating behavior */
|
|
{ "[M]", monocle },
|
|
+ { "|M|", centeredmaster },
|
|
+ { ">M>", centeredfloatingmaster },
|
|
};
|
|
|
|
/* key definitions */
|
|
@@ -79,6 +81,8 @@ static Key keys[] = {
|
|
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
|
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
|
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
|
+ { MODKEY, XK_u, setlayout, {.v = &layouts[3]} },
|
|
+ { MODKEY, XK_o, setlayout, {.v = &layouts[4]} },
|
|
{ MODKEY, XK_space, setlayout, {0} },
|
|
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
|
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
|
Only in a: config.def.h.orig
|
|
Only in b: dwm-bottomstack-20160719-56a31dc.diff
|
|
diff -up a/dwm.c b/dwm.c
|
|
--- a/dwm.c 2019-06-05 02:25:40.169986187 +0200
|
|
+++ b/dwm.c 2019-06-05 10:48:42.443328992 +0200
|
|
@@ -235,6 +235,8 @@ static int xerror(Display *dpy, XErrorEv
|
|
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
|
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
|
static void zoom(const Arg *arg);
|
|
+static void centeredmaster(Monitor *m);
|
|
+static void centeredfloatingmaster(Monitor *m);
|
|
|
|
/* variables */
|
|
static const char broken[] = "broken";
|
|
@@ -2175,3 +2177,144 @@ main(int argc, char *argv[])
|
|
XCloseDisplay(dpy);
|
|
return EXIT_SUCCESS;
|
|
}
|
|
+
|
|
+void
|
|
+centeredmaster(Monitor *m)
|
|
+{
|
|
+ unsigned int i, n, h, mw, mx, my, oty, ety, tw;
|
|
+ float mfacts = 0, lfacts = 0, rfacts = 0;
|
|
+ Client *c;
|
|
+
|
|
+ /* count number of clients in the selected monitor */
|
|
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) {
|
|
+ if (n < m->nmaster)
|
|
+ mfacts += c->cfact;
|
|
+ else if ((n - m->nmaster) % 2)
|
|
+ lfacts += c->cfact;
|
|
+ else
|
|
+ rfacts += c->cfact;
|
|
+ }
|
|
+ if (n == 0)
|
|
+ return;
|
|
+ if(n == 1){
|
|
+ c = nexttiled(m->clients);
|
|
+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ /* initialize areas */
|
|
+ mw = m->ww;
|
|
+ mx = 0;
|
|
+ my = 0;
|
|
+ tw = mw;
|
|
+
|
|
+ if (n > m->nmaster) {
|
|
+ /* go mfact box in the center if more than nmaster clients */
|
|
+ mw = m->nmaster ? m->ww * m->mfact : 0;
|
|
+ tw = m->ww - mw;
|
|
+
|
|
+ if (n - m->nmaster > 1) {
|
|
+ /* only one client */
|
|
+ mx = (m->ww - mw) / 2;
|
|
+ tw = (m->ww - mw) / 2;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ oty = 0;
|
|
+ ety = 0;
|
|
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
+ if (i < m->nmaster) {
|
|
+ /* nmaster clients are stacked vertically, in the center
|
|
+ * of the screen */
|
|
+ h = (m->wh - my) * (c->cfact / mfacts);
|
|
+ resize(c, m->wx + mx, m->wy + my, mw - 2*c->bw,
|
|
+ h - 2*c->bw, 0);
|
|
+ if(my + HEIGHT(c) < m->mh)
|
|
+ my += HEIGHT(c);
|
|
+ mfacts -= c->cfact;
|
|
+ } else {
|
|
+ /* stack clients are stacked vertically */
|
|
+ if ((i - m->nmaster) % 2) {
|
|
+ h = (m->wh - ety) * (c->cfact / lfacts);
|
|
+ if(m->nmaster == 0)
|
|
+ resize(c, m->wx, m->wy + ety, tw - 2*c->bw,
|
|
+ h - 2*c->bw, 0);
|
|
+ else
|
|
+ resize(c, m->wx, m->wy + ety, tw - 2*c->bw,
|
|
+ h - 2*c->bw, 0);
|
|
+ if(ety + HEIGHT(c) < m->mh)
|
|
+ ety += HEIGHT(c);
|
|
+ lfacts -= c->cfact;
|
|
+ } else {
|
|
+ h = (m->wh - oty) * (c->cfact / rfacts);
|
|
+ resize(c, m->wx + mx + mw, m->wy + oty,
|
|
+ tw - 2*c->bw, h - 2*c->bw, 0);
|
|
+ if(oty + HEIGHT(c) < m->mh)
|
|
+ oty += HEIGHT(c);
|
|
+ rfacts -= c->cfact;
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
+void
|
|
+centeredfloatingmaster(Monitor *m)
|
|
+{
|
|
+ unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx;
|
|
+ float mfacts = 0, sfacts = 0;
|
|
+ Client *c;
|
|
+
|
|
+ /* count number of clients in the selected monitor */
|
|
+ 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;
|
|
+ if(n == 1){
|
|
+ c = nexttiled(m->clients);
|
|
+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ /* initialize nmaster area */
|
|
+ if (n > m->nmaster) {
|
|
+ /* go mfact box in the center if more than nmaster clients */
|
|
+ if (m->ww > m->wh) {
|
|
+ mw = m->nmaster ? m->ww * m->mfact : 0;
|
|
+ mh = m->nmaster ? m->wh * 0.9 : 0;
|
|
+ } else {
|
|
+ mh = m->nmaster ? m->wh * m->mfact : 0;
|
|
+ mw = m->nmaster ? m->ww * 0.9 : 0;
|
|
+ }
|
|
+ mx = mxo = (m->ww - mw) / 2;
|
|
+ my = myo = (m->wh - mh) / 2;
|
|
+ } else {
|
|
+ /* go fullscreen if all clients are in the master area */
|
|
+ mh = m->wh;
|
|
+ mw = m->ww;
|
|
+ mx = mxo = 0;
|
|
+ my = myo = 0;
|
|
+ }
|
|
+
|
|
+ for(i = tx = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
+ if (i < m->nmaster) {
|
|
+ /* nmaster clients are stacked horizontally, in the center
|
|
+ * of the screen */
|
|
+ w = (mw + mxo - mx) * (c->cfact / mfacts);
|
|
+ resize(c, m->wx + mx, m->wy + my, w - 2*c->bw,
|
|
+ mh - 2*c->bw, 0);
|
|
+ if(mx + WIDTH(c) < m->mw)
|
|
+ mx += WIDTH(c);
|
|
+ mfacts -= c->cfact;
|
|
+ } else {
|
|
+ /* stack clients are stacked horizontally */
|
|
+ w = (m->ww - tx) * (c->cfact / sfacts);
|
|
+ resize(c, m->wx + tx, m->wy, w - 2*c->bw,
|
|
+ m->wh - 2*c->bw, 0);
|
|
+ if(tx + WIDTH(c) < m->mw)
|
|
+ tx += WIDTH(c);
|
|
+ sfacts -= c->cfact;
|
|
+ }
|
|
+}
|