tsome more polishing/consistency changes - dwm - [fork] customized build of dwm… | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit a62630ae9200f36f2ef7df805c22213b54c776c7 | |
parent 62b18fb9d46caa3d59f4a3ac6b6e5609da9f953f | |
Author: anselm@anselm1 <unknown> | |
Date: Sat, 22 Dec 2007 14:40:44 +0000 | |
some more polishing/consistency changes | |
Diffstat: | |
M dwm.c | 79 +++++++++++++++--------------… | |
1 file changed, 39 insertions(+), 40 deletions(-) | |
--- | |
diff --git a/dwm.c b/dwm.c | |
t@@ -198,7 +198,7 @@ void toggleview(const char *arg); | |
void unban(Client *c); | |
void unmanage(Client *c); | |
void unmapnotify(XEvent *e); | |
-void updatebarpos(Monitor *s); | |
+void updatebarpos(Monitor *m); | |
void updatesizehints(Client *c); | |
void updatetitle(Client *c); | |
void view(const char *arg); | |
t@@ -336,12 +336,12 @@ buttonpress(XEvent *e) { | |
Client *c; | |
XButtonPressedEvent *ev = &e->xbutton; | |
- Monitor s = monitors[monitorat(-1, -1)]; | |
+ Monitor *m = &monitors[monitorat(-1, -1)]; | |
- if(ev->window == s.barwin) { | |
+ if(ev->window == m->barwin) { | |
x = 0; | |
for(i = 0; i < LENGTH(tags); i++) { | |
- x += textw(&s, tags[i]); | |
+ x += textw(m, tags[i]); | |
if(ev->x < x) { | |
if(ev->button == Button1) { | |
if(ev->state & MODKEY) | |
t@@ -366,20 +366,20 @@ buttonpress(XEvent *e) { | |
if(CLEANMASK(ev->state) != MODKEY) | |
return; | |
if(ev->button == Button1) { | |
- if((s.layout->arrange == floating) || c->isfloating) | |
+ if((m->layout->arrange == floating) || c->isfloating) | |
restack(); | |
else | |
togglefloating(NULL); | |
movemouse(c); | |
} | |
else if(ev->button == Button2) { | |
- if((floating != s.layout->arrange) && c->isfloating) | |
+ if((floating != m->layout->arrange) && c->isfloating) | |
togglefloating(NULL); | |
else | |
zoom(NULL); | |
} | |
else if(ev->button == Button3 && !c->isfixed) { | |
- if((floating == s.layout->arrange) || c->isfloating) | |
+ if((floating == m->layout->arrange) || c->isfloating) | |
restack(); | |
else | |
togglefloating(NULL); | |
t@@ -565,20 +565,20 @@ detachstack(Client *c) { | |
void | |
drawbar(void) { | |
- int i, x, s; | |
+ int i, j, x; | |
- for(s = 0; s < mcount; ++s) { | |
- Monitor *m = &monitors[s]; | |
+ for(i = 0; i < mcount; i++) { | |
+ Monitor *m = &monitors[i]; | |
m->dc.x = 0; | |
- for(i = 0; i < LENGTH(tags); i++) { | |
- m->dc.w = textw(m, tags[i]); | |
- if(m->seltags[i]) { | |
- drawtext(m, tags[i], m->dc.sel); | |
- drawsquare(m, sel && sel->tags[i] && sel->moni… | |
+ for(j = 0; j < LENGTH(tags); j++) { | |
+ m->dc.w = textw(m, tags[j]); | |
+ if(m->seltags[j]) { | |
+ drawtext(m, tags[j], m->dc.sel); | |
+ drawsquare(m, sel && sel->tags[j] && sel->moni… | |
} | |
else { | |
- drawtext(m, tags[i], m->dc.norm); | |
- drawsquare(m, sel && sel->tags[i] && sel->moni… | |
+ drawtext(m, tags[j], m->dc.norm); | |
+ drawsquare(m, sel && sel->tags[j] && sel->moni… | |
} | |
m->dc.x += m->dc.w; | |
} | |
t@@ -1336,10 +1336,10 @@ resizemouse(Client *c) { | |
void | |
restack(void) { | |
+ unsigned int i; | |
Client *c; | |
XEvent ev; | |
XWindowChanges wc; | |
- int s; | |
drawbar(); | |
if(!sel) | |
t@@ -1353,8 +1353,8 @@ restack(void) { | |
XConfigureWindow(dpy, sel->win, CWSibling | CWStackMod… | |
wc.sibling = sel->win; | |
} | |
- for(s = 0; s < mcount; s++) { | |
- for(c = nexttiled(clients, &monitors[s]); c; c = nextt… | |
+ for(i = 0; i < mcount; i++) { | |
+ for(c = nexttiled(clients, &monitors[i]); c; c = nextt… | |
if(c == sel) | |
continue; | |
XConfigureWindow(dpy, c->win, CWSibling | CWSt… | |
t@@ -1676,39 +1676,38 @@ textw(Monitor *m, const char *text) { | |
void | |
tile(void) { | |
- unsigned int i, n, nx, ny, nw, nh, mw, th; | |
- int s; | |
+ unsigned int i, j, n, nx, ny, nw, nh, mw, th; | |
Client *c, *mc; | |
domwfact = dozoom = True; | |
nw = 0; /* gcc stupidity requires this */ | |
- for (s = 0; s < mcount; s++) { | |
- Monitor *m = &monitors[s]; | |
+ for (i = 0; i < mcount; i++) { | |
+ Monitor *m = &monitors[i]; | |
for(n = 0, c = nexttiled(clients, m); c; c = nexttiled(c->next… | |
n++; | |
- for(i = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c-… | |
+ for(j = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c-… | |
/* window geoms */ | |
mw = (n == 1) ? m->waw : m->mwfact * m->waw; | |
th = (n > 1) ? m->wah / (n - 1) : 0; | |
if(n > 1 && th < bh) | |
th = m->wah; | |
- if(i == 0) { /* master */ | |
+ if(j == 0) { /* master */ | |
nx = m->wax; | |
ny = m->way; | |
nw = mw - 2 * c->border; | |
nh = m->wah - 2 * c->border; | |
} | |
else { /* tile window */ | |
- if(i == 1) { | |
+ if(j == 1) { | |
ny = m->way; | |
nx += mc->w + 2 * mc->border; | |
nw = m->waw - mw - 2 * c->border; | |
} | |
- if(i + 1 == n) /* remainder */ | |
+ if(j + 1 == n) /* remainder */ | |
nh = (m->way + m->wah) - ny - 2 * c->b… | |
else | |
nh = th - 2 * c->border; | |
t@@ -1720,7 +1719,7 @@ tile(void) { | |
if(n > 1 && th != m->wah) | |
ny = c->y + c->h + 2 * c->border; | |
- i++; | |
+ j++; | |
} | |
} | |
} | |
t@@ -1813,25 +1812,25 @@ unmapnotify(XEvent *e) { | |
} | |
void | |
-updatebarpos(Monitor *s) { | |
+updatebarpos(Monitor *m) { | |
XEvent ev; | |
- s->wax = s->sx; | |
- s->way = s->sy; | |
- s->wah = s->sh; | |
- s->waw = s->sw; | |
+ m->wax = m->sx; | |
+ m->way = m->sy; | |
+ m->wah = m->sh; | |
+ m->waw = m->sw; | |
switch(bpos) { | |
default: | |
- s->wah -= bh; | |
- s->way += bh; | |
- XMoveWindow(dpy, s->barwin, s->sx, s->sy); | |
+ m->wah -= bh; | |
+ m->way += bh; | |
+ XMoveWindow(dpy, m->barwin, m->sx, m->sy); | |
break; | |
case BarBot: | |
- s->wah -= bh; | |
- XMoveWindow(dpy, s->barwin, s->sx, s->sy + s->wah); | |
+ m->wah -= bh; | |
+ XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah); | |
break; | |
case BarOff: | |
- XMoveWindow(dpy, s->barwin, s->sx, s->sy - bh); | |
+ XMoveWindow(dpy, m->barwin, m->sx, m->sy - bh); | |
break; | |
} | |
XSync(dpy, False); |