|
|
|
@ -169,7 +169,6 @@ static void focus(Client *c);
|
|
|
|
static void focusin(XEvent *e);
|
|
|
|
static void focusin(XEvent *e);
|
|
|
|
static void focusmon(const Arg *arg);
|
|
|
|
static void focusmon(const Arg *arg);
|
|
|
|
static void focusstack(const Arg *arg);
|
|
|
|
static void focusstack(const Arg *arg);
|
|
|
|
static Atom getatomprop(Client *c, Atom prop);
|
|
|
|
|
|
|
|
static int getrootptr(int *x, int *y);
|
|
|
|
static int getrootptr(int *x, int *y);
|
|
|
|
static long getstate(Window w);
|
|
|
|
static long getstate(Window w);
|
|
|
|
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
|
|
|
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
|
|
|
@ -440,7 +439,7 @@ buttonpress(XEvent *e)
|
|
|
|
arg.ui = 1 << i;
|
|
|
|
arg.ui = 1 << i;
|
|
|
|
} else if (ev->x < x + blw)
|
|
|
|
} else if (ev->x < x + blw)
|
|
|
|
click = ClkLtSymbol;
|
|
|
|
click = ClkLtSymbol;
|
|
|
|
else if (ev->x > selmon->ww - (int)TEXTW(stext))
|
|
|
|
else if (ev->x > selmon->ww - TEXTW(stext))
|
|
|
|
click = ClkStatusText;
|
|
|
|
click = ClkStatusText;
|
|
|
|
else
|
|
|
|
else
|
|
|
|
click = ClkWinTitle;
|
|
|
|
click = ClkWinTitle;
|
|
|
|
@ -696,7 +695,7 @@ dirtomon(int dir)
|
|
|
|
void
|
|
|
|
void
|
|
|
|
drawbar(Monitor *m)
|
|
|
|
drawbar(Monitor *m)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
int x, w, tw = 0;
|
|
|
|
int x, w, sw = 0;
|
|
|
|
int boxs = drw->fonts->h / 9;
|
|
|
|
int boxs = drw->fonts->h / 9;
|
|
|
|
int boxw = drw->fonts->h / 6 + 2;
|
|
|
|
int boxw = drw->fonts->h / 6 + 2;
|
|
|
|
unsigned int i, occ = 0, urg = 0;
|
|
|
|
unsigned int i, occ = 0, urg = 0;
|
|
|
|
@ -705,8 +704,8 @@ drawbar(Monitor *m)
|
|
|
|
/* draw status first so it can be overdrawn by tags later */
|
|
|
|
/* draw status first so it can be overdrawn by tags later */
|
|
|
|
if (m == selmon) { /* status is only drawn on selected monitor */
|
|
|
|
if (m == selmon) { /* status is only drawn on selected monitor */
|
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
|
|
tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
|
|
|
sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
|
|
|
drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
|
|
|
|
drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
for (c = m->clients; c; c = c->next) {
|
|
|
|
for (c = m->clients; c; c = c->next) {
|
|
|
|
@ -729,7 +728,7 @@ drawbar(Monitor *m)
|
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
|
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
|
|
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
|
|
|
|
|
|
|
|
|
|
|
if ((w = m->ww - tw - x) > bh) {
|
|
|
|
if ((w = m->ww - sw - x) > bh) {
|
|
|
|
if (m->sel) {
|
|
|
|
if (m->sel) {
|
|
|
|
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
|
|
|
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
|
|
|
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
|
|
|
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
|
|
|
@ -835,7 +834,7 @@ focusstack(const Arg *arg)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Client *c = NULL, *i;
|
|
|
|
Client *c = NULL, *i;
|
|
|
|
|
|
|
|
|
|
|
|
if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))
|
|
|
|
if (!selmon->sel)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
if (arg->i > 0) {
|
|
|
|
if (arg->i > 0) {
|
|
|
|
for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
|
|
|
|
for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
|
|
|
|
@ -1521,7 +1520,7 @@ setmfact(const Arg *arg)
|
|
|
|
if (!arg || !selmon->lt[selmon->sellt]->arrange)
|
|
|
|
if (!arg || !selmon->lt[selmon->sellt]->arrange)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
|
|
|
|
f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
|
|
|
|
if (f < 0.05 || f > 0.95)
|
|
|
|
if (f < 0.1 || f > 0.9)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
selmon->mfact = f;
|
|
|
|
selmon->mfact = f;
|
|
|
|
arrange(selmon);
|
|
|
|
arrange(selmon);
|
|
|
|
@ -1689,13 +1688,11 @@ tile(Monitor *m)
|
|
|
|
if (i < m->nmaster) {
|
|
|
|
if (i < m->nmaster) {
|
|
|
|
h = (m->wh - my) / (MIN(n, m->nmaster) - i);
|
|
|
|
h = (m->wh - my) / (MIN(n, m->nmaster) - i);
|
|
|
|
resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
|
|
|
|
resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
|
|
|
|
if (my + HEIGHT(c) < m->wh)
|
|
|
|
my += HEIGHT(c);
|
|
|
|
my += HEIGHT(c);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
h = (m->wh - ty) / (n - i);
|
|
|
|
h = (m->wh - ty) / (n - i);
|
|
|
|
resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
|
|
|
|
resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
|
|
|
|
if (ty + HEIGHT(c) < m->wh)
|
|
|
|
ty += HEIGHT(c);
|
|
|
|
ty += HEIGHT(c);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|