From 03d28aa9639b1f2378b8182f1b95e26dd6301b7b Mon Sep 17 00:00:00 2001 From: pgrondek Date: Fri, 29 May 2020 12:20:24 +0200 Subject: [PATCH] Revert "Add columns layout" This reverts commit acdf610fdaae800344a45d4534edf3bda450b58f. --- config.def.h | 2 -- config.h | 3 +-- dwm.c | 27 --------------------------- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/config.def.h b/config.def.h index 9081711..92ba526 100644 --- a/config.def.h +++ b/config.def.h @@ -46,7 +46,6 @@ static const Layout layouts[] = { { "[]=", tile }, /* first entry is default */ { "><>", NULL }, /* no layout function means floating behavior */ { "[M]", monocle }, - { "|||", col }, }; /* key definitions */ @@ -82,7 +81,6 @@ 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_c, setlayout, {.v = &layouts[3]} }, { MODKEY, XK_space, setlayout, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, diff --git a/config.h b/config.h index 95150e8..b8e52d1 100644 --- a/config.h +++ b/config.h @@ -43,8 +43,7 @@ static const int resizehints = 1; /* 1 means respect size hints in tiled resi static const Layout layouts[] = { /* symbol arrange function */ { "[]=", tile }, /* first entry is default */ - { "|||", col }, - { "><>", NULL }, /* no layout function means floating behavior */ + { "><>", NULL }, /* no layout function means floating behavior */ { "[M]", monocle }, }; diff --git a/dwm.c b/dwm.c index 47f7bfb..bd57288 100644 --- a/dwm.c +++ b/dwm.c @@ -180,7 +180,6 @@ static void checkotherwm(void); static void cleanup(void); static void cleanupmon(Monitor *mon); static void clientmessage(XEvent *e); -static void col(Monitor *); static void configure(Client *c); static void configurenotify(XEvent *e); static void configurerequest(XEvent *e); @@ -1922,32 +1921,6 @@ tile(Monitor *m) } } -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); - } - } -} - void togglebar(const Arg *arg) {