diff options
author | okan <okan> | 2013-12-16 19:02:17 +0000 |
---|---|---|
committer | okan <okan> | 2013-12-16 19:02:17 +0000 |
commit | 44e2a2505b9f1ec0d7685a061dce142f83e4fe56 (patch) | |
tree | 74b28cd5b993f74013fb2014c47dfe08bf570e2b /client.c | |
parent | 75b69c0b04001523eb3ad64cbb1d9f1843b41c67 (diff) | |
parent | 19fc7f666bd8e2d5956a7a3958bf6be4f5fea137 (diff) | |
download | cwm-44e2a2505b9f1ec0d7685a061dce142f83e4fe56.tar.gz cwm-44e2a2505b9f1ec0d7685a061dce142f83e4fe56.tar.xz cwm-44e2a2505b9f1ec0d7685a061dce142f83e4fe56.zip |
cvsimport
Diffstat (limited to 'client.c')
-rw-r--r-- | client.c | 60 |
1 files changed, 37 insertions, 23 deletions
diff --git a/client.c b/client.c index e61975d..2766b4a 100644 --- a/client.c +++ b/client.c @@ -229,6 +229,38 @@ client_freeze(struct client_ctx *cc) } void +client_fullscreen(struct client_ctx *cc) +{ + struct screen_ctx *sc = cc->sc; + struct geom xine; + + if ((cc->flags & CLIENT_FREEZE) && + !(cc->flags & CLIENT_FULLSCREEN)) + return; + + if ((cc->flags & CLIENT_FULLSCREEN)) { + cc->bwidth = Conf.bwidth; + cc->geom = cc->fullgeom; + cc->flags &= ~(CLIENT_FULLSCREEN | CLIENT_FREEZE); + goto resize; + } + + cc->fullgeom = cc->geom; + + xine = screen_find_xinerama(sc, + cc->geom.x + cc->geom.w / 2, + cc->geom.y + cc->geom.h / 2, CWM_NOGAP); + + cc->bwidth = 0; + cc->geom = xine; + cc->flags |= (CLIENT_FULLSCREEN | CLIENT_FREEZE); + +resize: + client_resize(cc, 0); + xu_ewmh_set_net_wm_state(cc); +} + +void client_maximize(struct client_ctx *cc) { struct screen_ctx *sc = cc->sc; @@ -238,9 +270,8 @@ client_maximize(struct client_ctx *cc) return; if ((cc->flags & CLIENT_MAXFLAGS) == CLIENT_MAXIMIZED) { - cc->flags &= ~CLIENT_MAXIMIZED; cc->geom = cc->savegeom; - cc->bwidth = Conf.bwidth; + cc->flags &= ~CLIENT_MAXIMIZED; goto resize; } @@ -263,8 +294,10 @@ client_maximize(struct client_ctx *cc) cc->geom.x + cc->geom.w / 2, cc->geom.y + cc->geom.h / 2, CWM_GAP); - cc->geom = xine; - cc->bwidth = 0; + cc->geom.x = xine.x; + cc->geom.y = xine.y; + cc->geom.w = xine.w - (cc->bwidth * 2); + cc->geom.h = xine.h - (cc->bwidth * 2); cc->flags |= CLIENT_MAXIMIZED; resize: @@ -284,9 +317,6 @@ client_vmaximize(struct client_ctx *cc) if (cc->flags & CLIENT_VMAXIMIZED) { cc->geom.y = cc->savegeom.y; cc->geom.h = cc->savegeom.h; - cc->bwidth = Conf.bwidth; - if (cc->flags & CLIENT_HMAXIMIZED) - cc->geom.w -= cc->bwidth * 2; cc->flags &= ~CLIENT_VMAXIMIZED; goto resize; } @@ -294,12 +324,6 @@ client_vmaximize(struct client_ctx *cc) cc->savegeom.y = cc->geom.y; cc->savegeom.h = cc->geom.h; - /* if this will make us fully maximized then remove boundary */ - if ((cc->flags & CLIENT_MAXFLAGS) == CLIENT_HMAXIMIZED) { - cc->geom.w += cc->bwidth * 2; - cc->bwidth = 0; - } - xine = screen_find_xinerama(sc, cc->geom.x + cc->geom.w / 2, cc->geom.y + cc->geom.h / 2, CWM_GAP); @@ -325,9 +349,6 @@ client_hmaximize(struct client_ctx *cc) if (cc->flags & CLIENT_HMAXIMIZED) { cc->geom.x = cc->savegeom.x; cc->geom.w = cc->savegeom.w; - cc->bwidth = Conf.bwidth; - if (cc->flags & CLIENT_VMAXIMIZED) - cc->geom.h -= cc->bwidth * 2; cc->flags &= ~CLIENT_HMAXIMIZED; goto resize; } @@ -335,12 +356,6 @@ client_hmaximize(struct client_ctx *cc) cc->savegeom.x = cc->geom.x; cc->savegeom.w = cc->geom.w; - /* if this will make us fully maximized then remove boundary */ - if ((cc->flags & CLIENT_MAXFLAGS) == CLIENT_VMAXIMIZED) { - cc->geom.h += cc->bwidth * 2; - cc->bwidth = 0; - } - xine = screen_find_xinerama(sc, cc->geom.x + cc->geom.w / 2, cc->geom.y + cc->geom.h / 2, CWM_GAP); @@ -359,7 +374,6 @@ client_resize(struct client_ctx *cc, int reset) { if (reset) { cc->flags &= ~CLIENT_MAXIMIZED; - cc->bwidth = Conf.bwidth; xu_ewmh_set_net_wm_state(cc); } |