X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sys-x11.c;h=75c2edd8a88b600a82f4e4e73c1bf22dfe657c56;hb=e396d3e091801135cf20b76d69199a9955ff3dc9;hp=82f140dc1af2485f5804f2d04e0556bc2151d313;hpb=affe32b94267ef0c1f38a7954bee255a55350cbb;p=wmpus

diff --git a/sys-x11.c b/sys-x11.c
index 82f140d..75c2edd 100644
--- a/sys-x11.c
+++ b/sys-x11.c
@@ -4,6 +4,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
+#include <X11/Xatom.h>
 #include <X11/keysym.h>
 
 #include "util.h"
@@ -14,6 +15,9 @@
 struct win_sys {
 	Window   xid;
 	Display *dpy;
+	struct {
+		int left, right, top, bottom;
+	} strut;
 };
 
 typedef struct {
@@ -22,16 +26,16 @@ typedef struct {
 } keymap_t;
 
 typedef enum {
-	wm_proto, wm_focus, natoms
+	wm_proto, wm_focus, net_strut, natoms
 } atom_t;
 
-Atom atoms[natoms];
-
 /* Global data */
-void *win_cache = NULL;
+static void *win_cache = NULL;
+static Atom atoms[natoms];
+static int (*xerrorxlib)(Display *, XErrorEvent *);
 
 /* Conversion functions */
-keymap_t key2sym[] = {
+static keymap_t key2sym[] = {
 	{key_left    , XK_Left },
 	{key_right   , XK_Right},
 	{key_up      , XK_Up   },
@@ -55,7 +59,7 @@ keymap_t key2sym[] = {
 };
 
 /* - Modifiers */
-mod_t x2mod(unsigned int state, int up)
+static mod_t x2mod(unsigned int state, int up)
 {
 	return (mod_t){
 	       .alt   = !!(state & Mod1Mask   ),
@@ -66,7 +70,7 @@ mod_t x2mod(unsigned int state, int up)
 	};
 }
 
-unsigned int mod2x(mod_t mod)
+static unsigned int mod2x(mod_t mod)
 {
 	return (mod.alt   ? Mod1Mask    : 0)
 	     | (mod.ctrl  ? ControlMask : 0)
@@ -75,35 +79,36 @@ unsigned int mod2x(mod_t mod)
 }
 
 /* - Keycodes */
-Key_t x2key(KeySym sym)
+static Key_t x2key(KeySym sym)
 {
 	keymap_t *km = map_getr(key2sym,sym);
 	return km ? km->key : sym;
 }
 
-KeySym key2x(Key_t key)
+static KeySym key2x(Key_t key)
 {
 	keymap_t *km = map_get(key2sym,key);
 	return km ? km->sym : key;
 }
 
-Key_t x2btn(int btn)
+static Key_t x2btn(int btn)
 {
 	return btn + key_mouse0;
 }
 
-int btn2x(Key_t key)
+static int btn2x(Key_t key)
 {
 	return key - key_mouse0;
 }
 
 /* - Pointers */
-ptr_t x2ptr(XEvent *_ev)
+static ptr_t x2ptr(XEvent *_ev)
 {
 	XKeyEvent *ev = &_ev->xkey;
 	return (ptr_t){ev->x, ev->y, ev->x_root, ev->y_root};
 }
-Window getfocus(win_t *root, XEvent *event)
+
+static Window getfocus(win_t *root, XEvent *event)
 {
 	int revert;
 	Window focus = PointerRoot;
@@ -116,11 +121,61 @@ Window getfocus(win_t *root, XEvent *event)
 	return focus;
 }
 
-/* Helper functions */
-win_t *win_new(Display *dpy, Window xid)
+/* Helpers */
+static int add_strut(win_t *root, win_t *win)
+{
+	/* Get X11 strut data */
+	Atom ret_type;
+	int ret_size;
+	unsigned long ret_items, bytes_left;
+	unsigned char *xdata;
+	int status = XGetWindowProperty(win->sys->dpy, win->sys->xid,
+			atoms[net_strut], 0L, 4L, False, XA_CARDINAL,
+			&ret_type, &ret_size, &ret_items, &bytes_left, &xdata);
+	if (status != Success || ret_size != 32 || ret_items != 4)
+		return 0;
+
+	int left   = ((int*)xdata)[0];
+	int right  = ((int*)xdata)[1];
+	int top    = ((int*)xdata)[2];
+	int bottom = ((int*)xdata)[3];
+	if (left == 0 && right == 0 && top == 0 && bottom == 0)
+		return 0;
+
+	win->sys->strut.left   = left;
+	win->sys->strut.right  = right;
+	win->sys->strut.top    = top;
+	win->sys->strut.bottom = bottom;
+	root->x += left;
+	root->y += top;
+	root->w -= left+right;
+	root->h -= top+bottom;
+	return 1;
+}
+
+static int del_strut(win_t *root, win_t *win)
+{
+	int left   = win->sys->strut.left;
+	int right  = win->sys->strut.right;
+	int top    = win->sys->strut.top;
+	int bottom = win->sys->strut.bottom;
+	if (left == 0 && right == 0 && top == 0 && bottom == 0)
+		return 0;
+
+	root->x -= left;
+	root->y -= top;
+	root->w += left+right;
+	root->h += top+bottom;
+	return 1;
+}
+
+/* Window functions */
+static win_t *win_new(Display *dpy, Window xid)
 {
 	XWindowAttributes attr;
-	XGetWindowAttributes(dpy, xid, &attr);
+	if (XGetWindowAttributes(dpy, xid, &attr))
+		if (attr.override_redirect)
+			return NULL;
 	win_t *win    = new0(win_t);
 	win->x        = attr.x;
 	win->y        = attr.y;
@@ -129,11 +184,11 @@ win_t *win_new(Display *dpy, Window xid)
 	win->sys      = new0(win_sys_t);
 	win->sys->dpy = dpy;
 	win->sys->xid = xid;
-	printf("win_new: %p = %p, %d\n", win, dpy, (int)xid);
+	printf("%p = %p, %d\n", win, dpy, (int)xid);
 	return win;
 }
 
-int win_cmp(const void *_a, const void *_b)
+static int win_cmp(const void *_a, const void *_b)
 {
 	const win_t *a = _a, *b = _b;
 	if (a->sys->dpy < b->sys->dpy) return -1;
@@ -143,42 +198,57 @@ int win_cmp(const void *_a, const void *_b)
 	return 0;
 }
 
-win_t *win_find(Display *dpy, Window xid)
+static win_t *win_find(Display *dpy, Window xid, int create)
 {
 	if (!dpy || !xid)
 		return NULL;
 	//printf("win_find: %p, %d\n", dpy, (int)xid);
 	win_sys_t sys = {.dpy=dpy, .xid=xid};
 	win_t     tmp = {.sys=&sys};
-	return *(win_t**)(tfind(&tmp, &win_cache, win_cmp) ?:
-		tsearch(win_new(dpy,xid), &win_cache, win_cmp));
+	win_t **old = NULL, *new = NULL;
+	if ((old = tfind(&tmp, &win_cache, win_cmp)))
+		return *old;
+	if (create && (new = win_new(dpy,xid)))
+		tsearch(new, &win_cache, win_cmp);
+	return new;
 }
 
-void win_remove(win_t *win)
+static void win_remove(win_t *win)
 {
 	tdelete(win, &win_cache, win_cmp);
 	free(win->sys);
 	free(win);
 }
 
+static int win_viewable(win_t *win)
+{
+	XWindowAttributes attr;
+	if (XGetWindowAttributes(win->sys->dpy, win->sys->xid, &attr))
+		return attr.map_state == IsViewable;
+	else
+		return True;
+}
+
 /* Callbacks */
-void process_event(int type, XEvent *ev, win_t *root)
+static void process_event(int type, XEvent *ev, win_t *root)
 {
 	Display  *dpy = root->sys->dpy;
+	win_t *win = NULL;
+	printf("event: %d\n", type);
 
 	/* Common data for all these events ... */
-	win_t *win = NULL; ptr_t ptr; mod_t mod;
+	ptr_t ptr; mod_t mod;
 	if (type == KeyPress    || type == KeyRelease    ||
 	    type == ButtonPress || type == ButtonRelease ||
 	    type == MotionNotify) {
 		Window xid = getfocus(root, ev);
-		win = win_find(dpy,xid);
+		if (!(win = win_find(dpy,xid,0)))
+			return;
 		ptr = x2ptr(ev);
 		mod = x2mod(ev->xkey.state, type==KeyRelease||type==ButtonRelease);
 	}
 
 	/* Split based on event */
-	//printf("event: %d\n", type);
 	if (type == KeyPress) {
 		while (XCheckTypedEvent(dpy, KeyPress, ev));
 		KeySym sym = XKeycodeToKeysym(dpy, ev->xkey.keycode, 0);
@@ -189,7 +259,7 @@ void process_event(int type, XEvent *ev, win_t *root)
 	}
 	else if (type == ButtonPress) {
 		wm_handle_key(win, x2btn(ev->xbutton.button), mod, ptr);
-		XGrabPointer(dpy, win->sys->xid, True, PointerMotionMask|ButtonReleaseMask,
+		XGrabPointer(dpy, ev->xbutton.root, True, PointerMotionMask|ButtonReleaseMask,
 				GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
 	}
 	else if (type == ButtonRelease) {
@@ -200,19 +270,33 @@ void process_event(int type, XEvent *ev, win_t *root)
 		while (XCheckTypedEvent(dpy, MotionNotify, ev));
 		wm_handle_ptr(win, ptr);
 	}
+	else if (type == EnterNotify || type == LeaveNotify) {
+		printf("enter: %d\n", type);
+		key_t key = EnterNotify ? key_enter : key_leave;
+		if ((win = win_find(dpy,ev->xcrossing.window,0)))
+			wm_handle_key(win, key, MOD(), PTR());
+	}
+	else if (type == FocusIn || type == FocusOut) {
+		printf("focus: %d\n", type);
+		key_t key = FocusIn ? key_focus : key_unfocus;
+		if ((win = win_find(dpy,ev->xfocus.window,0)))
+			wm_handle_key(win, key, MOD(), PTR());
+	}
 	else if (type == ConfigureNotify) {
-		//printf("configure: %d\n", type);
+		printf("configure: %d\n", type);
 	}
 	else if (type == MapNotify) {
-		//printf("map: %d\n", type);
-	}
-	else if (type == DestroyNotify) {
-		//printf("destory: %d\n", type);
-		win_remove(win_find(dpy,ev->xdestroywindow.window));
+		printf("map: %d\n", type);
 	}
 	else if (type == UnmapNotify) {
 		//printf("unmap: %d\n", type);
-		wm_remove(win_find(dpy,ev->xmap.window));
+		if ((win = win_find(dpy,ev->xunmap.window,0))) {
+			if (!del_strut(root, win))
+				wm_remove(win);
+			else
+				wm_update();
+			win_remove(win);
+		}
 	}
 	else if (type == ConfigureRequest) {
 		XConfigureRequestEvent *cre = &ev->xconfigurerequest;
@@ -220,6 +304,12 @@ void process_event(int type, XEvent *ev, win_t *root)
 			.x     = cre->x,     .y      = cre->y,
 			.width = cre->width, .height = cre->height,
 		};
+		if ((win = win_find(dpy,ev->xmaprequest.window,1))) {
+			wc.x      = win->x;
+			wc.y      = win->y;
+			wc.width  = win->w;
+			wc.height = win->h;
+		}
 		printf("configure_req: %d - %x, (0x%lx) %dx%d @ %d,%d\n",
 				type, (int)cre->window, cre->value_mask,
 				cre->height, cre->width, cre->x, cre->y);
@@ -227,7 +317,12 @@ void process_event(int type, XEvent *ev, win_t *root)
 	}
 	else if (type == MapRequest) {
 		printf("map_req: %d\n", type);
-		wm_insert(win_find(dpy,ev->xmaprequest.window));
+		if ((win = win_find(dpy,ev->xmaprequest.window,1))) {
+			if (!add_strut(root, win))
+				wm_insert(win);
+			else
+				wm_update();
+		}
 		XMapWindow(dpy,ev->xmaprequest.window);
 	}
 	else {
@@ -235,15 +330,38 @@ void process_event(int type, XEvent *ev, win_t *root)
 	}
 }
 
+static int xerror(Display *dpy, XErrorEvent *err)
+{
+	if (err->error_code == BadWindow ||
+	    (err->request_code == X_SetInputFocus     && err->error_code == BadMatch   ) ||
+	    (err->request_code == X_PolyText8         && err->error_code == BadDrawable) ||
+	    (err->request_code == X_PolyFillRectangle && err->error_code == BadDrawable) ||
+	    (err->request_code == X_PolySegment       && err->error_code == BadDrawable) ||
+	    (err->request_code == X_ConfigureWindow   && err->error_code == BadMatch   ) ||
+	    (err->request_code == X_GrabButton        && err->error_code == BadAccess  ) ||
+	    (err->request_code == X_GrabKey           && err->error_code == BadAccess  ) ||
+	    (err->request_code == X_CopyArea          && err->error_code == BadDrawable))
+		return 0;
+	return xerrorxlib(dpy, err);
+}
+
 /*****************
  * Sys functions *
  *****************/
 void sys_move(win_t *win, int x, int y, int w, int h)
 {
 	//printf("sys_move: %p - %d,%d  %dx%d\n", win, x, y, w, h);
-	win->x = x; win->y = y;
-	win->w = w; win->h = h;
-	XMoveResizeWindow(win->sys->dpy, win->sys->xid, x, y, w, h);
+	win->x = MAX(x,0); win->y = MAX(y,0);
+	win->w = MAX(w,1); win->h = MAX(h,1);
+	XMoveResizeWindow(win->sys->dpy, win->sys->xid,
+			win->x, win->y, win->w, win->h);
+
+	/* Flush events, so moving window doesn't cuase re-focus
+	 * There's probably a better way to do this */
+	XEvent ev;
+	XSync(win->sys->dpy, False);
+	while (XCheckMaskEvent(win->sys->dpy, EnterWindowMask|LeaveWindowMask, &ev))
+		printf("Skipping enter/leave event\n");
 }
 
 void sys_raise(win_t *win)
@@ -254,7 +372,7 @@ void sys_raise(win_t *win)
 
 void sys_focus(win_t *win)
 {
-	//printf("sys_raise: %p\n", win);
+	printf("sys_focus: %p\n", win);
 	XEvent ev = {
 		.type                 = ClientMessage,
 		.xclient.window       = win->sys->xid,
@@ -273,10 +391,19 @@ void sys_focus(win_t *win)
 void sys_watch(win_t *win, Key_t key, mod_t mod)
 {
 	//printf("sys_watch: %p - %x %hhx\n", win, key, mod);
+	XWindowAttributes attr;
+	XGetWindowAttributes(win->sys->dpy, win->sys->xid, &attr);
+	long mask = attr.your_event_mask;
 	if (key_mouse0 <= key && key <= key_mouse7)
 		XGrabButton(win->sys->dpy, btn2x(key), mod2x(mod), win->sys->xid, True,
 				mod.up ? ButtonReleaseMask : ButtonPressMask,
 				GrabModeAsync, GrabModeAsync, None, None);
+	else if (key == key_enter)
+		XSelectInput(win->sys->dpy, win->sys->xid, EnterWindowMask|mask);
+	else if (key == key_leave)
+		XSelectInput(win->sys->dpy, win->sys->xid, LeaveWindowMask|mask);
+	else if (key == key_focus || key == key_unfocus)
+		XSelectInput(win->sys->dpy, win->sys->xid, FocusChangeMask|mask);
 	else
 		XGrabKey(win->sys->dpy, XKeysymToKeycode(win->sys->dpy, key2x(key)),
 				mod2x(mod), win->sys->xid, True, GrabModeAsync, GrabModeAsync);
@@ -284,23 +411,34 @@ void sys_watch(win_t *win, Key_t key, mod_t mod)
 
 win_t *sys_init(void)
 {
-	Display *dpy = XOpenDisplay(NULL);
-	Window   xid = DefaultRootWindow(dpy);
-	atoms[wm_proto] = XInternAtom(dpy, "WM_PROTOCOLS",  False);
-	atoms[wm_focus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
-	XSelectInput(dpy, xid, SubstructureNotifyMask|SubstructureRedirectMask);
-	return win_find(dpy, xid);
+	Display *dpy;
+	Window   xid;
+	if (!(dpy = XOpenDisplay(NULL)))
+		error("Unable to get display");
+	if (!(xid = DefaultRootWindow(dpy)))
+		error("Unable to get root window");
+	atoms[wm_proto]  = XInternAtom(dpy, "WM_PROTOCOLS",  False);
+	atoms[wm_focus]  = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
+	atoms[net_strut] = XInternAtom(dpy, "_NET_WM_STRUT", False);
+	XSelectInput(dpy, xid, SubstructureRedirectMask|SubstructureNotifyMask);
+	XSetInputFocus(dpy, None, RevertToNone, CurrentTime);
+	xerrorxlib = XSetErrorHandler(xerror);
+	return win_find(dpy, xid, 1);
 }
 
 void sys_run(win_t *root)
 {
 	/* Add each initial window */
 	unsigned int nkids;
-	Window par, win, *kids = NULL;
+	Window par, xid, *kids = NULL;
 	if (XQueryTree(root->sys->dpy, root->sys->xid,
-				&par, &win, &kids, &nkids))
-		for(int i = 0; i < nkids; i++)
-			wm_insert(win_find(root->sys->dpy, kids[i]));
+				&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) && !add_strut(root,win))
+				wm_insert(win);
+		}
+	wm_update(); // For struts
 
 	/* Main loop */
 	for(;;)