mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

Get rid of a redundant array of groups per screen; we already have a

Browse Source 
link to the group queue for each screen.
This commit is contained in:
okan 2014-09-07 17:27:20 +00:00
parent f7af0ebd72
commit 78e0f21225
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calmwm.h
View File

@ -240,7 +240,6 @@ struct screen_ctx {
XftDraw *xftdraw; XftDraw *xftdraw;
XftFont *xftfont; XftFont *xftfont;
#define CALMWM_NGROUPS 10 #define CALMWM_NGROUPS 10
struct group_ctx groups[CALMWM_NGROUPS];
struct group_ctx_q groupq; struct group_ctx_q groupq;
int group_hideall; int group_hideall;
struct group_ctx *group_active; struct group_ctx *group_active;

28
group.c
View File

@ -116,16 +116,18 @@ group_restack(struct screen_ctx *sc, struct group_ctx *gc)
void void
group_init(struct screen_ctx *sc) group_init(struct screen_ctx *sc)
{ {
struct group_ctx *gc;
int i; int i;
TAILQ_INIT(&sc->groupq); TAILQ_INIT(&sc->groupq);
sc->group_hideall = 0; sc->group_hideall = 0;
for (i = 0; i < CALMWM_NGROUPS; i++) { for (i = 0; i < CALMWM_NGROUPS; i++) {
TAILQ_INIT(&sc->groups[i].clients); gc = xcalloc(1, sizeof(*gc));
sc->groups[i].name = xstrdup(num_to_name[i]); TAILQ_INIT(&gc->clients);
sc->groups[i].num = i; gc->name = xstrdup(num_to_name[i]);
TAILQ_INSERT_TAIL(&sc->groupq, &sc->groups[i], entry); gc->num = i;
TAILQ_INSERT_TAIL(&sc->groupq, gc, entry);
} }
xu_ewmh_net_desktop_names(sc); xu_ewmh_net_desktop_names(sc);
@ -140,7 +142,13 @@ group_init(struct screen_ctx *sc)
static void static void
group_setactive(struct screen_ctx *sc, long idx) group_setactive(struct screen_ctx *sc, long idx)
{ {
sc->group_active = &sc->groups[idx]; struct group_ctx *gc;
TAILQ_FOREACH(gc, &sc->groupq, entry) {
if (gc->num == idx)
break;
}
sc->group_active = gc;
xu_ewmh_net_current_desktop(sc, idx); xu_ewmh_net_current_desktop(sc, idx);
} }
@ -154,7 +162,10 @@ group_movetogroup(struct client_ctx *cc, int idx)
if (idx < 0 || idx >= CALMWM_NGROUPS) if (idx < 0 || idx >= CALMWM_NGROUPS)
errx(1, "group_movetogroup: index out of range (%d)", idx); errx(1, "group_movetogroup: index out of range (%d)", idx);
gc = &sc->groups[idx]; TAILQ_FOREACH(gc, &sc->groupq, entry) {
if (gc->num == idx)
break;
}
if (cc->group == gc) if (cc->group == gc)
return; return;
@ -220,7 +231,10 @@ group_hidetoggle(struct screen_ctx *sc, int idx)
if (idx < 0 || idx >= CALMWM_NGROUPS) if (idx < 0 || idx >= CALMWM_NGROUPS)
errx(1, "group_hidetoggle: index out of range (%d)", idx); errx(1, "group_hidetoggle: index out of range (%d)", idx);
gc = &sc->groups[idx]; TAILQ_FOREACH(gc, &sc->groupq, entry) {
if (gc->num == idx)
break;
}
if (group_hidden_state(gc)) if (group_hidden_state(gc))
group_show(sc, gc); group_show(sc, gc);