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

diff --git a/sys-x11.c b/sys-x11.c
index c4a08ff..5b043ed 100644
--- a/sys-x11.c
+++ b/sys-x11.c
@@ -26,6 +26,7 @@
 
 #include "util.h"
 #include "conf.h"
+#include "types.h"
 #include "sys.h"
 #include "wm.h"
 
@@ -61,6 +62,7 @@ typedef enum {
 
 /* Global data */
 static win_t *root;
+static win_t *last;
 static int   running;
 static void *cache;
 static Atom atoms[NATOMS];
@@ -69,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 },
@@ -288,6 +301,8 @@ 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);
 }
@@ -444,17 +459,18 @@ static void process_event(int type, XEvent *xe, win_t *root)
 		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);
 		}
@@ -482,7 +498,6 @@ static void process_event(int type, XEvent *xe, win_t *root)
 			state_t next = (cme->data.l[0] == 1 || /* _NET_WM_STATE_ADD    */
 			               (cme->data.l[0] == 2 && /* _NET_WM_STATE_TOGGLE */
 			                win->state != ST_FULL)) ? ST_FULL : ST_SHOW;
-			printf("client_msg: fullscreen %x -> %x", win->state, next);
 			wm_handle_state(win, win->state, next);
 			sys_show(win, next);
 		}
@@ -528,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
@@ -557,7 +574,6 @@ void sys_focus(win_t *win)
 	//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);
@@ -567,59 +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);
-		XConfigureWindow(win->sys->dpy, win->sys->xid,
-			CWX|CWY|CWWidth|CWHeight, &(XWindowChanges) {
-				.x      = win->x,
-				.y      = win->y,
-				.width  = win->w,
-				.height = win->h,
-		});
-		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);
-		XRaiseWindow(win->sys->dpy, win->sys->xid);
-		break;
-	case ST_SHADE:
-		printf("sys_show: shade %p\n", win);
+	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 });
-		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);
+			&(XWindowChanges) { .height = stack });
+	}
+
+	/* Raise window */
+	if (state == ST_FULL || state == ST_MAX)
+		XRaiseWindow(win->sys->dpy, win->sys->xid);
+
+	/* Close windows */
+	if (state == ST_CLOSE) {
 		if (!win_msg(win, WM_DELETE)) {
 			XGrabServer(win->sys->dpy);
 			XSetErrorHandler(xnoerror);
@@ -629,14 +657,17 @@ void sys_show(win_t *win, state_t state)
 			XSetErrorHandler(xerror);
 			XUngrabServer(win->sys->dpy);
 		}
-		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;
@@ -657,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;
@@ -683,13 +716,13 @@ 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;
@@ -724,10 +757,10 @@ win_t *sys_init(void)
 	XSelectInput(dpy, xid, SubstructureRedirectMask|SubstructureNotifyMask);
 	xerrorxlib = XSetErrorHandler(xerror);
 
-	return root = 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) {
@@ -757,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) {