From 6ccf70f82d9136844ae8f2bb68b43aa31fd09d25 Mon Sep 17 00:00:00 2001
From: okan
Date: Fri, 22 Aug 2014 19:04:00 +0000
Subject: Fix nogroup regression, where nogroup became an actual group - the
 symantics between cwm groups and ewmh got in the way.  Ensure a client that
 wants to be in nogroup stays in nogroup (thus stays in view), even when
 (re)reading NET_WM_DESKTOP.  Paritially reverts patchset 644 (2014-02-07
 13:09 PST) which deals with a NULL cc->group.  All to be revisited when
 NET_WM_STATE_STICKY hits cwm.

Reported by many; testing and ok phessler.
---
 xutil.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'xutil.c')

diff --git a/xutil.c b/xutil.c
index 64fccb0..368dc40 100644
--- a/xutil.c
+++ b/xutil.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: xutil.c,v 1.86 2014/08/20 15:15:29 okan Exp $
+ * $OpenBSD: xutil.c,v 1.87 2014/08/22 19:04:00 okan Exp $
  */
 
 #include <sys/param.h>
@@ -291,7 +291,10 @@ xu_ewmh_net_desktop_names(struct screen_ctx *sc, char *data, int n)
 void
 xu_ewmh_net_wm_desktop(struct client_ctx *cc)
 {
-	long	 num = cc->group->num;
+	long	 num = 0xffffffff;
+
+	if (cc->group)
+		num = cc->group->num;
 
 	XChangeProperty(X_Dpy, cc->win, ewmh[_NET_WM_DESKTOP],
 	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&num, 1);
-- 
cgit v1.2.3-2-gb3c3