From dcfbc9e809623eee64e9df28fd8cfc754d1f6a6a Mon Sep 17 00:00:00 2001 From: okan Date: Mon, 24 Aug 2015 15:42:57 +0000 Subject: [PATCH] Implement _NET_CLIENT_LIST_STACKING (from Thomas Admin), but bottom-to-top order, as per spec (notified Thomas as well). --- calmwm.h | 2 ++ client.c | 2 ++ conf.c | 1 + xutil.c | 21 +++++++++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/calmwm.h b/calmwm.h index 16cccba..f1b110b 100644 --- a/calmwm.h +++ b/calmwm.h @@ -352,6 +352,7 @@ enum { _NET_SUPPORTING_WM_CHECK, _NET_ACTIVE_WINDOW, _NET_CLIENT_LIST, + _NET_CLIENT_LIST_STACKING, _NET_NUMBER_OF_DESKTOPS, _NET_CURRENT_DESKTOP, _NET_DESKTOP_VIEWPORT, @@ -562,6 +563,7 @@ void xu_ewmh_net_supported_wm_check(struct screen_ctx *); void xu_ewmh_net_desktop_geometry(struct screen_ctx *); void xu_ewmh_net_workarea(struct screen_ctx *); void xu_ewmh_net_client_list(struct screen_ctx *); +void xu_ewmh_net_client_list_stacking(struct screen_ctx *); void xu_ewmh_net_active_window(struct screen_ctx *, Window); void xu_ewmh_net_wm_desktop_viewport(struct screen_ctx *); void xu_ewmh_net_wm_number_of_desktops(struct screen_ctx *); diff --git a/client.c b/client.c index 3298bf7..3a3e66e 100644 --- a/client.c +++ b/client.c @@ -112,6 +112,7 @@ client_init(Window win, struct screen_ctx *sc) TAILQ_INSERT_TAIL(&sc->clientq, cc, entry); xu_ewmh_net_client_list(sc); + xu_ewmh_net_client_list_stacking(sc); xu_ewmh_restore_net_wm_state(cc); if (client_get_wm_state(cc) == IconicState) @@ -152,6 +153,7 @@ client_delete(struct client_ctx *cc) TAILQ_REMOVE(&sc->clientq, cc, entry); xu_ewmh_net_client_list(sc); + xu_ewmh_net_client_list_stacking(sc); if (cc->group != NULL) TAILQ_REMOVE(&cc->group->clientq, cc, group_entry); diff --git a/conf.c b/conf.c index 4bcfbb8..608acf0 100644 --- a/conf.c +++ b/conf.c @@ -668,6 +668,7 @@ static char *ewmhints[] = { "_NET_SUPPORTING_WM_CHECK", "_NET_ACTIVE_WINDOW", "_NET_CLIENT_LIST", + "_NET_CLIENT_LIST_STACKING", "_NET_NUMBER_OF_DESKTOPS", "_NET_CURRENT_DESKTOP", "_NET_DESKTOP_VIEWPORT", diff --git a/xutil.c b/xutil.c index 56e180c..f61aeef 100644 --- a/xutil.c +++ b/xutil.c @@ -228,6 +228,27 @@ xu_ewmh_net_client_list(struct screen_ctx *sc) free(winlist); } +void +xu_ewmh_net_client_list_stacking(struct screen_ctx *sc) +{ + struct client_ctx *cc; + Window *winlist; + int i = 0, j; + + TAILQ_FOREACH(cc, &sc->clientq, entry) + i++; + if (i == 0) + return; + + j = i; + winlist = xreallocarray(NULL, i, sizeof(*winlist)); + TAILQ_FOREACH(cc, &sc->clientq, entry) + winlist[--j] = cc->win; + XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_CLIENT_LIST_STACKING], + XA_WINDOW, 32, PropModeReplace, (unsigned char *)winlist, i); + free(winlist); +} + void xu_ewmh_net_active_window(struct screen_ctx *sc, Window w) {