X-Git-Url: http://pileus.org/git/?p=wmpus;a=blobdiff_plain;f=sys-x11.c;h=77555a9cb05a309ec3531f2d36a0bd48f5837fad;hp=a5ae667f6e3e794676df052921ad6c54a03a8988;hb=a2379eee427e03e718b5307a6bd290453a058aca;hpb=a6f2be4a52a3dd478c0640714c5be9c5cf87c64e

diff --git a/sys-x11.c b/sys-x11.c
index a5ae667..77555a9 100644
--- a/sys-x11.c
+++ b/sys-x11.c
@@ -13,6 +13,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  */
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <search.h>
@@ -24,12 +25,13 @@
 #include <X11/extensions/Xinerama.h>
 
 #include "util.h"
+#include "conf.h"
 #include "sys.h"
 #include "wm.h"
 
-#ifndef BORDER
-#define BORDER 2
-#endif
+/* Configuration */
+static int BORDER     = 2;
+static int NO_CAPTURE = 0;
 
 /* Internal structures */
 struct win_sys {
@@ -55,6 +57,7 @@ typedef enum {
 } color_t;
 
 /* Global data */
+static int   running;
 static void *cache;
 static Atom atoms[natoms];
 static int (*xerrorxlib)(Display *, XErrorEvent *);
@@ -241,13 +244,18 @@ static win_t *win_find(Display *dpy, Window xid, int create)
 	return new;
 }
 
-static void win_remove(win_t *win)
+static void win_free(win_t *win)
 {
-	tdelete(win, &cache, win_cmp);
 	free(win->sys);
 	free(win);
 }
 
+static void win_remove(win_t *win)
+{
+	tdelete(win, &cache, win_cmp);
+	win_free(win);
+}
+
 static int win_viewable(win_t *win)
 {
 	XWindowAttributes attr;
@@ -275,7 +283,7 @@ static void process_event(int type, XEvent *ev, win_t *root)
 	//printf("event: %d\n", type);
 
 	/* Common data for all these events ... */
-	ptr_t ptr; mod_t mod;
+	ptr_t ptr = {}; mod_t mod = {};
 	if (type == KeyPress    || type == KeyRelease    ||
 	    type == ButtonPress || type == ButtonRelease ||
 	    type == MotionNotify) {
@@ -456,6 +464,7 @@ void sys_show(win_t *win, state_t state)
 	case st_show:
 		printf("sys_show: show\n");
 		XMapWindow(win->sys->dpy, win->sys->xid);
+		XSync(win->sys->dpy, False);
 		return;
 	case st_full:
 		printf("sys_show: full\n");
@@ -504,15 +513,11 @@ list_t *sys_info(win_t *win)
 {
 	/* Use global copy of screens so we can add struts */
 	if (screens == NULL) {
-		int n;
+		/* Add Xinerama screens */
+		int n = 0;
 		XineramaScreenInfo *info = NULL;
 		if (XineramaIsActive(win->sys->dpy))
 			info = XineramaQueryScreens(win->sys->dpy, &n);
-		if (!info) {
-			win_t *screen = new0(win_t);
-			*screen = *win;
-			return list_insert(NULL, screen);
-		}
 		for (int i = 0; i < n; i++) {
 			win_t *screen = new0(win_t);
 			screen->x = info[i].x_org;
@@ -522,6 +527,12 @@ list_t *sys_info(win_t *win)
 			screens = list_append(screens, screen);
 		}
 	}
+	if (screens == NULL) {
+		/* No xinerama support */
+		win_t *screen = new0(win_t);
+		*screen = *win;
+		screens = list_insert(NULL, screen);
+	}
 	return screens;
 }
 
@@ -530,6 +541,10 @@ win_t *sys_init(void)
 	Display *dpy;
 	Window   xid;
 
+	/* Load configuration */
+	BORDER     = conf_get_int("main.border",     BORDER);
+	NO_CAPTURE = conf_get_int("main.no-capture", NO_CAPTURE);
+
 	/* Open the display */
 	if (!(dpy = XOpenDisplay(NULL)))
 		error("Unable to get display");
@@ -548,7 +563,6 @@ win_t *sys_init(void)
 
 	/* Select window management events */
 	XSelectInput(dpy, xid, SubstructureRedirectMask|SubstructureNotifyMask);
-	XSetInputFocus(dpy, None, RevertToNone, CurrentTime);
 	xerrorxlib = XSetErrorHandler(xerror);
 
 	return win_find(dpy, xid, 1);
@@ -557,22 +571,40 @@ win_t *sys_init(void)
 void sys_run(win_t *root)
 {
 	/* Add each initial window */
-	unsigned int nkids;
-	Window par, xid, *kids = NULL;
-	if (XQueryTree(root->sys->dpy, root->sys->xid,
-				&par, &xid, &kids, &nkids))
-		for(int i = 0; i < nkids; i++) {
-			win_t *win = win_find(root->sys->dpy, kids[i], 1);
-			if (win && win_viewable(win) && !strut_add(root,win))
-				wm_insert(win);
+	if (!NO_CAPTURE) {
+		unsigned int nkids;
+		Window par, xid, *kids = NULL;
+		if (XQueryTree(root->sys->dpy, root->sys->xid,
+					&par, &xid, &kids, &nkids)) {
+			for(int i = 0; i < nkids; i++) {
+				win_t *win = win_find(root->sys->dpy, kids[i], 1);
+				if (win && win_viewable(win) && !strut_add(root,win))
+					wm_insert(win);
+			}
+			XFree(kids);
 		}
-	wm_update(); // For struts
+		wm_update(); // For struts
+	}
 
 	/* Main loop */
-	for(;;)
+	running = 1;
+	while (running)
 	{
 		XEvent ev;
 		XNextEvent(root->sys->dpy, &ev);
 		process_event(ev.type, &ev, root);
 	}
 }
+
+void sys_exit(void)
+{
+	running = 0;
+}
+
+void sys_free(win_t *root)
+{
+	XCloseDisplay(root->sys->dpy);
+	while (screens)
+		screens = list_remove(screens, screens, 1);
+	tdestroy(cache, (void(*)(void*))win_free);
+}