all mapped clients now should have a group, so simplify some cases

This commit is contained in:
okan 2014-02-07 21:59:56 +00:00
parent 3cb81ebeea
commit 2a87320bbf
3 changed files with 3 additions and 7 deletions

View File

@ -203,7 +203,7 @@ mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg)
continue; continue;
menuq_add(&menuq, cc, "(%d) %s", menuq_add(&menuq, cc, "(%d) %s",
cc->group ? cc->group->shortcut : 0, wname); cc->group->shortcut, wname);
} }
if (TAILQ_EMPTY(&menuq)) if (TAILQ_EMPTY(&menuq))

View File

@ -143,7 +143,7 @@ search_print_client(struct menu *mi, int list)
cc->matchname = cc->name; cc->matchname = cc->name;
(void)snprintf(mi->print, sizeof(mi->print), "(%d) %c%s", (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 && if (!list && cc->matchname != cc->name &&
strlen(mi->print) < sizeof(mi->print) - 1) { strlen(mi->print) < sizeof(mi->print) - 1) {

View File

@ -291,11 +291,7 @@ xu_ewmh_net_desktop_names(struct screen_ctx *sc, char *data, int n)
void void
xu_ewmh_net_wm_desktop(struct client_ctx *cc) xu_ewmh_net_wm_desktop(struct client_ctx *cc)
{ {
struct group_ctx *gc = cc->group; int no = cc->group->shortcut;
long no = 0xffffffff;
if (gc)
no = gc->shortcut;
XChangeProperty(X_Dpy, cc->win, ewmh[_NET_WM_DESKTOP], XChangeProperty(X_Dpy, cc->win, ewmh[_NET_WM_DESKTOP],
XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&no, 1); XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&no, 1);