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

diff --git a/event.c b/event.c
index ccab9d1..5ff6b91 100644
--- a/event.c
+++ b/event.c
@@ -12,6 +12,7 @@
 #include "wm.h"
 
 /* local functions */
+static void buttonpress(XEvent *e);
 static void configurerequest(XEvent *e);
 static void destroynotify(XEvent *e);
 static void enternotify(XEvent *e);
@@ -23,6 +24,7 @@ static void propertynotify(XEvent *e);
 static void unmapnotify(XEvent *e);
 
 void (*handler[LASTEvent]) (XEvent *) = {
+	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
 	[DestroyNotify] = destroynotify,
 	[EnterNotify] = enternotify,
@@ -35,13 +37,35 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[UnmapNotify] = unmapnotify
 };
 
-unsigned int
-flush_events(long even_mask)
+void
+discard_events(long even_mask)
 {
 	XEvent ev;
-	unsigned int n = 0;
-	while(XCheckMaskEvent(dpy, even_mask, &ev)) n++;
-	return n;
+	while(XCheckMaskEvent(dpy, even_mask, &ev));
+}
+
+static void
+buttonpress(XEvent *e)
+{
+	XButtonPressedEvent *ev = &e->xbutton;
+	Client *c;
+
+	if((c = getclient(ev->window))) {
+		craise(c);
+		switch(ev->button) {
+		default:
+			break;
+		case Button1:
+			mmove(c);
+			break;
+		case Button2:
+			lower(c);
+			break;
+		case Button3:
+			mresize(c);
+			break;
+		}
+	}
 }
 
 static void
@@ -51,26 +75,27 @@ configurerequest(XEvent *e)
 	XWindowChanges wc;
 	Client *c;
 
-	c = getclient(ev->window);
 	ev->value_mask &= ~CWSibling;
-	if(c) {
+	if((c = getclient(ev->window))) {
+		gravitate(c, True);
 		if(ev->value_mask & CWX)
-			c->r[RFloat].x = ev->x;
+			c->x = ev->x;
 		if(ev->value_mask & CWY)
-			c->r[RFloat].y = ev->y;
+			c->y = ev->y;
 		if(ev->value_mask & CWWidth)
-			c->r[RFloat].width = ev->width;
+			c->w = ev->width;
 		if(ev->value_mask & CWHeight)
-			c->r[RFloat].height = ev->height;
+			c->h = ev->height;
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
+		gravitate(c, False);
 	}
 
 	wc.x = ev->x;
 	wc.y = ev->y;
 	wc.width = ev->width;
 	wc.height = ev->height;
-	wc.border_width = 0;
+	wc.border_width = 1;
 	wc.sibling = None;
 	wc.stack_mode = Above;
 	ev->value_mask &= ~CWStackMode;
@@ -100,10 +125,8 @@ enternotify(XEvent *e)
 
 	if((c = getclient(ev->window)))
 		focus(c);
-	else if(ev->window == root) {
-		sel_screen = True;
-		/*draw_frames();*/
-	}
+	else if(ev->window == root)
+		issel = True;
 }
 
 static void
@@ -111,20 +134,19 @@ leavenotify(XEvent *e)
 {
 	XCrossingEvent *ev = &e->xcrossing;
 
-	if((ev->window == root) && !ev->same_screen) {
-		sel_screen = True;
-		/*draw_frames();*/
-	}
+	if((ev->window == root) && !ev->same_screen)
+		issel = True;
 }
 
 static void
 expose(XEvent *e)
 {
 	XExposeEvent *ev = &e->xexpose;
+	Client *c;
 
 	if(ev->count == 0) {
-		if(ev->window == barwin)
-			draw_bar();
+		if((c = gettitle(ev->window)))
+			draw_client(c);
 	}
 }
 
@@ -157,37 +179,29 @@ static void
 propertynotify(XEvent *e)
 {
 	XPropertyEvent *ev = &e->xproperty;
-	long msize;
 	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);
 				break;
+				update_size(c);
 			case XA_WM_NORMAL_HINTS:
-				if(!XGetWMNormalHints(dpy, c->win, &c->size, &msize)
-						|| !c->size.flags)
-					c->size.flags = PSize;
-				if(c->size.flags & PMinSize && c->size.flags & PMaxSize
-						&& c->size.min_width == c->size.max_width
-						&& c->size.min_height == c->size.max_height)
-					c->fixedsize = True;
-				else
-					c->fixedsize = False;
+				update_size(c);
 				break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
 			update_name(c);
-			/*draw_frame(c->sel);*/
+			draw_client(c);
 		}
 	}
 }