diff options
-rw-r--r-- | calmwm.h | 8 | ||||
-rw-r--r-- | group.c | 13 | ||||
-rw-r--r-- | screen.c | 9 |
3 files changed, 15 insertions, 15 deletions
diff --git a/calmwm.h b/calmwm.h index dd8a782..03d7a85 100644 --- a/calmwm.h +++ b/calmwm.h @@ -229,19 +229,19 @@ struct screen_ctx { Window rootwin; Window menuwin; int cycling; + int hideall; int snapdist; struct geom view; /* viewable area */ struct geom work; /* workable area, gap-applied */ struct gap gap; struct client_ctx_q clientq; struct region_ctx_q regionq; - XftColor xftcolor[CWM_COLOR_NITEMS]; - XftDraw *xftdraw; - XftFont *xftfont; #define CALMWM_NGROUPS 10 struct group_ctx_q groupq; - int group_hideall; struct group_ctx *group_active; + XftColor xftcolor[CWM_COLOR_NITEMS]; + XftDraw *xftdraw; + XftFont *xftfont; }; TAILQ_HEAD(screen_ctx_q, screen_ctx); diff --git a/group.c b/group.c index ce5a504..7d05861 100644 --- a/group.c +++ b/group.c @@ -119,9 +119,6 @@ group_init(struct screen_ctx *sc) struct group_ctx *gc; int i; - TAILQ_INIT(&sc->groupq); - sc->group_hideall = 0; - for (i = 0; i < CALMWM_NGROUPS; i++) { gc = xcalloc(1, sizeof(*gc)); gc->sc = sc; @@ -131,12 +128,6 @@ group_init(struct screen_ctx *sc) TAILQ_INSERT_TAIL(&sc->groupq, gc, entry); } - xu_ewmh_net_desktop_names(sc); - xu_ewmh_net_wm_desktop_viewport(sc); - xu_ewmh_net_wm_number_of_desktops(sc); - xu_ewmh_net_showing_desktop(sc); - xu_ewmh_net_virtual_roots(sc); - group_setactive(sc, 1); } @@ -315,12 +306,12 @@ group_alltoggle(struct screen_ctx *sc) struct group_ctx *gc; TAILQ_FOREACH(gc, &sc->groupq, entry) { - if (sc->group_hideall) + if (sc->hideall) group_show(gc); else group_hide(gc); } - sc->group_hideall = !sc->group_hideall; + sc->hideall = !sc->hideall; } void diff --git a/screen.c b/screen.c index 3c7c41b..9beabb2 100644 --- a/screen.c +++ b/screen.c @@ -42,9 +42,12 @@ screen_init(int which) TAILQ_INIT(&sc->clientq); TAILQ_INIT(&sc->regionq); + TAILQ_INIT(&sc->groupq); sc->which = which; sc->rootwin = RootWindow(X_Dpy, sc->which); + sc->cycling = 0; + sc->hideall = 0; conf_screen(sc); xu_ewmh_net_supported(sc); @@ -53,6 +56,12 @@ screen_init(int which) screen_update_geometry(sc); group_init(sc); + xu_ewmh_net_desktop_names(sc); + xu_ewmh_net_wm_desktop_viewport(sc); + xu_ewmh_net_wm_number_of_desktops(sc); + xu_ewmh_net_showing_desktop(sc); + xu_ewmh_net_virtual_roots(sc); + rootattr.cursor = Conf.cursor[CF_NORMAL]; rootattr.event_mask = SubstructureRedirectMask|SubstructureNotifyMask| PropertyChangeMask|EnterWindowMask|LeaveWindowMask| |