From 849395cbc51a5de113fc3cafce40a95d3163a6bf Mon Sep 17 00:00:00 2001
From: "Anselm R. Garbe" <garbeam@wmii.de>
Date: Wed, 18 Jan 2006 17:22:49 +0200
Subject: [PATCH] dropped click-through, too many ugly hacks, we will stick to
 click-to-focus, don't blame me, blame X

---
 cmd/wm/layout.c        | 2 +-
 cmd/wm/layout_column.c | 4 ++--
 libixp/ramfs.c         | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cmd/wm/layout.c b/cmd/wm/layout.c
index be03488d..6fb4ed3c 100644
--- a/cmd/wm/layout.c
+++ b/cmd/wm/layout.c
@@ -61,7 +61,7 @@ focus_layout(Layout *l)
     p->sel = l;
     p->file[P_SEL_LAYOUT]->content = l->file[L_PREFIX]->content;
     if((c = l->def->sel(l)))
-        l->def->focus(l, c, False);
+        l->def->focus(l, c, True);
     invoke_wm_event(def[WM_EVENT_PAGE_UPDATE]);
 }
 
diff --git a/cmd/wm/layout_column.c b/cmd/wm/layout_column.c
index 183f59ce..78adf76c 100644
--- a/cmd/wm/layout_column.c
+++ b/cmd/wm/layout_column.c
@@ -548,7 +548,7 @@ swap_frame(void *obj, char *arg)
         resize_frame(cell->frame, &cell->frame->rect, nil);
         resize_frame(south->frame, &south->frame->rect, nil);
         focus_col(l, cell->frame->sel, True);
-    } else if(!strncmp(arg, "west", 5) && west && (col->ncells > 1)) {
+    } else if(!strncmp(arg, "west", 5) && west && col->ncells && west->ncells) {
         Cell *other = west->sel;
         r = other->frame->rect;
         other->frame->rect = cell->frame->rect;
@@ -561,7 +561,7 @@ swap_frame(void *obj, char *arg)
         resize_frame(cell->frame, &cell->frame->rect, nil);
         resize_frame(other->frame, &other->frame->rect, nil);
         focus_col(l, other->frame->sel, True);
-    } else if(!strncmp(arg, "east", 5) && east && (col->ncells > 1)) {
+    } else if(!strncmp(arg, "east", 5) && east && col->ncells && east->ncells) {
         Cell *other = east->sel;
         r = other->frame->rect;
         other->frame->rect = cell->frame->rect;
diff --git a/libixp/ramfs.c b/libixp/ramfs.c
index 1a6d8e23..7c369f8a 100644
--- a/libixp/ramfs.c
+++ b/libixp/ramfs.c
@@ -206,7 +206,6 @@ static void _ixp_remove(IXPServer * s, File * f)
 {
 	if (!f)
 		return;
-	fprintf(stderr, "_ixp_remove: %s\n", f->name);
 	if (f->next) {
 		_ixp_remove(s, f->next);
 		if (s->errstr)