X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sys-x11.c;h=5b043ed572665be4aaca995b01edafa56086f8d5;hb=b012ee7a79c6ebc0f6818a108629571a61e2e5a7;hp=6bc3b019246ef6ceb55768b6bbb12133d9291ab8;hpb=a7cbcfd5a5e2ded8cfc04ef6679acc8c3e227da7;p=wmpus

diff --git a/sys-x11.c b/sys-x11.c
index 6bc3b01..5b043ed 100644
--- a/sys-x11.c
+++ b/sys-x11.c
@@ -26,12 +26,14 @@
 
 #include "util.h"
 #include "conf.h"
+#include "types.h"
 #include "sys.h"
 #include "wm.h"
 
 /* Configuration */
 static int border     = 2;
 static int no_capture = 0;
+static int stack      = 25;
 
 /* Internal structures */
 struct win_sys {
@@ -59,6 +61,8 @@ typedef enum {
 } color_t;
 
 /* Global data */
+static win_t *root;
+static win_t *last;
 static int   running;
 static void *cache;
 static Atom atoms[NATOMS];
@@ -67,6 +71,17 @@ static unsigned long colors[NCOLORS];
 static list_t *screens;
 static list_t *struts;
 
+/* Debug functions */
+static char *state_map[] = {
+	[ST_HIDE ] "hide ",
+	[ST_SHOW ] "show ",
+	[ST_FULL ] "full ",
+	[ST_MAX  ] "max  ",
+	[ST_SHADE] "shade",
+	[ST_ICON ] "icon ",
+	[ST_CLOSE] "close",
+};
+
 /* Conversion functions */
 static event_map_t ev2sym[] = {
 	{EV_LEFT    , XK_Left },
@@ -220,6 +235,7 @@ static win_t *win_new(Display *dpy, Window xid)
 	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;
@@ -228,14 +244,33 @@ static win_t *win_new(Display *dpy, Window xid)
 	win->sys      = new0(win_sys_t);
 	win->sys->dpy = dpy;
 	win->sys->xid = xid;
-	if (win_prop(win, NET_TYPE) == atoms[NET_DIALOG])
-		win->type = TYPE_DIALOG;
-	if (XGetTransientForHint(dpy, xid, &trans))
-		win->parent = win_find(dpy, trans, 0);
-	printf("win_new: %p = %p, %d (%d,%d %dx%d) - %s\n",
-			win, dpy, (int)xid,
+
+	if (root) {
+		if (strut_add(root, win))
+			win->type = TYPE_TOOLBAR;
+
+		if (win_prop(win, NET_TYPE) == atoms[NET_DIALOG])
+			win->type = TYPE_DIALOG;
+
+		if (win_prop(win, NET_STATE) == atoms[NET_FULL])
+			win->state = ST_FULL;
+
+		if (XGetTransientForHint(dpy, xid, &trans))
+			win->parent = win_find(dpy, trans, 0);
+
+		XSelectInput(dpy, xid, PropertyChangeMask);
+	}
+
+	printf("win_new: win=%p x11=(%p,%d) state=%x pos=(%d,%d %dx%d) type=%s\n",
+			win, dpy, (int)xid, win->state,
 			win->x, win->y, win->w, win->h,
-			win->type ? "dialog" : "normal");
+			win->type == TYPE_NORMAL  ? "normal"  :
+			win->type == TYPE_DIALOG  ? "dialog"  :
+			win->type == TYPE_TOOLBAR ? "toolbar" : "unknown");
+
+	if (root)
+		wm_insert(win);
+
 	return win;
 }
 
@@ -266,20 +301,26 @@ static win_t *win_find(Display *dpy, Window xid, int create)
 
 static void win_free(win_t *win)
 {
+	if (win == last)
+		last = NULL;
 	free(win->sys);
 	free(win);
 }
 
 static void win_remove(win_t *win)
 {
+	if (win != root) {
+		strut_del(root, win);
+		wm_remove(win);
+	}
 	tdelete(win, &cache, win_cmp);
 	win_free(win);
 }
 
-static int win_viewable(win_t *win)
+static int win_viewable(Display *dpy, Window xid)
 {
 	XWindowAttributes attr;
-	if (XGetWindowAttributes(win->sys->dpy, win->sys->xid, &attr))
+	if (XGetWindowAttributes(dpy, xid, &attr))
 		return attr.map_state == IsViewable;
 	else
 		return True;
@@ -299,7 +340,7 @@ static int win_msg(win_t *win, atom_t msg)
 		return 0;
 
 	XSendEvent(win->sys->dpy, win->sys->xid, False, NoEventMask, &(XEvent){
-		.type                 = ClientMessage,
+		.xclient.type         = ClientMessage,
 		.xclient.window       = win->sys->xid,
 		.xclient.message_type = atoms[WM_PROTO],
 		.xclient.format       = 32,
@@ -357,11 +398,11 @@ static void process_event(int type, XEvent *xe, win_t *root)
 	if (type == KeyPress) {
 		while (XCheckTypedEvent(dpy, KeyPress, xe));
 		KeySym sym = XLookupKeysym(&xe->xkey, 0);
-		printf("got xe %c %hhx\n", xk2ev(sym), mod2int(mod));
+		//printf("got xe %c %hhx\n", xk2ev(sym), mod2int(mod));
 		wm_handle_event(win, xk2ev(sym), mod, ptr);
 	}
 	else if (type == KeyRelease) {
-		//printf("release: %d\n", type);
+		//printf("release: %lx\n", xe->xkey.window);
 	}
 	else if (type == ButtonPress) {
 		if (wm_handle_event(win, xb2ev(xe->xbutton.button), mod, ptr)) {
@@ -382,77 +423,72 @@ static void process_event(int type, XEvent *xe, win_t *root)
 		wm_handle_ptr(win, ptr);
 	}
 	else if (type == EnterNotify || type == LeaveNotify) {
-		printf("%s: %d\n", type==EnterNotify?"enter":"leave", type);
+		printf("%s: %lx\n", type==EnterNotify?"enter":"leave",
+				xe->xcrossing.window);
 		event_t ev = type == EnterNotify ? EV_ENTER : EV_LEAVE;
 		if ((win = win_find(dpy,xe->xcrossing.window,0)))
 			wm_handle_event(win, ev, MOD(), PTR());
 	}
 	else if (type == FocusIn || type == FocusOut) {
-		//printf("focus: %d\n", type);
-		event_t ev = FocusIn ? EV_FOCUS : EV_UNFOCUS;
+		//printf("focus: %lx\n", xe->xfocus.window);
+		event_t ev = type == FocusIn ? EV_FOCUS : EV_UNFOCUS;
 		if ((win = win_find(dpy,xe->xfocus.window,0)))
 			wm_handle_event(win, ev, MOD(), PTR());
 	}
 	else if (type == ConfigureNotify) {
-		printf("configure: %d\n", type);
+		//printf("configure: %lx\n", xe->xconfigure.window);
 	}
 	else if (type == MapNotify) {
-		printf("map: %d\n", type);
+		printf("map: %lx\n", xe->xmap.window);
 	}
 	else if (type == UnmapNotify) {
 		if ((win = win_find(dpy,xe->xunmap.window,0)) &&
 		     win->state != ST_HIDE) {
-			if (!strut_del(root, win))
-				wm_remove(win);
-			else
-				wm_update();
+			printf("unmap: %lx\n", xe->xunmap.window);
+			wm_handle_state(win, win->state, ST_HIDE);
 			win->state = ST_HIDE;
 		}
 	}
 	else if (type == DestroyNotify) {
-		//printf("destroy: %d\n", type);
+		printf("destroy: %lx\n", xe->xdestroywindow.window);
 		if ((win = win_find(dpy,xe->xdestroywindow.window,0)))
 			win_remove(win);
 	}
 	else if (type == ConfigureRequest) {
 		XConfigureRequestEvent *cre = &xe->xconfigurerequest;
-		printf("configure_req: %d - %x, (0x%lx) %dx%d @ %d,%d\n",
-				type, (int)cre->window, cre->value_mask,
+		printf("configure_req: %lx - (0x%lx) %dx%d @ %d,%d\n",
+				cre->window, cre->value_mask,
 				cre->height, cre->width, cre->x, cre->y);
-		if ((win = win_find(dpy,xe->xconfigurerequest.window,1))) {
+		if ((win = win_find(dpy,cre->window,1))) {
+			int border_width = (win->type == TYPE_TOOLBAR ? 0 : border);
 			XSendEvent(dpy, cre->window, False, StructureNotifyMask, &(XEvent){
-				.xconfigure.type              = ConfigureNotify,
-				.xconfigure.display           = win->sys->dpy,
-				.xconfigure.event             = win->sys->xid,
-				.xconfigure.window            = win->sys->xid,
-				.xconfigure.x                 = win->x,
-				.xconfigure.y                 = win->y,
-				.xconfigure.width             = win->w,
-				.xconfigure.height            = win->h,
-				.xconfigure.border_width      = border,
+				.xconfigure.type         = ConfigureNotify,
+				.xconfigure.display      = win->sys->dpy,
+				.xconfigure.event        = win->sys->xid,
+				.xconfigure.window       = win->sys->xid,
+				.xconfigure.x            = win->x,
+				.xconfigure.y            = win->y,
+				.xconfigure.width        = win->w,
+				.xconfigure.height       = win->h,
+				.xconfigure.border_width = border_width,
 			});
 			XSync(win->sys->dpy, False);
 		}
 	}
 	else if (type == MapRequest) {
-		printf("map_req: %d\n", type);
-		if ((win = win_find(dpy,xe->xmaprequest.window,1)) &&
-		     win->state == ST_HIDE) {
+		printf("map_req: %lx\n", xe->xmaprequest.window);
+		win = win_find(dpy,xe->xmaprequest.window,1);
+		// fixme, for hide -> max, etc
+		if (win->state == ST_HIDE) {
+			wm_handle_state(win, win->state, ST_SHOW);
 			win->state = ST_SHOW;
-			if (win_prop(win, NET_STATE) == atoms[NET_FULL])
-				win->state = ST_FULL;
-			XSelectInput(win->sys->dpy, win->sys->xid, PropertyChangeMask);
-			if (!strut_add(root, win))
-				wm_insert(win);
-			else
-				wm_update();
 		}
 		sys_show(win, win->state);
 	}
 	else if (type == ClientMessage) {
 		XClientMessageEvent *cme = &xe->xclient;
-		printf("msg: %d - %ld %ld,%ld,%ld,%ld,%ld\n",
-				type, cme->message_type,
+		printf("client_msg: %lx - %ld %ld,%ld,%ld,%ld,%ld\n",
+				cme->window, cme->message_type,
 				cme->data.l[0], cme->data.l[1], cme->data.l[2],
 				cme->data.l[3], cme->data.l[4]);
 		if ((win = win_find(dpy,cme->window,0))     &&
@@ -467,7 +503,7 @@ static void process_event(int type, XEvent *xe, win_t *root)
 		}
 	}
 	else if (type == PropertyNotify) {
-		printf("prop: %d - %d\n", type, xe->xproperty.state);
+		printf("prop: %lx - %d\n", xe->xproperty.window, xe->xproperty.state);
 	}
 	else {
 		printf("unknown event: %d\n", type);
@@ -507,6 +543,8 @@ void sys_move(win_t *win, int x, int y, int w, int h)
 	win->x = x; win->y = y;
 	win->w = MAX(w,1+b); win->h = MAX(h,1+b);
 	w      = MAX(w-b,1); h      = MAX(h-b,1);
+	XConfigureWindow(win->sys->dpy, win->sys->xid, CWX|CWY|CWWidth|CWHeight,
+		&(XWindowChanges) { .x=x, .y=y, .width=w, .height=h });
 	XMoveResizeWindow(win->sys->dpy, win->sys->xid, x, y, w, h);
 
 	/* Flush events, so moving window doesn't cause re-focus
@@ -528,15 +566,14 @@ void sys_raise(win_t *win)
 
 void sys_focus(win_t *win)
 {
-	printf("sys_focus: %p\n", win);
+	//printf("sys_focus: %p\n", win);
 
 	/* Set actual focus */
 	XSetInputFocus(win->sys->dpy, win->sys->xid,
 			RevertToPointerRoot, CurrentTime);
-	win_msg(win, WM_FOCUS);
+	//win_msg(win, WM_FOCUS);
 
 	/* Set border on focused window */
-	static win_t *last = NULL;
 	if (last)
 		XSetWindowBorder(last->sys->dpy, last->sys->xid, colors[CLR_UNFOCUS]);
 	XSync(win->sys->dpy, False);
@@ -546,50 +583,71 @@ void sys_focus(win_t *win)
 
 void sys_show(win_t *win, state_t state)
 {
-	switch (state) {
-	case ST_HIDE:
-		printf("sys_show: hide %p\n", win);
-		XUnmapWindow(win->sys->dpy, win->sys->xid);
-		break;
-	case ST_SHOW:
-		printf("sys_show: show %p\n", win);
-		if (win->state == ST_FULL)
-			sys_move(win, win->x, win->y, win->w, win->h);
-		XSetWindowBorderWidth(win->sys->dpy, win->sys->xid, border);
-		XMapWindow(win->sys->dpy, win->sys->xid);
-		XSync(win->sys->dpy, False);
-		break;
-	case ST_MAX:
-		printf("sys_show: max %p\n", win);
-		XMapWindow(win->sys->dpy, win->sys->xid);
-		break;
-	case ST_FULL:
-		printf("sys_show: full %p\n", win);
-		win_t *screen = NULL;
+	//if (win->state == state)
+	//	return;
+
+	/* Debug */
+	printf("sys_show: %p: %s -> %s\n", win,
+			state_map[win->state], state_map[state]);
+
+	/* Find screen */
+	win_t *screen = NULL;
+	if (state == ST_FULL || state == ST_MAX) {
 		for (list_t *cur = screens; cur; cur = cur->next) {
 			screen = cur->data;
 			if (win->x >= screen->x && win->x <= screen->x+screen->w &&
 			    win->y >= screen->y && win->y <= screen->y+screen->h)
 				break;
 		}
+	}
+
+	/* Update properties */
+	if (state == ST_FULL)
+		XChangeProperty(win->sys->dpy, win->sys->xid, atoms[NET_STATE], XA_ATOM, 32,
+		                PropModeReplace, (unsigned char*)&atoms[NET_FULL], 1);
+	else if (state != ST_FULL)
+		XChangeProperty(win->sys->dpy, win->sys->xid, atoms[NET_STATE], XA_ATOM, 32,
+				PropModeReplace, (unsigned char*)0, 0);
+
+	/* Update border */
+	if (win->type == TYPE_TOOLBAR || state == ST_FULL)
 		XSetWindowBorderWidth(win->sys->dpy, win->sys->xid, 0);
+	else if (state == ST_SHOW || state == ST_MAX || state == ST_SHADE)
+		XSetWindowBorderWidth(win->sys->dpy, win->sys->xid, border);
+
+	/* Map/Unmap window */
+	if (state == ST_SHOW || state == ST_FULL || state == ST_MAX || state == ST_SHADE)
 		XMapWindow(win->sys->dpy, win->sys->xid);
-		XMoveResizeWindow(win->sys->dpy, win->sys->xid,
-			screen->x - screen->sys->strut.left,
-			screen->y - screen->sys->strut.top,
-			screen->w + screen->sys->strut.left + screen->sys->strut.right,
-			screen->h + screen->sys->strut.top  + screen->sys->strut.bottom);
+	else if (state == ST_HIDE)
+		XUnmapWindow(win->sys->dpy, win->sys->xid);
+
+	/* Resize windows */
+	if (state == ST_SHOW) {
+		sys_move(win, win->x, win->y, win->w, win->h);
+	} else if (state == ST_MAX) {
+		sys_move(win, screen->x, screen->y, screen->w, screen->h);
+	} else if (state == ST_FULL) {
+		XWindowChanges wc = {
+			.x      = screen->x - screen->sys->strut.left ,
+			.y      = screen->y - screen->sys->strut.top ,
+			.width  = screen->w + screen->sys->strut.left + screen->sys->strut.right,
+			.height = screen->h + screen->sys->strut.top  + screen->sys->strut.bottom
+		};
+		win->x = wc.x;     win->y = wc.y;
+		win->w = wc.width; win->h = wc.height;
+		XConfigureWindow(win->sys->dpy, win->sys->xid, CWX|CWY|CWWidth|CWHeight, &wc);
+		XMoveResizeWindow(win->sys->dpy, win->sys->xid, wc.x, wc.y, wc.width, wc.height);
+	} else if (state == ST_SHADE) {
+		XConfigureWindow(win->sys->dpy, win->sys->xid, CWHeight,
+			&(XWindowChanges) { .height = stack });
+	}
+
+	/* Raise window */
+	if (state == ST_FULL || state == ST_MAX)
 		XRaiseWindow(win->sys->dpy, win->sys->xid);
-		break;
-	case ST_SHADE:
-		printf("sys_show: shade %p\n", win);
-		XMapWindow(win->sys->dpy, win->sys->xid);
-		break;
-	case ST_ICON:
-		printf("sys_show: icon %p\n", win);
-		break;
-	case ST_CLOSE:
-		printf("sys_show: close %p\n", win);
+
+	/* Close windows */
+	if (state == ST_CLOSE) {
 		if (!win_msg(win, WM_DELETE)) {
 			XGrabServer(win->sys->dpy);
 			XSetErrorHandler(xnoerror);
@@ -599,15 +657,17 @@ void sys_show(win_t *win, state_t state)
 			XSetErrorHandler(xerror);
 			XUngrabServer(win->sys->dpy);
 		}
-		XDestroyWindow(win->sys->dpy, win->sys->xid);
-		break;
 	}
+
+	/* Update state */
 	win->state = state;
 }
 
 void sys_watch(win_t *win, event_t ev, mod_t mod)
 {
 	//printf("sys_watch: %p - %x %hhx\n", win, ev, mod);
+	if (win == NULL)
+		win = root;
 	XWindowAttributes attr;
 	XGetWindowAttributes(win->sys->dpy, win->sys->xid, &attr);
 	long mask = attr.your_event_mask;
@@ -628,19 +688,21 @@ void sys_watch(win_t *win, event_t ev, mod_t mod)
 
 void sys_unwatch(win_t *win, event_t ev, mod_t mod)
 {
+	if (win == NULL)
+		win = root;
 	if (EV_MOUSE0 <= ev && ev <= EV_MOUSE7)
 		XUngrabButton(win->sys->dpy, ev2xb(ev), mod2x(mod), win->sys->xid);
 }
 
-list_t *sys_info(win_t *win)
+list_t *sys_info(void)
 {
 	/* Use global copy of screens so we can add struts */
 	if (screens == NULL) {
 		/* Add Xinerama screens */
 		int n = 0;
 		XineramaScreenInfo *info = NULL;
-		if (XineramaIsActive(win->sys->dpy))
-			info = XineramaQueryScreens(win->sys->dpy, &n);
+		if (XineramaIsActive(root->sys->dpy))
+			info = XineramaQueryScreens(root->sys->dpy, &n);
 		for (int i = 0; i < n; i++) {
 			win_t *screen = new0(win_t);
 			screen->x = info[i].x_org;
@@ -654,18 +716,19 @@ list_t *sys_info(win_t *win)
 	if (screens == NULL) {
 		/* No xinerama support */
 		win_t *screen = new0(win_t);
-		*screen = *win;
+		*screen = *root;
 		screens = list_insert(NULL, screen);
 	}
 	return screens;
 }
 
-win_t *sys_init(void)
+void sys_init(void)
 {
 	Display *dpy;
 	Window   xid;
 
 	/* Load configuration */
+	stack      = conf_get_int("main.stack",      stack);
 	border     = conf_get_int("main.border",     border);
 	no_capture = conf_get_int("main.no-capture", no_capture);
 
@@ -694,10 +757,10 @@ win_t *sys_init(void)
 	XSelectInput(dpy, xid, SubstructureRedirectMask|SubstructureNotifyMask);
 	xerrorxlib = XSetErrorHandler(xerror);
 
-	return win_find(dpy, xid, 1);
+	root = win_find(dpy, xid, 1);
 }
 
-void sys_run(win_t *root)
+void sys_run(void)
 {
 	/* Add each initial window */
 	if (!no_capture) {
@@ -705,14 +768,11 @@ void sys_run(win_t *root)
 		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);
-			}
+			for(int i = 0; i < nkids; i++)
+				if (win_viewable(root->sys->dpy, kids[i]))
+					win_find(root->sys->dpy, kids[i], 1);
 			XFree(kids);
 		}
-		wm_update(); // For struts
 	}
 
 	/* Main loop */
@@ -730,7 +790,7 @@ void sys_exit(void)
 	running = 0;
 }
 
-void sys_free(win_t *root)
+void sys_free(void)
 {
 	XCloseDisplay(root->sys->dpy);
 	while (screens) {