wmii

commit 9dd3945664fb197f98e3630f465671a00e383b9a
parent 231c4c44b7cb1739f926c76008d34dd69b50868d
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Tue, 17 Jan 2006 17:27:57 +0200

fixed stupid bug which raised ixp corruption in layout_column.c:focus_col


Diffstat:
cmd/wm/frame.c
 | 
11
+++++------
cmd/wm/layout_column.c
 | 
2
+-
rc/wmiirc
 | 
2
+-

3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/cmd/wm/frame.c b/cmd/wm/frame.c
@@ -30,10 +30,6 @@ alloc_frame(XRectangle * r)
     snprintf(buf, MAX_BUF, "/detached/%d/name", id);
     f->file[F_NAME] = ixp_create(ixps, buf);
 	f->file[F_NAME]->before_read = handle_before_read_frame;
-    snprintf(buf, MAX_BUF, "/detached/%d/geometry", id);
-    f->file[F_GEOMETRY] = ixp_create(ixps, buf);
-    f->file[F_GEOMETRY]->before_read = handle_before_read_frame;
-    f->file[F_GEOMETRY]->after_write = handle_after_write_frame;
     snprintf(buf, MAX_BUF, "/detached/%d/border", id);
     f->file[F_BORDER] =
         wmii_create_ixpfile(ixps, buf, def[WM_BORDER]->content);
@@ -45,6 +41,10 @@ alloc_frame(XRectangle * r)
     f->file[F_HANDLE_INC] =
         wmii_create_ixpfile(ixps, buf, def[WM_HANDLE_INC]->content);
     f->file[F_HANDLE_INC]->after_write = handle_after_write_frame;
+    snprintf(buf, MAX_BUF, "/detached/%d/geometry", id);
+    f->file[F_GEOMETRY] = ixp_create(ixps, buf);
+    f->file[F_GEOMETRY]->before_read = handle_before_read_frame;
+    f->file[F_GEOMETRY]->after_write = handle_after_write_frame;
     id++;
 
     wa.override_redirect = 1;
@@ -58,8 +58,7 @@ alloc_frame(XRectangle * r)
     f->rect.width += 2 * bw;
     f->rect.height += bw + (th ? th : bw);
     f->win = XCreateWindow(dpy, root, f->rect.x, f->rect.y, f->rect.width,
-                           f->rect.height, 0, DefaultDepth(dpy,
-                                                           screen_num),
+                           f->rect.height, 0, DefaultDepth(dpy, screen_num),
                            CopyFromParent, DefaultVisual(dpy, screen_num),
                            CWOverrideRedirect | CWBackPixmap | CWEventMask,
                            &wa);
diff --git a/cmd/wm/layout_column.c b/cmd/wm/layout_column.c
@@ -424,7 +424,7 @@ focus_col(Layout *l, Client *c, Bool raise)
 		unfocus_client(old);
     acme->sel = cell->col;
 	cell->col->sel = cell;
-    c->frame->file[L_SEL_FRAME]->content = c->frame->file[F_PREFIX]->content;
+    l->file[L_SEL_FRAME]->content = c->frame->file[F_PREFIX]->content;
     if(raise)
     	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
 					 c->rect.width / 2, c->rect.height / 2);
diff --git a/rc/wmiirc b/rc/wmiirc
@@ -56,7 +56,7 @@ fn framesconf {
     for(frame in `{wmiir read $1 | grep '^[0-9]'}) {
     	wmiir write $1/$frame/tab $TAB
     	wmiir write $1/$frame/handleinc $HANDLEINC
-    	wmiir write $1/$frame/geometry '+0 +0 +0 +0'  # causes refresh
+		wmiir write $1/$frame/geometry '+0 +0 +0 +0'  # causes refresh
 	}
 }