From d9cc60a205b505b847d97d04405c8c4f3c4816e5 Mon Sep 17 00:00:00 2001 From: Martin Duquesnoy Date: Sat, 4 Jun 2011 12:51:58 +0200 Subject: [PATCH] Wmfs: Replace _WMFS_ISFREE by _WMFS_FLAGS for clients win prop --- src/client.c | 4 ++-- src/wmfs.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/client.c b/src/client.c index daa126b..ab1888c 100644 --- a/src/client.c +++ b/src/client.c @@ -1085,9 +1085,9 @@ client_update_attributes(Client *c) XChangeProperty(dpy, c->win, ATOM("_WMFS_SCREEN"), XA_CARDINAL, 32, PropModeReplace, (uchar*)&(c->screen), 1); - f = (c->flags & FreeFlag); + f = c->flags; - XChangeProperty(dpy, c->win, ATOM("_WMFS_ISFREE"), XA_CARDINAL, 32, + XChangeProperty(dpy, c->win, ATOM("_WMFS_FLAGS"), XA_CARDINAL, 32, PropModeReplace, (uchar*)&f, 1); return; diff --git a/src/wmfs.c b/src/wmfs.c index ca646f9..3bab12e 100644 --- a/src/wmfs.c +++ b/src/wmfs.c @@ -232,7 +232,7 @@ scan(void) XWindowAttributes wa; Window usl, usl2, *w = NULL; Atom rt; - int s, rf, tag = -1, screen = -1, free = -1, i; + int s, rf, tag = -1, screen = -1, flags = -1, i; ulong ir, il; uchar *ret; Client *c; @@ -260,10 +260,10 @@ scan(void) XFree(ret); } - if(XGetWindowProperty(dpy, w[i], ATOM("_WMFS_ISFREE"), 0, 32, + if(XGetWindowProperty(dpy, w[i], ATOM("_WMFS_FLAGS"), 0, 32, False, XA_CARDINAL, &rt, &rf, &ir, &il, &ret) == Success && ret) { - free = *ret; + flags = *ret; XFree(ret); } @@ -273,8 +273,8 @@ scan(void) c->tag = tag; if(screen != -1 && screen <= s - 1) c->screen = screen; - if(free != -1) - c->flags |= (free) ? FreeFlag : 0; + if(flags != -1) + c->flags = flags; client_update_attributes(c); }