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

diff --git a/event.c b/event.c
index 1db3d96..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,21 +38,16 @@ 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))) {
-		raise(c);
+	if(barwin == ev->window)
+		barclick(ev);
+	else if((c = getclient(ev->window))) {
+		craise(c);
 		switch(ev->button) {
 		default:
 			break;
@@ -77,6 +73,7 @@ configurerequest(XEvent *e)
 
 	ev->value_mask &= ~CWSibling;
 	if((c = getclient(ev->window))) {
+		gravitate(c, True);
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
 		if(ev->value_mask & CWY)
@@ -85,6 +82,10 @@ configurerequest(XEvent *e)
 			c->w = ev->width;
 		if(ev->value_mask & CWHeight)
 			c->h = ev->height;
+		if(ev->value_mask & CWBorderWidth)
+			c->border = 1;
+		gravitate(c, False);
+		resize(c, True);
 	}
 
 	wc.x = ev->x;
@@ -122,7 +123,7 @@ enternotify(XEvent *e)
 	if((c = getclient(ev->window)))
 		focus(c);
 	else if(ev->window == root)
-		sel_screen = True;
+		issel = True;
 }
 
 static void
@@ -131,7 +132,7 @@ leavenotify(XEvent *e)
 	XCrossingEvent *ev = &e->xcrossing;
 
 	if((ev->window == root) && !ev->same_screen)
-		sel_screen = True;
+		issel = True;
 }
 
 static void
@@ -141,10 +142,10 @@ expose(XEvent *e)
 	Client *c;
 
 	if(ev->count == 0) {
-		if((c = gettitle(ev->window)))
-			draw_client(c);
-		else if(ev->window == barwin)
+		if(barwin == ev->window)
 			draw_bar();
+		else if((c = gettitle(ev->window)))
+			draw_client(c);
 	}
 }
 
@@ -177,32 +178,31 @@ static void
 propertynotify(XEvent *e)
 {
 	XPropertyEvent *ev = &e->xproperty;
+	Window trans;
 	Client *c;
 
 	if(ev->state == PropertyDelete)
 		return; /* ignore */
 
-	if(ev->atom == wm_atom[WMProtocols]) {
-		c->proto = win_proto(c->win);
-		return;
-	}
 	if((c = getclient(ev->window))) {
+		if(ev->atom == wm_atom[WMProtocols]) {
+			c->proto = win_proto(c->win);
+			return;
+		}
 		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;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
 			update_name(c);
-			if(c == stack)
-				draw_bar();
-			else
-				draw_client(c);
+			draw_client(c);
 		}
 	}
 }