wmii

commit 8b1e64bb5074165175e7bc1538cee07cf6645613
parent e2652df909bfb5c08a2993af7264d7503d130e7d
Author: Kris Maglione <bsdaemon@wmii.de>
Date:   Thu, 29 Jun 2006 22:58:06 -0400

Ignore BadAccess error on XGrabKey. Fix + cleanup in column.c


Diffstat:
cmd/wm/column.c
 | 
4
++--
cmd/wm/wm.c
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmd/wm/column.c b/cmd/wm/column.c
@@ -150,8 +150,8 @@ scale_column(Area *a, float h)
 void
 arrange_column(Area *a, Bool dirty)
 {
-	unsigned int num_frames = 0, yoff = a->rect.y, h;
 	Frame *f;
+	unsigned int num_frames = 0, yoff = a->rect.y, h;
 	unsigned int min_height = 2 * height_of_bar();
 
 	if(a->floating || !a->frame)
@@ -206,7 +206,7 @@ Fallthrough:
 	}
 
 	relax_column(a);
-	focus_view(screen, v);
+	focus_view(screen, a->view);
 	flush_masked_events(EnterWindowMask);
 }
 
diff --git a/cmd/wm/wm.c b/cmd/wm/wm.c
@@ -194,7 +194,7 @@ wmii_error_handler(Display *dpy, XErrorEvent *error)
 			|| (error->request_code == X_ConfigureWindow
 				&& error->error_code == BadMatch)
 			|| (error->request_code == X_GrabKey
-				&& error->error_code == BadMatch))
+				&& error->error_code == BadAccess))
 		return 0;
 	fprintf(stderr, "wmiiwm: fatal error: Xrequest code=%d, Xerror code=%d\n",
 			error->request_code, error->error_code);