wmii

commit 68673eb2b969ccf4540b7fdc838a614bd5fe4c5f
parent f7f15fa7a7462e96cace6c4e4ae50f6d041a4bc8
Author: Kris Maglione <kris@suckless.org>
Date:   Thu, 15 Sep 2011 12:38:16 -0400

Fix focus issue after restart.

Diffstat:
cmd/wmii/client.c
 | 
7
+++----
cmd/wmii/frame.c
 | 
3
++-

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmd/wmii/client.c b/cmd/wmii/client.c
@@ -538,7 +538,8 @@ client_focus(Client *c) {
 	sync();
 	event_flush(FocusChangeMask, true);
 
-	Dprint(DFocus, "client_focus([%#C]%C)\n", c, c);
+	Dprint(DFocus, "client_focus([%#C]%C) collapsed=%s\n",
+	       c, c, c && c->sel->collapsed ? "true" : "false");
 	Dprint(DFocus, "\t[%#C]%C\n\t=> [%#C]%C\n",
 	       disp.focus, disp.focus, c, c);
 
@@ -700,9 +701,7 @@ void
 client_seturgent(Client *c, int urgent, int from) {
 	XWMHints *wmh;
 	char *cfrom, *cnot;
-	Frame *f, *ff;
-	Area *a;
-	int s;
+	Frame *f;
 
 	if(urgent == Toggle)
 		urgent = c->urgent ^ On;
diff --git a/cmd/wmii/frame.c b/cmd/wmii/frame.c
@@ -609,11 +609,12 @@ frame_focus(Frame *f) {
 		move_focus(old_f, f);
 		if(a->floating)
 			float_arrange(a);
-		client_focus(f->client);
 
 		// if(!a->floating && ((a->mode == Colstack) || (a->mode == Colmax)))
 		if(true)
 			column_arrange(a, false);
+
+		client_focus(f->client);
 	}
 }