|
|
|
@ -178,6 +178,7 @@ static void focus(Client *c); |
|
|
|
|
static void focusin(XEvent *e); |
|
|
|
|
static void focusmon(const Arg *arg); |
|
|
|
|
static void focusstack(const Arg *arg); |
|
|
|
|
static Atom getatomprop(Client *c, Atom prop); |
|
|
|
|
static int getrootptr(int *x, int *y); |
|
|
|
|
static long getstate(Window w); |
|
|
|
|
static int gettextprop(Window w, Atom atom, char *text, unsigned int size); |
|
|
|
@ -520,7 +521,7 @@ buttonpress(XEvent *e) |
|
|
|
|
arg.ui = 1 << i; |
|
|
|
|
} else if (ev->x < x + blw) |
|
|
|
|
click = ClkLtSymbol; |
|
|
|
|
else if (ev->x > selmon->ww - TEXTW(stext)) |
|
|
|
|
else if (ev->x > selmon->ww - (int)TEXTW(stext)) |
|
|
|
|
click = ClkStatusText; |
|
|
|
|
else |
|
|
|
|
click = ClkWinTitle; |
|
|
|
@ -775,7 +776,7 @@ dirtomon(int dir) |
|
|
|
|
void |
|
|
|
|
drawbar(Monitor *m) |
|
|
|
|
{ |
|
|
|
|
int x, w, sw = 0; |
|
|
|
|
int x, w, tw = 0; |
|
|
|
|
int boxs = drw->fonts->h / 9; |
|
|
|
|
int boxw = drw->fonts->h / 6 + 2; |
|
|
|
|
unsigned int i, occ = 0, urg = 0; |
|
|
|
@ -784,8 +785,8 @@ drawbar(Monitor *m) |
|
|
|
|
/* draw status first so it can be overdrawn by tags later */ |
|
|
|
|
if (m == selmon) { /* status is only drawn on selected monitor */ |
|
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]); |
|
|
|
|
sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ |
|
|
|
|
drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0); |
|
|
|
|
tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ |
|
|
|
|
drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
for (c = m->clients; c; c = c->next) { |
|
|
|
@ -808,7 +809,7 @@ drawbar(Monitor *m) |
|
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]); |
|
|
|
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); |
|
|
|
|
|
|
|
|
|
if ((w = m->ww - sw - x) > bh) { |
|
|
|
|
if ((w = m->ww - tw - x) > bh) { |
|
|
|
|
if (m->sel) { |
|
|
|
|
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); |
|
|
|
|
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); |
|
|
|
@ -1616,7 +1617,7 @@ setmfact(const Arg *arg) |
|
|
|
|
if (!arg || !selmon->lt[selmon->sellt]->arrange) |
|
|
|
|
return; |
|
|
|
|
f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0; |
|
|
|
|
if (f < 0.1 || f > 0.9) |
|
|
|
|
if (f < 0.05 || f > 0.95) |
|
|
|
|
return; |
|
|
|
|
selmon->mfact = f; |
|
|
|
|
arrange(selmon); |
|
|
|
@ -1784,11 +1785,13 @@ tile(Monitor *m) |
|
|
|
|
if (i < m->nmaster) { |
|
|
|
|
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); |
|
|
|
|
my += HEIGHT(c); |
|
|
|
|
if (my + HEIGHT(c) < m->wh) |
|
|
|
|
my += HEIGHT(c); |
|
|
|
|
} else { |
|
|
|
|
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); |
|
|
|
|
ty += HEIGHT(c); |
|
|
|
|
if (ty + HEIGHT(c) < m->wh) |
|
|
|
|
ty += HEIGHT(c); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|