X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=event.c;h=f29038a0fdb25b0719b2c61a2f744f934c8dec51;hp=909012d73a190aa2d4e11391320e07e7d4c2768b;hb=83d23908d3438d7f1f62533a7c8d96fc1019df55;hpb=16c67f32d62849792c8e6d4fdec22a1896f9c279

diff --git a/event.c b/event.c
index 909012d..f29038a 100644
--- a/event.c
+++ b/event.c
@@ -7,10 +7,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <X11/keysym.h>
+#include <X11/Xatom.h>
 
 #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);
@@ -22,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,7 +38,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 };
 
 unsigned int
-flush_masked_events(long even_mask)
+discard_events(long even_mask)
 {
 	XEvent ev;
 	unsigned int n = 0;
@@ -44,25 +47,45 @@ flush_masked_events(long even_mask)
 }
 
 static void
+buttonpress(XEvent *e)
+{
+	XButtonPressedEvent *ev = &e->xbutton;
+	Client *c;
+
+	if((c = getclient(ev->window))) {
+		switch(ev->button) {
+		default:
+			break;
+		case Button1:
+			mmove(c);
+			break;
+		case Button2:
+			XLowerWindow(dpy, c->win);
+			break;
+		case Button3:
+			mresize(c);
+			break;
+		}
+	}
+}
+
+static void
 configurerequest(XEvent *e)
 {
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 	Client *c;
 
-	c = getclient(ev->window);
 	ev->value_mask &= ~CWSibling;
-	if(c) {
+	if((c = getclient(ev->window))) {
 		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;
-		if(ev->value_mask & CWBorderWidth)
-			c->border = ev->border_width;
+			c->h = ev->height;
 	}
 
 	wc.x = ev->x;
@@ -81,37 +104,28 @@ configurerequest(XEvent *e)
 static void
 destroynotify(XEvent *e)
 {
-#if 0
 	Client *c;
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
 
-	if((c = client_of_win(ev->window)))
-		destroy_client(c);
-#endif
+	if((c = getclient(ev->window)))
+		unmanage(c);
 }
 
 static void
 enternotify(XEvent *e)
 {
-#if 0
 	XCrossingEvent *ev = &e->xcrossing;
 	Client *c;
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
 
-	if((c = client_of_win(ev->window))) {
-		Frame *f = c->sel;
-		Area *a = f->area;
-		if(a->mode == Colmax)
-			c = a->sel->client;
-		focus(c, False);
-	}
+	if((c = getclient(ev->window)))
+		focus(c);
 	else if(ev->window == root) {
 		sel_screen = True;
-		draw_frames();
+		/*draw_frames();*/
 	}
-#endif
 }
 
 static void
@@ -129,9 +143,12 @@ static void
 expose(XEvent *e)
 {
 	XExposeEvent *ev = &e->xexpose;
+	Client *c;
 
 	if(ev->count == 0) {
-		if(ev->window == barwin)
+		if((c = getclient(ev->window)))
+			draw_client(c);
+		else if(ev->window == barwin)
 			draw_bar();
 	}
 }
@@ -139,9 +156,7 @@ expose(XEvent *e)
 static void
 keymapnotify(XEvent *e)
 {
-#if 0
 	update_keys();
-#endif
 }
 
 static void
@@ -159,37 +174,46 @@ maprequest(XEvent *e)
 		return;
 	}
 
-	/*if(!client_of_win(ev->window))*/
-		/*manage(create_client(ev->window, &wa));*/
-	XMapRaised(dpy, ev->window);
-	XMoveResizeWindow(dpy, ev->window, rect.x, rect.y, rect.width, rect.height - barrect.height);
-	XSetInputFocus(dpy, ev->window, RevertToPointerRoot, CurrentTime);
-	XFlush(dpy);
+	if(!getclient(ev->window))
+		manage(ev->window, &wa);
 }
 
 static void
 propertynotify(XEvent *e)
 {
-#if 0
 	XPropertyEvent *ev = &e->xproperty;
 	Client *c;
 
 	if(ev->state == PropertyDelete)
 		return; /* ignore */
 
-	if((c = client_of_win(ev->window)))
-		prop_client(c, ev);
-#endif
+	if(ev->atom == wm_atom[WMProtocols]) {
+		c->proto = win_proto(c->win);
+		return;
+	}
+	if((c = getclient(ev->window))) {
+		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:
+				update_size(c);
+				break;
+		}
+		if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
+			update_name(c);
+		}
+	}
 }
 
 static void
 unmapnotify(XEvent *e)
 {
-#if 0
 	Client *c;
 	XUnmapEvent *ev = &e->xunmap;
 
-	if((c = client_of_win(ev->window)))
-		destroy_client(c);
-#endif
+	if((c = getclient(ev->window)))
+		unmanage(c);
 }