-- cgit 1.4.1 From 98d8483d358747ad006cb37a9f29fc96e10a8827 Mon Sep 17 00:00:00 2001 From: okan Date: Thu, 6 Feb 2014 20:58:46 +0000 Subject: Some clients set the urgency flag even if they are the active client; prevent annoying behavior by only setting the cwm urgency flag if the client is not active; diff from Thomas Adam. --- client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client.c b/client.c index 1cb0021..6fa7c1b 100644 --- a/client.c +++ b/client.c @@ -491,7 +491,8 @@ client_unhide(struct client_ctx *cc) void client_urgency(struct client_ctx *cc) { - cc->flags |= CLIENT_URGENCY; + if (!cc->active) + cc->flags |= CLIENT_URGENCY; } void -- cgit 1.4.1 From 3cb81ebeead55a21f679f54e1a4105dccb2a613c Mon Sep 17 00:00:00 2001 From: okan Date: Fri, 7 Feb 2014 18:09:54 +0000 Subject: If _NET_WM_DESKTOP is set to -1 during client creation, place the client into group 0 (nogroup); solves problem initially discovered by oga@nicotinebsd with tint2. A clientmessage *after* client creation already handles this case. Go further and assign every client to a group; in non-sticky mode, group 0 (nogroup) and sticky mode, the active group. In both cases, autogroup will override the group assignment. Removing a group from a client always places the client back into group 0 (nogroup). Autogroup can also assign a client to group 0 (nogroup) to keep a client always visible (unless of course one opts to hide all clients). --- group.c | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/group.c b/group.c index 70bd8b6..e993b91 100644 --- a/group.c +++ b/group.c @@ -32,8 +32,7 @@ #include "calmwm.h" -static void group_add(struct group_ctx *, struct client_ctx *); -static void group_remove(struct client_ctx *); +static void group_assign(struct group_ctx *, struct client_ctx *); static void group_hide(struct screen_ctx *, struct group_ctx *); static void group_show(struct screen_ctx *, struct group_ctx *); static void group_fix_hidden_state(struct group_ctx *); @@ -46,11 +45,10 @@ const char *shortcut_to_name[] = { }; static void -group_add(struct group_ctx *gc, struct client_ctx *cc) +group_assign(struct group_ctx *gc, struct client_ctx *cc) { - if (cc == NULL || gc == NULL) - errx(1, "group_add: a ctx is NULL"); - + if (gc == NULL) + gc = TAILQ_FIRST(&cc->sc->groupq); if (cc->group == gc) return; @@ -63,18 +61,6 @@ group_add(struct group_ctx *gc, struct client_ctx *cc) xu_ewmh_net_wm_desktop(cc); } -static void -group_remove(struct client_ctx *cc) -{ - if (cc == NULL || cc->group == NULL) - errx(1, "group_remove: a ctx is NULL"); - - TAILQ_REMOVE(&cc->group->clients, cc, group_entry); - cc->group = NULL; - - xu_ewmh_net_wm_desktop(cc); -} - static void group_hide(struct screen_ctx *sc, struct group_ctx *gc) { @@ -186,7 +172,7 @@ group_movetogroup(struct client_ctx *cc, int idx) client_hide(cc); gc->nhidden++; } - group_add(gc, cc); + group_assign(gc, cc); } /* @@ -199,10 +185,10 @@ group_sticky_toggle_enter(struct client_ctx *cc) struct group_ctx *gc = sc->group_active; if (gc == cc->group) { - group_remove(cc); + group_assign(NULL, cc); cc->flags |= CLIENT_UNGROUP; } else { - group_add(gc, cc); + group_assign(gc, cc); cc->flags |= CLIENT_GROUP; } @@ -369,7 +355,7 @@ group_autogroup(struct client_ctx *cc) if (xu_getprop(cc->win, ewmh[_NET_WM_DESKTOP], XA_CARDINAL, 1, (unsigned char **)&grpno) > 0) { - if (*grpno == 0xffffffff) + if (*grpno == -1) no = 0; else if (*grpno > CALMWM_NGROUPS || *grpno < 0) no = CALMWM_NGROUPS - 1; @@ -389,19 +375,17 @@ group_autogroup(struct client_ctx *cc) } } - /* no group please */ - if (no == 0) - return; - TAILQ_FOREACH(gc, &sc->groupq, entry) { if (gc->shortcut == no) { - group_add(gc, cc); + group_assign(gc, cc); return; } } if (Conf.flags & CONF_STICKY_GROUPS) - group_add(sc->group_active, cc); + group_assign(sc->group_active, cc); + else + group_assign(NULL, cc); } void -- cgit 1.4.1 From 2a87320bbf34457b79c55ad95d92a5eda4465073 Mon Sep 17 00:00:00 2001 From: okan Date: Fri, 7 Feb 2014 21:59:56 +0000 Subject: all mapped clients now should have a group, so simplify some cases --- mousefunc.c | 2 +- search.c | 2 +- xutil.c | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/mousefunc.c b/mousefunc.c index 6fdf4f4..e2b5766 100644 --- a/mousefunc.c +++ b/mousefunc.c @@ -203,7 +203,7 @@ mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg) continue; menuq_add(&menuq, cc, "(%d) %s", - cc->group ? cc->group->shortcut : 0, wname); + cc->group->shortcut, wname); } if (TAILQ_EMPTY(&menuq)) diff --git a/search.c b/search.c index 1346199..1e43d20 100644 --- a/search.c +++ b/search.c @@ -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 ? cc->group->shortcut : 0, flag, cc->matchname); + cc->group->shortcut, flag, cc->matchname); if (!list && cc->matchname != cc->name && strlen(mi->print) < sizeof(mi->print) - 1) { diff --git a/xutil.c b/xutil.c index 43c64fb..b7df70f 100644 --- a/xutil.c +++ b/xutil.c @@ -291,11 +291,7 @@ xu_ewmh_net_desktop_names(struct screen_ctx *sc, char *data, int n) void xu_ewmh_net_wm_desktop(struct client_ctx *cc) { - struct group_ctx *gc = cc->group; - long no = 0xffffffff; - - if (gc) - no = gc->shortcut; + int no = cc->group->shortcut; XChangeProperty(X_Dpy, cc->win, ewmh[_NET_WM_DESKTOP], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&no, 1); -- cgit 1.4.1 From 1208225fbde43db8858e4d0c26ac6bac6f27166d Mon Sep 17 00:00:00 2001 From: okan Date: Sat, 8 Feb 2014 02:40:43 +0000 Subject: Replace a few hand rolled loops with like tailq loops. --- group.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/group.c b/group.c index e993b91..0505934 100644 --- a/group.c +++ b/group.c @@ -244,16 +244,16 @@ group_hidetoggle(struct screen_ctx *sc, int idx) void group_only(struct screen_ctx *sc, int idx) { - int i; + struct group_ctx *gc; if (idx < 0 || idx >= CALMWM_NGROUPS) errx(1, "group_only: index out of range (%d)", idx); - for (i = 0; i < CALMWM_NGROUPS; i++) { - if (i == idx) - group_show(sc, &sc->groups[i]); + TAILQ_FOREACH(gc, &sc->groupq, entry) { + if (gc->shortcut == idx) + group_show(sc, gc); else - group_hide(sc, &sc->groups[i]); + group_hide(sc, gc); } } @@ -300,18 +300,15 @@ group_menu(struct screen_ctx *sc) struct group_ctx *gc; struct menu *mi; struct menu_q menuq; - int i; TAILQ_INIT(&menuq); - for (i = 0; i < CALMWM_NGROUPS; i++) { - gc = &sc->groups[i]; - + TAILQ_FOREACH(gc, &sc->groupq, entry) { if (TAILQ_EMPTY(&gc->clients)) continue; menuq_add(&menuq, gc, gc->hidden ? "%d: [%s]" : "%d: %s", - gc->shortcut, sc->group_names[i]); + gc->shortcut, sc->group_names[gc->shortcut]); } if (TAILQ_EMPTY(&menuq)) @@ -329,16 +326,15 @@ group_menu(struct screen_ctx *sc) void group_alltoggle(struct screen_ctx *sc) { - int i; + struct group_ctx *gc; - for (i = 0; i < CALMWM_NGROUPS; i++) { + TAILQ_FOREACH(gc, &sc->groupq, entry) { if (sc->group_hideall) - group_show(sc, &sc->groups[i]); + group_show(sc, gc); else - group_hide(sc, &sc->groups[i]); + group_hide(sc, gc); } - - sc->group_hideall = (!sc->group_hideall); + sc->group_hideall = !sc->group_hideall; } void -- cgit 1.4.1