From cc705a51334b3e74ea49b2f45be394d9d310f39b Mon Sep 17 00:00:00 2001 From: Ivan Kanakarakis Date: Fri, 14 Sep 2012 04:00:09 +0300 Subject: Revert "add support for WM_STATE atom and WithdrawnState for windows" This reverts commit 5b32f2d7ff63b26287c29a80c1d7cf9a3bcd1ab5. This patch was a total failure. WM_STATE and WithdrawnState were introduced to handle withdrawn windows. After some thought, it seems this is not really needed. --- monsterwm.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/monsterwm.c b/monsterwm.c index 1ac2b2a..e992d31 100644 --- a/monsterwm.c +++ b/monsterwm.c @@ -20,7 +20,7 @@ enum { RESIZE, MOVE }; enum { TILE, MONOCLE, BSTACK, GRID, FLOAT, MODES }; -enum { WM_PROTOCOLS, WM_STATE, WM_DELETE_WINDOW, WM_COUNT }; +enum { WM_PROTOCOLS, WM_DELETE_WINDOW, WM_COUNT }; enum { NET_SUPPORTED, NET_FULLSCREEN, NET_WM_STATE, NET_ACTIVE, NET_COUNT }; /** @@ -971,7 +971,6 @@ void setup(void) { XFreeModifiermap(modmap); /* set up atoms for dialog/notification windows */ - wmatoms[WM_STATE] = XInternAtom(dis, "WM_STATE", False); wmatoms[WM_PROTOCOLS] = XInternAtom(dis, "WM_PROTOCOLS", False); wmatoms[WM_DELETE_WINDOW] = XInternAtom(dis, "WM_DELETE_WINDOW", False); netatoms[NET_SUPPORTED] = XInternAtom(dis, "_NET_SUPPORTED", False); @@ -1095,11 +1094,7 @@ void tile(Desktop *d) { void unmapnotify(XEvent *e) { Desktop *d = NULL; Client *c = NULL; - int i; unsigned long l; unsigned char *state = NULL; Atom a; - - if (((XGetWindowProperty(dis, e->xunmap.window, wmatoms[WM_STATE], 0L, 2L, False, wmatoms[WM_STATE], - &a, &i, &l, &l, (unsigned char **)&state) == Success && state == WithdrawnState) || - e->xunmap.send_event) && wintoclient(e->xunmap.window, &c, &d)) removeclient(c, d); + if (e->xunmap.send_event && wintoclient(e->xunmap.window, &c, &d)) removeclient(c, d); } /** -- cgit v1.3.1