From b32fe221b6b65835753743cd12a3d2877ba85c74 Mon Sep 17 00:00:00 2001 From: bakkeby Date: Tue, 8 Oct 2019 22:57:21 +0200 Subject: [PATCH] Adding columns layout --- README.md | 7 ++- config.def.h | 11 +++- patch/columns.c | 137 +++++++++++++++++++++++++++++++++++++++++++++ patch/columns.h | 1 + patch/include.c | 4 ++ patch/include.h | 4 ++ patch/vanitygaps.c | 2 +- patch/vanitygaps.h | 2 +- patches.h | 6 ++ 9 files changed, 170 insertions(+), 4 deletions(-) create mode 100644 patch/columns.c create mode 100644 patch/columns.h diff --git a/README.md b/README.md index 2227422..82b0518 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t ### Changelog: +2019-10-08 - Added columns layout + 2019-10-07 - Added sortscreens and dwmc patches, fixed minor cross-compatibility issues for combo, holdbar, leftlayout, hidevacanttags, taggrid and activetagindicatorbar 2019-10-06 - Added statuscolors and statusallmons patches, fixed minor cross-compatibility issues for killunsel, fullscreen, noborder, tagintostack patches @@ -291,8 +293,11 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t - [centeredfloatingmaster](https://dwm.suckless.org/patches/centeredmaster/) - centeredfloatingmaster layout + - [columns](https://dwm.suckless.org/patches/columns/) + - same as the default tile layout except clients in the master area are arranged in columns (i.e. left to right) + - [deck](https://dwm.suckless.org/patches/deck/) - - deck layout + - deck layout - clients in the stack area are arranged on top of each other (like monocle) - [fibonacci](https://dwm.suckless.org/patches/fibonacci/) - fibonacci (dwindle and spiral) layouts diff --git a/config.def.h b/config.def.h index b6323a4..41c23d5 100644 --- a/config.def.h +++ b/config.def.h @@ -258,6 +258,7 @@ static const Layout layouts[] = { { "[]=", flextile, { -1, -1, SPLIT_VERTICAL, TOP_TO_BOTTOM, TOP_TO_BOTTOM, 0, NULL } }, // default tile layout { "><>", NULL, {0} }, /* no layout function means floating behavior */ { "[M]", flextile, { -1, -1, NO_SPLIT, MONOCLE, 0, 0, NULL } }, // monocle + { "|||", flextile, { -1, -1, SPLIT_VERTICAL, LEFT_TO_RIGHT, TOP_TO_BOTTOM, 0, NULL } }, // columns (col) layout { ">M>", flextile, { -1, -1, FLOATING_MASTER, LEFT_TO_RIGHT, LEFT_TO_RIGHT, 0, NULL } }, // floating master { "[D]", flextile, { -1, -1, SPLIT_VERTICAL, TOP_TO_BOTTOM, MONOCLE, 0, NULL } }, // deck { "TTT", flextile, { -1, -1, SPLIT_HORIZONTAL, LEFT_TO_RIGHT, LEFT_TO_RIGHT, 0, NULL } }, // bstack @@ -266,7 +267,6 @@ static const Layout layouts[] = { { ":::", flextile, { -1, -1, NO_SPLIT, GAPPLESSGRID, 0, 0, NULL } }, // gappless grid { "[\\]", flextile, { -1, -1, NO_SPLIT, DWINDLE, 0, 0, NULL } }, // fibonacci dwindle { "(@)", flextile, { -1, -1, NO_SPLIT, SPIRAL, 0, 0, NULL } }, // fibonacci spiral - { "|||", flextile, { -1, -1, SPLIT_VERTICAL, LEFT_TO_RIGHT, TOP_TO_BOTTOM, 0, NULL } }, // columns (col) layout #if TILE_LAYOUT { "[]=", tile, {0} }, #endif @@ -285,6 +285,9 @@ static const Layout layouts[] = { #if CENTEREDFLOATINGMASTER_LAYOUT { ">M>", centeredfloatingmaster, {0} }, #endif + #if COLUMNS_LAYOUT + { "|||", col, {0} }, + #endif #if DECK_LAYOUT { "[D]", deck, {0} }, #endif @@ -332,6 +335,9 @@ static const Layout layouts[] = { #if CENTEREDFLOATINGMASTER_LAYOUT { ">M>", centeredfloatingmaster }, #endif + #if COLUMNS_LAYOUT + { "|||", col }, + #endif #if DECK_LAYOUT { "[D]", deck }, #endif @@ -471,6 +477,9 @@ static Key keys[] = { { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, + #if COLUMNS_LAYOUT + { MODKEY, XK_c, setlayout, {.v = &layouts[3]} }, + #endif // COLUMNS_LAYOUT #if FLEXTILE_DELUXE_LAYOUT { MODKEY|ControlMask, XK_t, rotatelayoutaxis, {.i = 0 } }, /* flextile, 0 = layout axis */ { MODKEY|ControlMask, XK_Tab, rotatelayoutaxis, {.i = 1 } }, /* flextile, 1 = master axis */ diff --git a/patch/columns.c b/patch/columns.c new file mode 100644 index 0000000..07fd39f --- /dev/null +++ b/patch/columns.c @@ -0,0 +1,137 @@ +#if VANITYGAPS_PATCH && CFACTS_PATCH +static void +col(Monitor *m) +{ + unsigned int i, n; + int mx = 0, my = 0, mh = 0, mw = 0; + int sx = 0, sy = 0, sh = 0, sw = 0; + int oh, ov, ih, iv; + float mfacts, sfacts; + Client *c; + + getgaps(m, &oh, &ov, &ih, &iv, &n); + getfacts(m, &mfacts, &sfacts); + + if (n == 0) + return; + + sx = mx = m->wx + ov; + sy = my = m->wy + oh; + sh = mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1); + sw = mw = m->ww - 2*ov; + + if (m->nmaster && n > m->nmaster) { + sw = (mw - iv) * (1 - m->mfact); + mw = (mw - iv) * m->mfact; + sx = mx + mw + iv; + sh = m->wh - 2*oh - ih * (n - m->nmaster - 1); + } + + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + if (i < m->nmaster) { + resize(c, mx, my, mw * (c->cfact / mfacts) - (2*c->bw), mh - (2*c->bw), 0); + mx += WIDTH(c) + iv; + } else { + resize(c, sx, sy, sw - (2*c->bw), sh * (c->cfact / sfacts) - (2*c->bw), 0); + sy += HEIGHT(c) + ih; + } +} +#elif VANITYGAPS_PATCH +static void +col(Monitor *m) +{ + unsigned int i, n; + int mx = 0, my = 0, mh = 0, mw = 0; + int sx = 0, sy = 0, sh = 0, sw = 0; + int oh, ov, ih, iv; + Client *c; + + getgaps(m, &oh, &ov, &ih, &iv, &n); + + if (n == 0) + return; + + sx = mx = m->wx + ov; + sy = my = m->wy + oh; + sh = mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1); + sw = mw = m->ww - 2*ov; + + if (m->nmaster && n > m->nmaster) { + sw = (mw - iv) * (1 - m->mfact); + mw = (mw - iv) * m->mfact; + sx = mx + mw + iv; + sh = m->wh - 2*oh - ih * (n - m->nmaster - 1); + } + + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + if (i < m->nmaster) { + resize(c, mx, my, mw / MIN(n, m->nmaster) - (2*c->bw), mh - (2*c->bw), 0); + mx += WIDTH(c) + iv; + } else { + resize(c, sx, sy, sw - (2*c->bw), sh / (n - MIN(n, m->nmaster)) - (2*c->bw), 0); + sy += HEIGHT(c) + ih; + } +} +#elif CFACTS_PATCH +static void +col(Monitor *m) +{ + unsigned int i, n; + int mx = 0, my = 0, mh = 0, mw = 0; + int sx = 0, sy = 0, sh = 0, sw = 0; + float mfacts, sfacts; + Client *c; + + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); + if (n == 0) + return; + + getfacts(m, &mfacts, &sfacts); + + sx = mx = m->wx; + sy = my = m->wy; + sh = mh = m->wh; + sw = mw = m->ww; + + if (m->nmaster && n > m->nmaster) { + sw = mw * (1 - m->mfact); + mw = mw * m->mfact; + sx = mx + mw; + } + + for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + if (i < m->nmaster) { + resize(c, mx, my, mw * (c->cfact / mfacts) - (2*c->bw), mh - (2*c->bw), 0); + mx += WIDTH(c); + } else { + resize(c, sx, sy, sw - (2*c->bw), sh * (c->cfact / sfacts) - (2*c->bw), 0); + sy += HEIGHT(c); + } +} +#else +void +col(Monitor *m) { + unsigned int i, n, h, w, x, y,mw; + Client *c; + + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); + if (n == 0) + return; + if (n > m->nmaster) + mw = m->nmaster ? m->ww * m->mfact : 0; + else + mw = m->ww; + for (i = x = y = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { + if (i < m->nmaster) { + w = (mw - x) / (MIN(n, m->nmaster)-i); + resize(c, x + m->wx, m->wy, w - (2*c->bw), m->wh - (2*c->bw), False); + x += WIDTH(c); + } + else { + h = (m->wh - y) / (n - i); + resize(c, x + m->wx, m->wy + y, m->ww - x - (2*c->bw), h - (2*c->bw), False); + y += HEIGHT(c); + } + } +} +#endif \ No newline at end of file diff --git a/patch/columns.h b/patch/columns.h new file mode 100644 index 0000000..8f64a09 --- /dev/null +++ b/patch/columns.h @@ -0,0 +1 @@ +static void col(Monitor *); \ No newline at end of file diff --git a/patch/include.c b/patch/include.c index 27eb415..d881deb 100644 --- a/patch/include.c +++ b/patch/include.c @@ -178,6 +178,10 @@ #include "centeredfloatingmaster.c" #endif +#if COLUMNS_LAYOUT +#include "columns.c" +#endif + #if DECK_LAYOUT #include "deck.c" #endif diff --git a/patch/include.h b/patch/include.h index 9d77d76..65feac9 100644 --- a/patch/include.h +++ b/patch/include.h @@ -178,6 +178,10 @@ #include "centeredfloatingmaster.h" #endif +#if COLUMNS_LAYOUT +#include "columns.h" +#endif + #if DECK_LAYOUT #include "deck.h" #endif diff --git a/patch/vanitygaps.c b/patch/vanitygaps.c index 9b50c15..460f4a7 100644 --- a/patch/vanitygaps.c +++ b/patch/vanitygaps.c @@ -106,7 +106,7 @@ incrivgaps(const Arg *arg) ); } -#if CENTEREDFLOATINGMASTER_LAYOUT || DECK_LAYOUT || FIBONACCI_DWINDLE_LAYOUT || FIBONACCI_SPIRAL_LAYOUT || GAPPLESSGRID_LAYOUT || HORIZGRID_LAYOUT || BSTACK_LAYOUT || BSTACKHORIZ_LAYOUT || GRIDMODE_LAYOUT || FLEXTILE_DELUXE_LAYOUT +#if CENTEREDFLOATINGMASTER_LAYOUT || COLUMNS_LAYOUT || DECK_LAYOUT || FIBONACCI_DWINDLE_LAYOUT || FIBONACCI_SPIRAL_LAYOUT || GAPPLESSGRID_LAYOUT || HORIZGRID_LAYOUT || BSTACK_LAYOUT || BSTACKHORIZ_LAYOUT || GRIDMODE_LAYOUT || FLEXTILE_DELUXE_LAYOUT static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc) { diff --git a/patch/vanitygaps.h b/patch/vanitygaps.h index 861cba6..f86fa75 100644 --- a/patch/vanitygaps.h +++ b/patch/vanitygaps.h @@ -10,7 +10,7 @@ static void incrivgaps(const Arg *arg); static void togglegaps(const Arg *arg); /* Internals */ -#if CENTEREDFLOATINGMASTER_LAYOUT || DECK_LAYOUT || FIBONACCI_DWINDLE_LAYOUT || FIBONACCI_SPIRAL_LAYOUT || GAPPLESSGRID_LAYOUT || HORIZGRID_LAYOUT || BSTACK_LAYOUT || BSTACKHORIZ_LAYOUT || GRIDMODE_LAYOUT || FLEXTILE_DELUXE_LAYOUT +#if CENTEREDFLOATINGMASTER_LAYOUT || COLUMNS_LAYOUT || DECK_LAYOUT || FIBONACCI_DWINDLE_LAYOUT || FIBONACCI_SPIRAL_LAYOUT || GAPPLESSGRID_LAYOUT || HORIZGRID_LAYOUT || BSTACK_LAYOUT || BSTACKHORIZ_LAYOUT || GRIDMODE_LAYOUT || FLEXTILE_DELUXE_LAYOUT static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc); #endif // CENTEREDFLOATINGMASTER_LAYOUT || DECK_LAYOUT || FIBONACCI_DWINDLE_LAYOUT || FIBONACCI_SPIRAL_LAYOUT || GAPPLESSGRID_LAYOUT || HORIZGRID_LAYOUT || BSTACK_LAYOUT || BSTACKHORIZ_LAYOUT || GRIDMODE_LAYOUT || FLEXTILE_DELUXE_LAYOUT static void setgaps(int oh, int ov, int ih, int iv); \ No newline at end of file diff --git a/patches.h b/patches.h index cf523a0..d890245 100644 --- a/patches.h +++ b/patches.h @@ -490,6 +490,12 @@ */ #define CENTEREDFLOATINGMASTER_LAYOUT 0 +/* Same as the default tile layout except clients in the master area are arranged in + * columns (i.e. left to right). + * https://dwm.suckless.org/patches/columns/ + */ +#define COLUMNS_LAYOUT 0 + /* Deck layout. * https://dwm.suckless.org/patches/deck/ */