wmii

commit 88d2cc22d48196eb7f408081c1b08b963b9bbf21
parent 753daa7b21310e3c268fdb78b20bab3cdbe772ab
Author: garbeam <garbeam@mmv.wmii.de>
Date:   Mon, 12 Dec 2005 00:52:04 +0200

fixed detach issue


Diffstat:
cmd/wm/area.c
 | 
1
-
cmd/wm/client.c
 | 
16
+---------------
cmd/wm/event.c
 | 
8
++++++--
cmd/wm/wm.h
 | 
5
+++--

4 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/cmd/wm/area.c b/cmd/wm/area.c
@@ -123,7 +123,6 @@ static void iter_after_write_area(void *item, void *aux)
 		if (l) {
 			a->layout->deinit(a);
 			a->layout = l;
-			XSync(dpy, False);
 			a->layout->init(a);
 		}
 		draw_page(a->page);
diff --git a/cmd/wm/client.c b/cmd/wm/client.c
@@ -25,7 +25,6 @@ Client *alloc_client(Window w)
 	c->file[C_NAME] = wmii_create_ixpfile(ixps, buf, buf2);
 	id++;
 	cext_attach_item(&clients, c);
-	XSelectInput(dpy, c->win, CLIENT_MASK);
 	return c;
 }
 
@@ -52,9 +51,7 @@ void set_client_state(Client * c, int state)
 
 void show_client(Client * c)
 {
-	XSelectInput(dpy, c->win, CLIENT_MASK & ~StructureNotifyMask);
 	XMapWindow(dpy, c->win);
-	XSelectInput(dpy, c->win, CLIENT_MASK);
 	set_client_state(c, NormalState);
 	grab_client(c, Mod1Mask, Button1);
 	grab_client(c, Mod1Mask, Button3);
@@ -63,22 +60,18 @@ void show_client(Client * c)
 void hide_client(Client * c)
 {
 	ungrab_client(c, AnyModifier, AnyButton);
-	XSelectInput(dpy, c->win, CLIENT_MASK & ~StructureNotifyMask);
 	XUnmapWindow(dpy, c->win);
-	XSelectInput(dpy, c->win, CLIENT_MASK);
 	set_client_state(c, WithdrawnState);
 }
 
 void reparent_client(Client * c, Window w, int x, int y)
 {
-	XSelectInput(dpy, c->win, CLIENT_MASK & ~StructureNotifyMask);
 	XReparentWindow(dpy, c->win, w, x, y);
-	XSelectInput(dpy, c->win, CLIENT_MASK);
+	c->ignore_unmap++;
 }
 
 void grab_client(Client * c, unsigned long mod, unsigned int button)
 {
-	XSelectInput(dpy, c->win, CLIENT_MASK & ~StructureNotifyMask);
 	XGrabButton(dpy, button, mod, c->win, False,
 				ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None);
 	if ((mod != AnyModifier) && num_lock_mask) {
@@ -87,20 +80,15 @@ void grab_client(Client * c, unsigned long mod, unsigned int button)
 		XGrabButton(dpy, button, mod | num_lock_mask | LockMask, c->win, False, ButtonPressMask,
 					GrabModeAsync, GrabModeAsync, None, None);
 	}
-	XSelectInput(dpy, c->win, CLIENT_MASK);
-	XSync(dpy, False);
 }
 
 void ungrab_client(Client * c, unsigned long mod, unsigned int button)
 {
-	XSelectInput(dpy, c->win, CLIENT_MASK & ~StructureNotifyMask);
 	XUngrabButton(dpy, button, mod, c->win);
 	if (mod != AnyModifier && num_lock_mask) {
 		XUngrabButton(dpy, button, mod | num_lock_mask, c->win);
 		XUngrabButton(dpy, button, mod | num_lock_mask | LockMask, c->win);
 	}
-	XSelectInput(dpy, c->win, CLIENT_MASK);
-	XSync(dpy, False);
 }
 
 void configure_client(Client * c)
@@ -124,7 +112,6 @@ void configure_client(Client * c)
 	XSelectInput(dpy, c->win, CLIENT_MASK & ~StructureNotifyMask);
 	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *) & e);
 	XSelectInput(dpy, c->win, CLIENT_MASK);
-	XSync(dpy, False);
 }
 
 void close_client(Client * c)
@@ -144,7 +131,6 @@ void init_client(Client * c, XWindowAttributes * wa)
 	c->rect.width = wa->width + 2 * c->border;
 	c->rect.height = wa->height + 2 * c->border;
 	XSetWindowBorderWidth(dpy, c->win, 0);
-	XSelectInput(dpy, c->win, PropertyChangeMask);
 	c->proto = win_proto(c->win);
 	XGetTransientForHint(dpy, c->win, &c->trans);
 	/* size hints */
diff --git a/cmd/wm/event.c b/cmd/wm/event.c
@@ -238,8 +238,12 @@ static void handle_unmapnotify(XEvent * e)
 	Client *c;
 	fprintf(stderr, "%s\n", "handle_unmapnotify");
 	handle_ignore_enternotify_crap(e);
-	if ((c = win_to_client(ev->window)))
-		detach_client(c, True);
+	if ((c = win_to_client(ev->window))) {
+		if (!c->ignore_unmap)
+			detach_client(c, True);
+		else
+			c->ignore_unmap--;
+	}
 }
 
 static void handle_enternotify(XEvent * e)
diff --git a/cmd/wm/wm.h b/cmd/wm/wm.h
@@ -95,8 +95,8 @@ enum {
 #define LAYOUT                 "float"
 #define GAP                    5
 
-#define ROOT_MASK              (SubstructureRedirectMask | SubstructureNotifyMask | ButtonPressMask | ButtonReleaseMask)
-#define CLIENT_MASK            (SubstructureNotifyMask | PropertyChangeMask | EnterWindowMask)
+#define ROOT_MASK              (SubstructureRedirectMask | ButtonPressMask | ButtonReleaseMask)
+#define CLIENT_MASK            (StructureNotifyMask | PropertyChangeMask | EnterWindowMask)
 
 typedef struct Page Page;
 typedef struct Layout Layout;
@@ -146,6 +146,7 @@ struct Client {
 	Area *area;
 	int proto;
 	unsigned int border;
+	unsigned int ignore_unmap;
 	Bool destroyed;
 	Window win;
 	Window trans;