X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=wm.c;h=f247372d4398394fd2557511dc1d9c7ccdaf0d76;hb=586f66331d1105be03c42e6faeae1672b974a98a;hp=ef4721d15566701ce82d9cf3bf9d7a33e7e5861b;hpb=005362043d8b0bbf856f301c231d4f10c519b8c4;p=dwm.git

diff --git a/wm.c b/wm.c
index ef4721d..f247372 100644
--- a/wm.c
+++ b/wm.c
@@ -3,10 +3,15 @@
  * See LICENSE file for license details.
  */
 
+#include <errno.h>
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <sys/types.h>
+#include <sys/time.h>
+
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
@@ -16,18 +21,18 @@
 /* X structs */
 Display *dpy;
 Window root, barwin;
-Atom net_atom[NetLast];
+Atom wm_atom[WMLast], net_atom[NetLast];
 Cursor cursor[CurLast];
 XRectangle rect, barrect;
 Bool running = True;
+Bool sel_screen;
 
 char *bartext, tag[256];
-int screen, sel_screen;
+int screen;
 
 Brush brush = {0};
 Client *clients = NULL;
-
-enum { WM_PROTOCOL_DELWIN = 1 };
+Client *stack = NULL;
 
 static Bool other_wm_running;
 static char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
@@ -62,6 +67,62 @@ scan_wins()
 		XFree(wins);
 }
 
+static int
+win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
+{
+	Atom real;
+	int format;
+	unsigned long res, extra;
+	int status;
+
+	status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
+			&res, &extra, prop);
+
+	if(status != Success || *prop == 0) {
+		return 0;
+	}
+	if(res == 0) {
+		free((void *) *prop);
+	}
+	return res;
+}
+
+int
+win_proto(Window w)
+{
+	Atom *protocols;
+	long res;
+	int protos = 0;
+	int i;
+
+	res = win_property(w, wm_atom[WMProtocols], XA_ATOM, 20L,
+			((unsigned char **) &protocols));
+	if(res <= 0) {
+		return protos;
+	}
+	for(i = 0; i < res; i++) {
+		if(protocols[i] == wm_atom[WMDelete])
+			protos |= WM_PROTOCOL_DELWIN;
+	}
+	free((char *) protocols);
+	return protos;
+}
+
+void
+send_message(Window w, Atom a, long value)
+{
+	XEvent e;
+
+	e.type = ClientMessage;
+	e.xclient.window = w;
+	e.xclient.message_type = a;
+	e.xclient.format = 32;
+	e.xclient.data.l[0] = value;
+	e.xclient.data.l[1] = CurrentTime;
+	XSendEvent(dpy, w, False, NoEventMask, &e);
+	XFlush(dpy);
+}
+
 /*
  * There's no way to check accesses to destroyed windows, thus
  * those cases are ignored (especially on UnmapNotify's).
@@ -104,12 +165,9 @@ startup_error_handler(Display *dpy, XErrorEvent *error)
 static void
 cleanup()
 {
-	/*
-	Client *c;
-	for(c=client; c; c=c->next)
-		reparent_client(c, root, c->sel->rect.x, c->sel->rect.y);
+	while(clients)
+		unmanage(clients);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-	*/
 }
 
 int
@@ -120,6 +178,11 @@ main(int argc, char *argv[])
 	unsigned int mask;
 	Window w;
 	XEvent ev;
+	fd_set fds;
+	struct timeval t, timeout = {
+		.tv_usec = 0,
+		.tv_sec = STATUSDELAY,
+	};
 
 	/* command line args */
 	for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
@@ -160,6 +223,8 @@ main(int argc, char *argv[])
 	x_error_handler = XSetErrorHandler(error_handler);
 
 	/* init atoms */
+	wm_atom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
+	wm_atom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
 	net_atom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
 	net_atom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
 
@@ -206,9 +271,19 @@ main(int argc, char *argv[])
 	scan_wins();
 
 	while(running) {
-		XNextEvent(dpy, &ev);
-		if(handler[ev.type])
-			(handler[ev.type]) (&ev); /* call handler */
+		if(XPending(dpy) > 0) {
+			XNextEvent(dpy, &ev);
+			if(handler[ev.type])
+				(handler[ev.type]) (&ev); /* call handler */
+			continue;
+		}
+		FD_ZERO(&fds);
+		FD_SET(ConnectionNumber(dpy), &fds);
+		t = timeout;
+		if(select(ConnectionNumber(dpy) + 1, &fds, NULL, NULL, &t) > 0)
+			continue;
+		else if(errno != EINTR)
+			draw_bar();
 	}
 
 	cleanup();