X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/08bcf721b436018306bdbb9fbaca87f941ee6441..077d3e435baec5faa8182aea29723663ee6ae778:/dwm.c?ds=sidebyside

diff --git a/dwm.c b/dwm.c
index ada272c..123707c 100644
--- a/dwm.c
+++ b/dwm.c
@@ -551,8 +551,7 @@ drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
 
 void
 drawtext(const char *text, ulong col[ColLast], Bool invert) {
-	int i, x, y, h;
-	uint len, olen;
+	int i, x, y, h, len, olen;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 	char buf[256];
 
@@ -571,7 +570,7 @@ drawtext(const char *text, ulong col[ColLast], Bool invert) {
 	if(!len)
 		return;
 	if(len < olen)
-		for(i = len; i >= MAX(0, len - 3); buf[i--] = '.');
+		for(i = len; i && i > len - 3; buf[--i] = '.');
 	XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
 	if(dc.font.set)
 		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
@@ -612,7 +611,7 @@ expose(XEvent *e) {
 
 void
 focus(Client *c) {
-	if(!c || (c && c->isbanned))
+	if(!c || c->isbanned)
 		for(c = stack; c && c->isbanned; c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
@@ -622,14 +621,12 @@ focus(Client *c) {
 		detachstack(c);
 		attachstack(c);
 		grabbuttons(c, True);
-	}
-	sel = c;
-	if(c) {
 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	sel = c;
 	drawbar();
 }
 
@@ -739,8 +736,7 @@ void
 grabbuttons(Client *c, Bool focused) {
 	int i, j;
 	uint buttons[]   = { Button1, Button2, Button3 };
-	uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
-				MODKEY|numlockmask|LockMask} ;
+	uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, MODKEY|numlockmask|LockMask };
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	if(focused)
@@ -1565,8 +1561,8 @@ updatebar(void) {
 
 void
 updategeom(void) {
-	int i;
 #ifdef XINERAMA
+	int i;
 	XineramaScreenInfo *info = NULL;
 
 	/* window area geometry */