commit 304d22ed62a5087afb06cf03d30f3a899e2e46ef
parent 05d4658224c36f2cd47df8d069ad11ddc284d0fa
Author: garbeam <garbeam@mmv.wmii.de>
Date: Sun, 11 Dec 2005 02:09:24 +0200
somewhat more bugfixing
Diffstat:
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/cmd/wm/frame.c b/cmd/wm/frame.c
@@ -321,8 +321,9 @@ void detach_client_from_frame(Client *c)
cext_detach_item(&f->clients, c);
if (!c->destroyed) {
hide_client(c);
- cext_attach_item(&detached, c);
- reparent_client(c, root, border_width(f), tab_height(f));
+ c->rect.x += f->rect.x;
+ c->rect.y += f->rect.y;
+ reparent_client(c, root, c->rect.x, c->rect.y);
}
if ((client = cext_stack_get_top_item(&f->clients))) {
sel_client(client);
diff --git a/cmd/wm/wm.c b/cmd/wm/wm.c
@@ -390,9 +390,12 @@ static void _attach_client(void *obj, char *cmd)
static void _detach_client(void *obj, char *cmd)
{
Frame *f = get_sel_frame();
+ Client *c;
if (!f)
return;
- f->area->layout->detach(f->area, cext_stack_get_top_item(&f->clients));
+ c = cext_stack_get_top_item(&f->clients);
+ f->area->layout->detach(f->area, c);
+ cext_attach_item(&detached, c);
}
static void _select_page(void *obj, char *cmd)
diff --git a/rc/wmirc b/rc/wmirc
@@ -1,7 +1,7 @@
#!9PREFIX/bin/rc
# configure wmii
-TAB=1
+TAB=0
SEL_BG_COLOR='#002200'
SEL_FG_COLOR='#66ff00'
@@ -131,6 +131,8 @@ kbind normal $MODKEY-t 'extern xterm ''+sb'' -bg ''#000000'' -fg ''#ffffff'' -cr
kbind normal $MODKEY-d 'wmir write /wm/ctl detach'
kbind normal $MODKEY-a 'wmir write /wm/ctl attach'
kbind normal $MODKEY-S-a 'wmir write /wm/ctl ''detached clients'''
+kbind normal $MODKEY-S-c 'wmir write /wm/sel/layout/sel/name column'
+kbind normal $MODKEY-S-f 'wmir write /wm/sel/layout/sel/name float'
kbind normal $MODKEY-Return 'wmir write /wm/sel/ctl ''select zoomed'''
kbind normal $MODKEY-C-y 'wmir write /wm/ctl new'
kbind normal $MODKEY-u 'wmir write /wm/sel/layout/sel/frame/sel/locked 0'
