Revert "Revert "Revert "Add columns layout"""
This reverts commit 2ded22419e
.
This commit is contained in:
parent
f77bcd5337
commit
114e6ce3ce
@ -47,7 +47,6 @@ static const Layout layouts[] = {
|
||||
{ "[]=", tile }, /* first entry is default */
|
||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||
{ "[M]", monocle },
|
||||
{ "|||", col },
|
||||
};
|
||||
|
||||
/* key definitions */
|
||||
@ -83,7 +82,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 } },
|
||||
|
3
config.h
3
config.h
@ -46,8 +46,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 },
|
||||
};
|
||||
|
||||
|
27
dwm.c
27
dwm.c
@ -186,7 +186,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);
|
||||
@ -1985,32 +1984,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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user