diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2014-08-22 19:04:01 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2014-08-22 19:04:01 +0000 |
| commit | 99e27544e338cde2b39f572146ff701878df4084 (patch) | |
| tree | 72499be91a3369553c27af8bb16e38279d76200c /app/cwm/xutil.c | |
| parent | c3dfffd5e1e523ad25370dba367ddd1ce0f68c19 (diff) | |
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.
Diffstat (limited to 'app/cwm/xutil.c')
| -rw-r--r-- | app/cwm/xutil.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/cwm/xutil.c b/app/cwm/xutil.c index 64fccb00c..368dc404f 100644 --- a/app/cwm/xutil.c +++ b/app/cwm/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); |