From 528a22b75a5a243790f7f72bacbffe0bba785923 Mon Sep 17 00:00:00 2001 From: Martin Duquesnoy Date: Sat, 8 Nov 2008 23:39:29 +0100 Subject: [PATCH] layout: Add toggle_free function --- src/config.c | 7 ++++--- src/event.c | 2 +- src/layout.c | 18 +++++++++++++++++- src/wmfs.h | 1 + wmfsrc | 21 +++++++++++---------- 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/src/config.c b/src/config.c index 59f896a..a80f3c4 100644 --- a/src/config.c +++ b/src/config.c @@ -40,13 +40,13 @@ func_name_list_t func_list[] = {"client_kill", uicb_client_kill }, {"client_prev", uicb_client_prev }, {"client_next", uicb_client_next }, - {"togglemax", uicb_togglemax }, + {"toggle_max", uicb_togglemax }, {"layout_next", uicb_layout_next }, {"layout_prev", uicb_layout_prev }, {"tag", uicb_tag }, {"tag_next", uicb_tag_next }, {"tag_prev", uicb_tag_prev }, - {"tagtransfert", uicb_tagtransfert }, + {"tag_transfert", uicb_tagtransfert }, {"set_mwfact", uicb_set_mwfact }, {"set_nmaster", uicb_set_nmaster }, {"quit", uicb_quit }, @@ -54,7 +54,8 @@ func_name_list_t func_list[] = {"mouse_move", uicb_mouse_move }, {"mouse_resize", uicb_mouse_resize }, {"client_raise", uicb_client_raise }, - {"tile_switch", uicb_tile_switch } + {"tile_switch", uicb_tile_switch }, + {"toggle_free", uicb_togglefree } }; func_name_list_t layout_list[] = diff --git a/src/event.c b/src/event.c index 4ee988f..21625c8 100644 --- a/src/event.c +++ b/src/event.c @@ -339,7 +339,7 @@ getevent(void) case MapRequest: maprequest(event); break; case MappingNotify: mapnotify(event); break; case PropertyNotify: propertynotify(event); break; - //case UnmapNotify: unmapnotify(event); break; + case UnmapNotify: unmapnotify(event); break; } return; diff --git a/src/layout.c b/src/layout.c index 6677214..143c3af 100644 --- a/src/layout.c +++ b/src/layout.c @@ -388,7 +388,7 @@ multi_tile(Position type) if(type == Top || type == Bottom) cgeo.x = c->geo.x + c->geo.width + border; else - cgeo.y = c->geo.y + c->geo.height + border + conf.titlebar.height; + cgeo.y = c->geo.y + c->geo.height + border + TBARH; } return; @@ -442,6 +442,22 @@ uicb_tile_switch(uicb_t cmd) return; } +void +uicb_togglefree(uicb_t cmd) +{ + CHECK(sel); + + sel->free = !sel->free; + sel->tile = False; + sel->max = False; + sel->lmax = False; + client_raise(sel); + + arrange(); + + return; +} + void uicb_togglemax(uicb_t cmd) { diff --git a/src/wmfs.h b/src/wmfs.h index c4e49bc..619d314 100644 --- a/src/wmfs.h +++ b/src/wmfs.h @@ -181,6 +181,7 @@ Client *nexttiled(Client *c); /* }}} */ void uicb_tile_switch(uicb_t); void uicb_togglemax(uicb_t); +void uicb_togglefree(uicb_t cmd); void uicb_layout_prev(uicb_t); void uicb_layout_next(uicb_t); void uicb_set_mwfact(uicb_t); diff --git a/wmfsrc b/wmfsrc index 31ef37c..c71c51f 100644 --- a/wmfsrc +++ b/wmfsrc @@ -101,7 +101,8 @@ keys key { mod = {"Control"} key = "Return" func = "spawn" cmd = term } key { mod = {"Alt"} key = "q" func = "client_kill" } key { mod = {"Control", "Alt", "Shift"} key = "q" func = "quit" } - key { mod = {"Control"} key = "m" func = "togglemax" } + key { mod = {"Control"} key = "m" func = "toggle_max" } + key { mod = {"Control"} key = "f" func = "toggle_free" } key { mod = {"Control"} key = "b" func = "toggle_infobar_position" } key { mod = {"Alt"} key = "Tab" func = "client_next" } key { mod = {"Alt","Shift"} key = "Tab" func = "client_prev" } @@ -126,13 +127,13 @@ keys key { mod = {"Alt"} key = "F8" func = "tag" cmd = "8" } key { mod = {"Alt"} key = "F9" func = "tag" cmd = "9" } - key { mod = {"Control", "Shift"} key = "F1" func = "tagtransfert" cmd ="1" } - key { mod = {"Control", "Shift"} key = "F2" func = "tagtransfert" cmd ="2" } - key { mod = {"Control", "Shift"} key = "F3" func = "tagtransfert" cmd ="3" } - key { mod = {"Control", "Shift"} key = "F4" func = "tagtransfert" cmd ="4" } - key { mod = {"Control", "Shift"} key = "F5" func = "tagtransfert" cmd ="5" } - key { mod = {"Control", "Shift"} key = "F6" func = "tagtransfert" cmd ="6" } - key { mod = {"Control", "Shift"} key = "F7" func = "tagtransfert" cmd ="7" } - key { mod = {"Control", "Shift"} key = "F8" func = "tagtransfert" cmd ="8" } - key { mod = {"Control", "Shift"} key = "F9" func = "tagtransfert" cmd ="9" } + key { mod = {"Control", "Shift"} key = "F1" func = "tag_transfert" cmd ="1" } + key { mod = {"Control", "Shift"} key = "F2" func = "tag_transfert" cmd ="2" } + key { mod = {"Control", "Shift"} key = "F3" func = "tag_transfert" cmd ="3" } + key { mod = {"Control", "Shift"} key = "F4" func = "tag_transfert" cmd ="4" } + key { mod = {"Control", "Shift"} key = "F5" func = "tag_transfert" cmd ="5" } + key { mod = {"Control", "Shift"} key = "F6" func = "tag_transfert" cmd ="6" } + key { mod = {"Control", "Shift"} key = "F7" func = "tag_transfert" cmd ="7" } + key { mod = {"Control", "Shift"} key = "F8" func = "tag_transfert" cmd ="8" } + key { mod = {"Control", "Shift"} key = "F9" func = "tag_transfert" cmd ="9" } }