qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix nogroup regression, where nogroup became an actual group - the

Browse Source 
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.
This commit is contained in:
okan 2014-08-22 19:04:00 +00:00
parent 5f423ee277
commit 9567454909
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/cwm/group.c
View File

@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: group.c,v 1.92 2014/08/20 15:15:29 okan Exp $
* $OpenBSD: group.c,v 1.93 2014/08/22 19:04:00 okan Exp $
*/
#include <sys/param.h>
@ -48,17 +48,14 @@ const char *num_to_name[] = {
static void
group_assign(struct group_ctx *gc, struct client_ctx *cc)
{
if (gc == NULL)
gc = TAILQ_FIRST(&cc->sc->groupq);
if (cc->group == gc)
return;
if (cc->group != NULL)
TAILQ_REMOVE(&cc->group->clients, cc, group_entry);
TAILQ_INSERT_TAIL(&gc->clients, cc, group_entry);
cc->group = gc;
if (cc->group != NULL)
TAILQ_INSERT_TAIL(&gc->clients, cc, group_entry);
xu_ewmh_net_wm_desktop(cc);
}
@ -354,7 +351,7 @@ group_autogroup(struct client_ctx *cc)
struct screen_ctx *sc = cc->sc;
struct autogroupwin *aw;
struct group_ctx *gc;
int num = -1, both_match = 0;
int num = -2, both_match = 0;
long *grpnum;
if (cc->ch.res_class == NULL || cc->ch.res_name == NULL)
@ -362,12 +359,9 @@ group_autogroup(struct client_ctx *cc)
if (xu_getprop(cc->win, ewmh[_NET_WM_DESKTOP],
XA_CARDINAL, 1, (unsigned char **)&grpnum) > 0) {
if (*grpnum == -1)
num = 0;
else if (*grpnum > CALMWM_NGROUPS || *grpnum < 0)
num = CALMWM_NGROUPS - 1;
else
num = *grpnum;
if (num > CALMWM_NGROUPS || num < -1)
num = CALMWM_NGROUPS - 1;
XFree(grpnum);
} else {
TAILQ_FOREACH(aw, &Conf.autogroupq, entry) {
@ -382,6 +376,11 @@ group_autogroup(struct client_ctx *cc)
}
}
if ((num == -1) || (num == 0)) {
group_assign(NULL, cc);
return;
}
TAILQ_FOREACH(gc, &sc->groupq, entry) {
if (gc->num == num) {
group_assign(gc, cc);

5
app/cwm/mousefunc.c
View File

@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: mousefunc.c,v 1.72 2014/08/20 15:15:29 okan Exp $
* $OpenBSD: mousefunc.c,v 1.73 2014/08/22 19:04:00 okan Exp $
*/
#include <sys/param.h>
@ -202,7 +202,8 @@ mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg)
if (wname == NULL)
continue;
menuq_add(&menuq, cc, "(%d) %s", cc->group->num, wname);
menuq_add(&menuq, cc, "(%d) %s",
cc->group ? cc->group->num : 0, wname);
}
if (TAILQ_EMPTY(&menuq))

4
app/cwm/search.c
View File

@ -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: search.c,v 1.38 2014/08/20 15:15:29 okan Exp $
* $OpenBSD: search.c,v 1.39 2014/08/22 19:04:00 okan Exp $
*/
#include <sys/param.h>
@ -143,7 +143,7 @@ search_print_client(struct menu *mi, int list)
cc->matchname = cc->name;
(void)snprintf(mi->print, sizeof(mi->print), "(%d) %c%s",
cc->group->num, flag, cc->matchname);
cc->group ? cc->group->num : 0, flag, cc->matchname);
if (!list && cc->matchname != cc->name &&
strlen(mi->print) < sizeof(mi->print) - 1) {

7
app/cwm/xutil.c
View File

@ -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);