diff options
| author | Luke Smith <luke@lukesmith.xyz> | 2020-05-19 09:31:27 -0400 |
|---|---|---|
| committer | Luke Smith <luke@lukesmith.xyz> | 2020-05-19 09:31:27 -0400 |
| commit | 9a7f1c2e2a6e2d92691c67b8c61daeafa175672d (patch) | |
| tree | f726c2dec19b9b5914172174678645bce6789131 /dwm.c | |
| parent | 1c7d57451b42850ff1e81bfdaac5cf52f3ae0d50 (diff) | |
| parent | f09418bbb6651ab4c299cfefbe1d18de401f630e (diff) | |
Merge branch 'master' of git://git.suckless.org/dwm
Diffstat (limited to 'dwm.c')
| -rw-r--r-- | dwm.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -205,6 +205,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 getdwmblockspid(); static int getrootptr(int *x, int *y); static long getstate(Window w); @@ -850,7 +851,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; @@ -859,8 +860,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) { @@ -883,7 +884,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); @@ -1770,7 +1771,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); |