Add toggle bottom bar
This commit is contained in:
35
dwm.c
35
dwm.c
@@ -125,6 +125,7 @@ struct Monitor {
|
||||
unsigned int sellt;
|
||||
unsigned int tagset[2];
|
||||
int showbar;
|
||||
int showextrabar;
|
||||
int topbar;
|
||||
Client *clients;
|
||||
Client *sel;
|
||||
@@ -211,6 +212,7 @@ static void showhide(Client *c);
|
||||
static void spawn(const Arg *arg);
|
||||
static void tag(const Arg *arg);
|
||||
static void togglebar(const Arg *arg);
|
||||
static void toggleextrabar(const Arg *arg);
|
||||
static void togglefloating(const Arg *arg);
|
||||
static void togglefullscr(const Arg *arg);
|
||||
static void toggletag(const Arg *arg);
|
||||
@@ -655,6 +657,7 @@ createmon(void)
|
||||
m->mfact = mfact;
|
||||
m->nmaster = nmaster;
|
||||
m->showbar = showbar;
|
||||
m->showextrabar = showextrabar;
|
||||
m->topbar = topbar;
|
||||
m->lt[0] = &layouts[0];
|
||||
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
||||
@@ -831,7 +834,7 @@ drawbar(Monitor *m)
|
||||
unsigned int i, occ = 0, urg = 0;
|
||||
Client *c;
|
||||
|
||||
if (!m->showbar)
|
||||
if (!m->showbar && !m->showextrabar)
|
||||
return;
|
||||
|
||||
/* draw status first so it can be overdrawn by tags later */
|
||||
@@ -1826,6 +1829,14 @@ togglebar(const Arg *arg)
|
||||
selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar;
|
||||
updatebarpos(selmon);
|
||||
XMoveResizeWindow(dpy, selmon->barwin, selmon->wx + gappx, selmon->by + gappx, selmon->ww - 2 * gappx, bh);
|
||||
arrange(selmon);
|
||||
}
|
||||
|
||||
void
|
||||
toggleextrabar(const Arg *arg)
|
||||
{
|
||||
selmon->showextrabar = !selmon->showextrabar;
|
||||
updatebarpos(selmon);
|
||||
XMoveResizeWindow(dpy, selmon->extrabarwin, selmon->wx + gappx, selmon->eby - gappx, selmon->ww - 2 * gappx, bh);
|
||||
arrange(selmon);
|
||||
}
|
||||
@@ -1998,17 +2009,23 @@ updatebarpos(Monitor *m)
|
||||
{
|
||||
m->wy = m->my;
|
||||
m->wh = m->mh;
|
||||
m->wh -= bh * m->showbar * 2;
|
||||
m->wy = m->showbar ? m->wy + bh + gappx : m->wy;
|
||||
|
||||
if (m->showbar) {
|
||||
m->by = m->topbar ? m->wy - bh - gappx : m->wy + m->wh + gappx;
|
||||
m->eby = m->topbar ? m->wy + m->wh - gappx : m->wy - bh - gappx * 2;
|
||||
m->wy = topbar ? m->wy : m->wy - gappx * 2;
|
||||
m->wh = topbar ? m->wh - gappx * 2 : m->wh + gappx * 2;
|
||||
} else {
|
||||
m->by = -bh - gappx;
|
||||
m->eby = -bh + gappx;
|
||||
m->wh -= bh * m->showbar;
|
||||
m->by = m->wy - bh - gappx;
|
||||
m->wh = m->wh - gappx;
|
||||
}
|
||||
else
|
||||
m->by = -bh - gappx;
|
||||
|
||||
if (m->showextrabar) {
|
||||
m->wh -= bh * m->showextrabar;
|
||||
m->eby = m->wy + m->wh;
|
||||
m->wh = m->wh - gappx;
|
||||
}
|
||||
else
|
||||
m->eby = -bh + gappx;
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
Reference in New Issue
Block a user