diff options
| author | okan <okan> | 2014-09-17 16:00:44 +0000 |
|---|---|---|
| committer | okan <okan> | 2014-09-17 16:00:44 +0000 |
| commit | a61812d52dfd2eb607516bfc7d5daa664070c8d3 (patch) | |
| tree | 23a7e720b3aaae1af0725e00cc9b60efca75a1c1 | |
| parent | 74f4a1bad98bdb25212b32d15fa411d2ed16b6df (diff) | |
| download | cwm-a61812d52dfd2eb607516bfc7d5daa664070c8d3.tar.gz cwm-a61812d52dfd2eb607516bfc7d5daa664070c8d3.tar.xz cwm-a61812d52dfd2eb607516bfc7d5daa664070c8d3.zip | |
Implement EWMH _NET_WM_STATE_HIDDEN.
| -rw-r--r-- | calmwm.h | 4 | ||||
| -rw-r--r-- | client.c | 15 | ||||
| -rw-r--r-- | conf.c | 1 | ||||
| -rw-r--r-- | xutil.c | 12 |
4 files changed, 27 insertions, 5 deletions
diff --git a/calmwm.h b/calmwm.h index 23879c5..639e3ca 100644 --- a/calmwm.h +++ b/calmwm.h @@ -344,10 +344,11 @@ enum { _NET_WM_DESKTOP, _NET_CLOSE_WINDOW, _NET_WM_STATE, -#define _NET_WM_STATES_NITEMS 5 +#define _NET_WM_STATES_NITEMS 6 _NET_WM_STATE_STICKY, _NET_WM_STATE_MAXIMIZED_VERT, _NET_WM_STATE_MAXIMIZED_HORZ, + _NET_WM_STATE_HIDDEN, _NET_WM_STATE_FULLSCREEN, _NET_WM_STATE_DEMANDS_ATTENTION, EWMH_NITEMS @@ -374,6 +375,7 @@ void client_freeze(struct client_ctx *); void client_fullscreen(struct client_ctx *); long client_get_wm_state(struct client_ctx *); void client_getsizehints(struct client_ctx *); +void client_hidden(struct client_ctx *); void client_hide(struct client_ctx *); void client_hmaximize(struct client_ctx *); void client_htile(struct client_ctx *); diff --git a/client.c b/client.c index 6545c4e..32774e6 100644 --- a/client.c +++ b/client.c @@ -240,6 +240,17 @@ client_freeze(struct client_ctx *cc) } void +client_hidden(struct client_ctx *cc) +{ + if (cc->flags & CLIENT_HIDDEN) + cc->flags &= ~CLIENT_HIDDEN; + else + cc->flags |= CLIENT_HIDDEN; + + xu_ewmh_set_net_wm_state(cc); +} + +void client_sticky(struct client_ctx *cc) { if (cc->flags & CLIENT_STICKY) @@ -486,7 +497,7 @@ client_hide(struct client_ctx *cc) XUnmapWindow(X_Dpy, cc->win); cc->flags &= ~CLIENT_ACTIVE; - cc->flags |= CLIENT_HIDDEN; + client_hidden(cc); client_set_wm_state(cc, IconicState); if (cc == client_current()) @@ -501,7 +512,7 @@ client_unhide(struct client_ctx *cc) XMapRaised(X_Dpy, cc->win); - cc->flags &= ~CLIENT_HIDDEN; + client_hidden(cc); client_set_wm_state(cc, NormalState); client_draw_border(cc); } diff --git a/conf.c b/conf.c index e33c81f..1660173 100644 --- a/conf.c +++ b/conf.c @@ -675,6 +675,7 @@ static char *ewmhints[] = { "_NET_WM_STATE_STICKY", "_NET_WM_STATE_MAXIMIZED_VERT", "_NET_WM_STATE_MAXIMIZED_HORZ", + "_NET_WM_STATE_HIDDEN", "_NET_WM_STATE_FULLSCREEN", "_NET_WM_STATE_DEMANDS_ATTENTION", }; diff --git a/xutil.c b/xutil.c index 0e3d9e4..ba8e085 100644 --- a/xutil.c +++ b/xutil.c @@ -379,6 +379,9 @@ xu_ewmh_handle_net_wm_state_msg(struct client_ctx *cc, int action, { _NET_WM_STATE_MAXIMIZED_HORZ, CLIENT_HMAXIMIZED, client_hmaximize }, + { _NET_WM_STATE_HIDDEN, + CLIENT_HIDDEN, + client_hidden }, { _NET_WM_STATE_FULLSCREEN, CLIENT_FULLSCREEN, client_fullscreen }, @@ -420,6 +423,8 @@ xu_ewmh_restore_net_wm_state(struct client_ctx *cc) client_hmaximize(cc); if (atoms[i] == ewmh[_NET_WM_STATE_MAXIMIZED_VERT]) client_vmaximize(cc); + if (atoms[i] == ewmh[_NET_WM_STATE_HIDDEN]) + client_hidden(cc); if (atoms[i] == ewmh[_NET_WM_STATE_FULLSCREEN]) client_fullscreen(cc); if (atoms[i] == ewmh[_NET_WM_STATE_DEMANDS_ATTENTION]) @@ -437,16 +442,19 @@ xu_ewmh_set_net_wm_state(struct client_ctx *cc) oatoms = xu_ewmh_get_net_wm_state(cc, &n); atoms = xcalloc((n + _NET_WM_STATES_NITEMS), sizeof(Atom)); for (i = j = 0; i < n; i++) { - if (oatoms[i] != ewmh[_NET_WM_STATE_MAXIMIZED_HORZ] && + if (oatoms[i] != ewmh[_NET_WM_STATE_STICKY] && + oatoms[i] != ewmh[_NET_WM_STATE_MAXIMIZED_HORZ] && oatoms[i] != ewmh[_NET_WM_STATE_MAXIMIZED_VERT] && + oatoms[i] != ewmh[_NET_WM_STATE_HIDDEN] && oatoms[i] != ewmh[_NET_WM_STATE_FULLSCREEN] && - oatoms[i] != ewmh[_NET_WM_STATE_STICKY] && oatoms[i] != ewmh[_NET_WM_STATE_DEMANDS_ATTENTION]) atoms[j++] = oatoms[i]; } free(oatoms); if (cc->flags & CLIENT_STICKY) atoms[j++] = ewmh[_NET_WM_STATE_STICKY]; + if (cc->flags & CLIENT_HIDDEN) + atoms[j++] = ewmh[_NET_WM_STATE_HIDDEN]; if (cc->flags & CLIENT_FULLSCREEN) atoms[j++] = ewmh[_NET_WM_STATE_FULLSCREEN]; else { |