X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=event.c;h=61dcec59a8fdbc74940b80a363fa8126b256f45b;hp=5ff6b911d8df91848c0a9ce80172228bf522b9f8;hb=59b4a5e4cac68dfe6d245b8b708c3cb805f49f6d;hpb=8b59083eb13c0712e04d9a5b6d7bf4af5913c442

diff --git a/event.c b/event.c
index 5ff6b91..61dcec5 100644
--- a/event.c
+++ b/event.c
@@ -4,12 +4,13 @@
  */
 
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
-#include "wm.h"
+#include "dwm.h"
 
 /* local functions */
 static void buttonpress(XEvent *e);
@@ -37,20 +38,15 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[UnmapNotify] = unmapnotify
 };
 
-void
-discard_events(long even_mask)
-{
-	XEvent ev;
-	while(XCheckMaskEvent(dpy, even_mask, &ev));
-}
-
 static void
 buttonpress(XEvent *e)
 {
 	XButtonPressedEvent *ev = &e->xbutton;
 	Client *c;
 
-	if((c = getclient(ev->window))) {
+	if(barwin == ev->window)
+		barclick(ev);
+	else if((c = getclient(ev->window))) {
 		craise(c);
 		switch(ev->button) {
 		default:
@@ -87,8 +83,9 @@ configurerequest(XEvent *e)
 		if(ev->value_mask & CWHeight)
 			c->h = ev->height;
 		if(ev->value_mask & CWBorderWidth)
-			c->border = ev->border_width;
+			c->border = 1;
 		gravitate(c, False);
+		resize(c, True);
 	}
 
 	wc.x = ev->x;
@@ -145,7 +142,9 @@ expose(XEvent *e)
 	Client *c;
 
 	if(ev->count == 0) {
-		if((c = gettitle(ev->window)))
+		if(barwin == ev->window)
+			draw_bar();
+		else if((c = gettitle(ev->window)))
 			draw_client(c);
 	}
 }
@@ -179,6 +178,7 @@ static void
 propertynotify(XEvent *e)
 {
 	XPropertyEvent *ev = &e->xproperty;
+	Window trans;
 	Client *c;
 
 	if(ev->state == PropertyDelete)
@@ -192,9 +192,10 @@ propertynotify(XEvent *e)
 		switch (ev->atom) {
 			default: break;
 			case XA_WM_TRANSIENT_FOR:
-				XGetTransientForHint(dpy, c->win, &c->trans);
+				XGetTransientForHint(dpy, c->win, &trans);
+				if(!c->floating && (c->floating = (trans != 0)))
+					arrange(NULL);
 				break;
-				update_size(c);
 			case XA_WM_NORMAL_HINTS:
 				update_size(c);
 				break;