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

diff --git a/event.c b/event.c
index ae08f86..db0d482 100644
--- a/event.c
+++ b/event.c
@@ -1,6 +1,6 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -113,29 +113,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 +143,7 @@ buttonpress(XEvent *e) {
 		if(ev->x < x + blw)
 			switch(ev->button) {
 			case Button1:
-				setlayout("-1");
+				setlayout(NULL);
 				break;
 			}
 	}
@@ -151,14 +151,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);
@@ -176,7 +176,7 @@ configurerequest(XEvent *e) {
 		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)
@@ -208,6 +208,22 @@ configurerequest(XEvent *e) {
 }
 
 static void
+configurenotify(XEvent *e) {
+	XConfigureEvent *ev = &e->xconfigure;
+
+	if (ev->window == root && (ev->width != sw || ev->height != sh)) {
+		sw = ev->width;
+		sh = ev->height;
+		wah = sh - bh;
+		waw = sw;
+		XFreePixmap(dpy, dc.drawable);
+		dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+		XResizeWindow(dpy, barwin, sw, bh);
+		lt->arrange();
+	}
+}
+
+static void
 destroynotify(XEvent *e) {
 	Client *c;
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
@@ -304,7 +320,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:
@@ -333,6 +349,7 @@ unmapnotify(XEvent *e) {
 void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
+	[ConfigureNotify] = configurenotify,
 	[DestroyNotify] = destroynotify,
 	[EnterNotify] = enternotify,
 	[LeaveNotify] = leavenotify,