X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=event.c;h=4d9a1e63828eafca921b0c184efc297ba7901a09;hp=ae08f86f86f5117000339c2cdefe444853805180;hb=399993c6b5d594278bf822e2981ebfe8bfcb58c7;hpb=2c477cf66147d369ae8ff17acdce743c6811ee6a

diff --git a/event.c b/event.c
index ae08f86..4d9a1e6 100644
--- a/event.c
+++ b/event.c
@@ -1,6 +1,5 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2004-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -113,29 +112,29 @@ resizemouse(Client *c) {
 
 static void
 buttonpress(XEvent *e) {
-	static char arg[8];
-	int i, x;
+	static char buf[32];
+	unsigned int i, x;
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
-	arg[0] = 0;
+	buf[0] = 0;
 	if(barwin == ev->window) {
 		x = 0;
 		for(i = 0; i < ntags; i++) {
 			x += textw(tags[i]);
 			if(ev->x < x) {
-				snprintf(arg, sizeof arg, "%d", i);
+				snprintf(buf, sizeof buf, "%d", i);
 				if(ev->button == Button1) {
 					if(ev->state & MODKEY)
-						tag(arg);
+						tag(buf);
 					else
-						view(arg);
+						view(buf);
 				}
 				else if(ev->button == Button3) {
 					if(ev->state & MODKEY)
-						toggletag(arg);
+						toggletag(buf);
 					else
-						toggleview(arg);
+						toggleview(buf);
 				}
 				return;
 			}
@@ -143,7 +142,7 @@ buttonpress(XEvent *e) {
 		if(ev->x < x + blw)
 			switch(ev->button) {
 			case Button1:
-				setlayout("-1");
+				setlayout(NULL);
 				break;
 			}
 	}
@@ -151,14 +150,14 @@ buttonpress(XEvent *e) {
 		focus(c);
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
-		if(ev->button == Button1 && (lt->arrange == versatile || c->isversatile)) {
+		if(ev->button == Button1 && (lt->arrange == floating || c->isfloating)) {
 			restack();
 			movemouse(c);
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
 		else if(ev->button == Button3
-		&& (lt->arrange == versatile || c->isversatile) && !c->isfixed)
+		&& (lt->arrange == floating || c->isfloating) && !c->isfixed)
 		{
 			restack();
 			resizemouse(c);
@@ -174,9 +173,7 @@ configurerequest(XEvent *e) {
 
 	if((c = getclient(ev->window))) {
 		c->ismax = False;
-		if(ev->value_mask & CWBorderWidth)
-			c->border = ev->border_width;
-		if(c->isfixed || c->isversatile || (lt->arrange == versatile)) {
+		if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
 			if(ev->value_mask & CWX)
 				c->x = ev->x;
 			if(ev->value_mask & CWY)
@@ -191,8 +188,12 @@ configurerequest(XEvent *e) {
 			if(isvisible(c))
 				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 		}
-		else
+		else {
+			if(ev->value_mask & CWBorderWidth)
+				c->border = ev->border_width;
 			configure(c);
+			c->border = BORDERPX;
+		}
 	}
 	else {
 		wc.x = ev->x;
@@ -304,7 +305,7 @@ propertynotify(XEvent *e) {
 			default: break;
 			case XA_WM_TRANSIENT_FOR:
 				XGetTransientForHint(dpy, c->win, &trans);
-				if(!c->isversatile && (c->isversatile = (getclient(trans) != NULL)))
+				if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
 					lt->arrange();
 				break;
 			case XA_WM_NORMAL_HINTS: