wmii

commit 778f85c51f05e6c7e68b455911a12d73a099abf4
parent 2af6526adbc898e5bcde5dc0af88b68ac52e8bb8
Author: Kris Maglione <jg@suckless.org>
Date:   Sun, 18 Feb 2007 17:54:56 -0500

Preliminary implementation of the new focus handling algorithm.

Diffstat:
area.c
 | 
17
++++-------------
client.c
 | 
4
+---
event.c
 | 
59
++++++++++++++++++-----------------------------------------
frame.c
 | 
32
++++++--------------------------
printevent.c
 | 
310
++++++++++++++++++++++++++++++++++++++++----------------------------------------

5 files changed, 184 insertions(+), 238 deletions(-)
diff --git a/area.c b/area.c
@@ -347,27 +347,18 @@ focus_area(Area *a) {
 
 	v->sel = a;
 
-	if(f)
-		update_frame_widget_colors(f);
-	if(old_a) {
-		if(old_a->sel)
-			update_frame_widget_colors(old_a->sel);
-		if(a->floating != old_a->floating)
+	if((old_a)
+	&& (a->floating != old_a->floating))
 			v->revert = old_a;
-	}
 
 	if(v != screen->sel)
 		return;
 
-	if(f) {
-		draw_frame(f);
+	if(f)
 		focus_client(f->client);
-	}else
+	else
 		focus_client(nil);
 
-	if(old_a && old_a->sel)
-		draw_frame(old_a->sel);
-
 	if(a != old_a) {
 		i = 0;
 		for(a = v->area; a != v->sel; a = a->next)
diff --git a/client.c b/client.c
@@ -329,10 +329,8 @@ set_urgent(Client *c, Bool urgent, Bool write) {
 		write_event("%sUrgent 0x%x %s\n", cnot, client->win, cwrite);
 		c->urgent = urgent;
 		if(c->sel) {
-			if(c->sel->view == screen->sel) {
-				update_frame_widget_colors(c->sel);
+			if(c->sel->view == screen->sel)
 				draw_frame(c->sel);
-			}
 			if(!urgent || c->sel->view != screen->sel)
 				for(f=c->frame; f; f=f->cnext) {
 					for(a=f->view->area; a; a=a->next)
diff --git a/event.c b/event.c
@@ -276,7 +276,12 @@ focusin(XEvent *e) {
 	Client *c;
 	XFocusChangeEvent *ev = &e->xfocus;
 
-	if(ev->detail == NotifyPointer)
+	if(!((ev->detail == NotifyNonlinear)
+	   ||(ev->detail == NotifyNonlinearVirtual)
+	   ||(ev->detail == NotifyInferior)
+	   ||(ev->detail == NotifyAncestor)))
+		return;
+	if(ev->mode == NotifyWhileGrabbed)
 		return;
 
 	c = client_of_win(ev->window);
@@ -286,8 +291,10 @@ focusin(XEvent *e) {
 			fprintf(stderr, "\t%s => %s\n", (screen->focus ? screen->focus->name : nil),
 					c->name);
 		}
-		update_client_grab(c);
 		screen->focus = c;
+		update_client_grab(c);
+		if(c->sel)
+			draw_frame(c->sel);
 	}else if(ev->window == screen->barwin) {
 		if(verbose) {
 			fprintf(stderr, "screen->focus: %p => %p\n", screen->focus, c);
@@ -296,28 +303,6 @@ focusin(XEvent *e) {
 		}
 		screen->focus = nil;
 	}
-#if 0
-	Client *c;
-	XFocusChangeEvent *ev = &e->xfocus;
-
-	c = client_of_win(ev->window);
-	if(ev->mode == NotifyGrab) {
-		screen->focus = nil;
-		if(!c)
-			focus_client(nil);
-		else
-			focus(c, False);
-	}if(ev->mode == NotifyUngrab) {
-		if(c)
-			focus(c, False);
-		screen->focus = c;
-	}else if(c) {
-		screen->focus = c;
-		if(c != sel_client()) {
-			focus_client(sel_client());
-		}
-	}
-#endif
 }
 
 static void
@@ -325,28 +310,20 @@ focusout(XEvent *e) {
 	Client *c;
 	XFocusChangeEvent *ev = &e->xfocus;
 
-	if(ev->detail == NotifyPointer)
+	if(!((ev->detail == NotifyNonlinear)
+	   ||(ev->detail == NotifyNonlinearVirtual)))
+		return;
+	if(ev->mode == NotifyWhileGrabbed)
 		return;
 
 	c = client_of_win(ev->window);
-	if(c)
+	if(c) {
+		if(screen->focus == c)
+			screen->focus = nil;
 		update_client_grab(c);
-#if 0
-	Client *c;
-	XFocusChangeEvent *ev = &e->xfocus;
-
-	c = client_of_win(ev->window);
-	if(ev->mode == NotifyUngrab
-	|| ev->mode == NotifyGrab)
-		return;
-	else if(c) {
-		screen->focus = c;
-		/* Don't let clients grab focus */
-		if(c != sel_client()) {
-			focus_client(sel_client());
-		}
+		if(c->sel)
+			draw_frame(c->sel);
 	}
-#endif
 }
 
 void (*handler[LASTEvent]) (XEvent *) = {
diff --git a/frame.c b/frame.c
@@ -190,30 +190,15 @@ focus_frame(Frame *f, Bool restack) {
 
 	if(a != old_a)
 		focus_area(f->area);
-	else {
-		update_frame_widget_colors(f);
-		if(old)
-			update_frame_widget_colors(old);
-	}
-
-	if(old_in_a)
-		update_frame_widget_colors(old_in_a);
 
 	if(v != screen->sel)
 		return;
 
 	focus_client(f->client);
-	if(a == old_a)
-		draw_frame(f);
-	else if(old_in_a)
-		draw_frame(old_in_a);
-
-	if(f != old) {
-		if(old)
-			draw_frame(old);
-		if(f->area == old_a)
+
+	if((f != old)
+	&& (f->area == old_a))
 			write_event("ClientFocus 0x%x\n", f->client->win);
-	}
 
 	if(restack)
 		restack_view(v);
@@ -225,17 +210,14 @@ frame_delta_h() {
 }
 
 void
-update_frame_widget_colors(Frame *f) {
-	if(sel_screen && (f->client == sel_client()))
+draw_frame(Frame *f) {
+	if(f->client == screen->focus)
 		f->grabbox.color = f->tile.color = f->titlebar.color = def.focuscolor;
 	else
 		f->grabbox.color = f->tile.color = f->titlebar.color = def.normcolor;
 	if(f->client->urgent)
 		f->grabbox.color.bg = f->grabbox.color.fg;
-}
 
-void
-draw_frame(Frame *f) {
 	if(def.border) {
 		f->tile.border = 1;
 		f->tile.rect = f->rect;
@@ -280,10 +262,8 @@ draw_frames() {
 	Client *c;
 
 	for(c=client; c; c=c->next)
-		if(c->sel && c->sel->view == screen->sel) {
-			update_frame_widget_colors(c->sel);
+		if(c->sel && c->sel->view == screen->sel)
 			draw_frame(c->sel);
-		}
 }
 
 void
diff --git a/printevent.c b/printevent.c
@@ -465,89 +465,89 @@ AtomName(Display *dpy, Atom atom)
 static void
 VerbMotion(XMotionEvent *ev)
 {
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("root=0x%x%s", (int)ev->root, sep);
-    printf("subwindow=0x%x%s", (int)ev->subwindow, sep);
-    printf("time=%s%s", ServerTime(ev->time), sep);
-    printf("x=%d y=%d%s", ev->x, ev->y, sep);
-    printf("x_root=%d y_root=%d%s", ev->x_root, ev->y_root, sep);
-    printf("state=%s%s", ButtonAndOrModifierState(ev->state), sep);
-    printf("is_hint=%s%s", IsHint(ev->is_hint), sep);
-    printf("same_screen=%s\n", TorF(ev->same_screen));
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "root=0x%x%s", (int)ev->root, sep);
+    fprintf(stderr, "subwindow=0x%x%s", (int)ev->subwindow, sep);
+    fprintf(stderr, "time=%s%s", ServerTime(ev->time), sep);
+    fprintf(stderr, "x=%d y=%d%s", ev->x, ev->y, sep);
+    fprintf(stderr, "x_root=%d y_root=%d%s", ev->x_root, ev->y_root, sep);
+    fprintf(stderr, "state=%s%s", ButtonAndOrModifierState(ev->state), sep);
+    fprintf(stderr, "is_hint=%s%s", IsHint(ev->is_hint), sep);
+    fprintf(stderr, "same_screen=%s\n", TorF(ev->same_screen));
 }
 
 static void
 VerbButton(XButtonEvent *ev)
 {
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("root=0x%x%s", (int)ev->root, sep);
-    printf("subwindow=0x%x%s", (int)ev->subwindow, sep);
-    printf("time=%s%s", ServerTime(ev->time), sep);
-    printf("x=%d y=%d%s", ev->x, ev->y, sep);
-    printf("x_root=%d y_root=%d%s", ev->x_root, ev->y_root, sep);
-    printf("state=%s%s", ButtonAndOrModifierState(ev->state), sep);
-    printf("button=%s%s", ButtonAndOrModifierState(ev->button), sep);
-    printf("same_screen=%s\n", TorF(ev->same_screen));
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "root=0x%x%s", (int)ev->root, sep);
+    fprintf(stderr, "subwindow=0x%x%s", (int)ev->subwindow, sep);
+    fprintf(stderr, "time=%s%s", ServerTime(ev->time), sep);
+    fprintf(stderr, "x=%d y=%d%s", ev->x, ev->y, sep);
+    fprintf(stderr, "x_root=%d y_root=%d%s", ev->x_root, ev->y_root, sep);
+    fprintf(stderr, "state=%s%s", ButtonAndOrModifierState(ev->state), sep);
+    fprintf(stderr, "button=%s%s", ButtonAndOrModifierState(ev->button), sep);
+    fprintf(stderr, "same_screen=%s\n", TorF(ev->same_screen));
 }
 
 static void
 VerbColormap(XColormapEvent *ev)
 {
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("colormap=%s%s", MaybeNone(ev->colormap), sep);
-    printf("new=%s%s", TorF(ev->new), sep);
-    printf("state=%s\n", ColormapState(ev->state));
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "colormap=%s%s", MaybeNone(ev->colormap), sep);
+    fprintf(stderr, "new=%s%s", TorF(ev->new), sep);
+    fprintf(stderr, "state=%s\n", ColormapState(ev->state));
 }
 
 static void
 VerbCrossing(XCrossingEvent *ev)
 {
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("root=0x%x%s", (int)ev->root, sep);
-    printf("subwindow=0x%x%s", (int)ev->subwindow, sep);
-    printf("time=%s%s", ServerTime(ev->time), sep);
-    printf("x=%d y=%d%s", ev->x, ev->y, sep);
-    printf("x_root=%d y_root=%d%s", ev->x_root, ev->y_root, sep);
-    printf("mode=%s%s", GrabMode(ev->mode), sep);
-    printf("detail=%s%s", CrossingDetail(ev->detail), sep);
-    printf("same_screen=%s%s", TorF(ev->same_screen), sep);
-    printf("focus=%s%s", TorF(ev->focus), sep);
-    printf("state=%s\n", ButtonAndOrModifierState(ev->state));
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "root=0x%x%s", (int)ev->root, sep);
+    fprintf(stderr, "subwindow=0x%x%s", (int)ev->subwindow, sep);
+    fprintf(stderr, "time=%s%s", ServerTime(ev->time), sep);
+    fprintf(stderr, "x=%d y=%d%s", ev->x, ev->y, sep);
+    fprintf(stderr, "x_root=%d y_root=%d%s", ev->x_root, ev->y_root, sep);
+    fprintf(stderr, "mode=%s%s", GrabMode(ev->mode), sep);
+    fprintf(stderr, "detail=%s%s", CrossingDetail(ev->detail), sep);
+    fprintf(stderr, "same_screen=%s%s", TorF(ev->same_screen), sep);
+    fprintf(stderr, "focus=%s%s", TorF(ev->focus), sep);
+    fprintf(stderr, "state=%s\n", ButtonAndOrModifierState(ev->state));
 }
 
 static void
 VerbExpose(XExposeEvent *ev)
 {
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("x=%d y=%d%s", ev->x, ev->y, sep);
-    printf("width=%d height=%d%s", ev->width, ev->height, sep);
-    printf("count=%d\n", ev->count);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "x=%d y=%d%s", ev->x, ev->y, sep);
+    fprintf(stderr, "width=%d height=%d%s", ev->width, ev->height, sep);
+    fprintf(stderr, "count=%d\n", ev->count);
 }
 
 static void
 VerbGraphicsExpose(XGraphicsExposeEvent *ev)
 {
-    printf("drawable=0x%x%s", (int)ev->drawable, sep);
-    printf("x=%d y=%d%s", ev->x, ev->y, sep);
-    printf("width=%d height=%d%s", ev->width, ev->height, sep);
-    printf("major_code=%s%s", MajorCode(ev->major_code), sep);
-    printf("minor_code=%d\n", ev->minor_code);
+    fprintf(stderr, "drawable=0x%x%s", (int)ev->drawable, sep);
+    fprintf(stderr, "x=%d y=%d%s", ev->x, ev->y, sep);
+    fprintf(stderr, "width=%d height=%d%s", ev->width, ev->height, sep);
+    fprintf(stderr, "major_code=%s%s", MajorCode(ev->major_code), sep);
+    fprintf(stderr, "minor_code=%d\n", ev->minor_code);
 }
 
 static void
 VerbNoExpose(XNoExposeEvent *ev)
 {
-    printf("drawable=0x%x%s", (int)ev->drawable, sep);
-    printf("major_code=%s%s", MajorCode(ev->major_code), sep);
-    printf("minor_code=%d\n", ev->minor_code);
+    fprintf(stderr, "drawable=0x%x%s", (int)ev->drawable, sep);
+    fprintf(stderr, "major_code=%s%s", MajorCode(ev->major_code), sep);
+    fprintf(stderr, "minor_code=%d\n", ev->minor_code);
 }
 
 static void
 VerbFocus(XFocusChangeEvent *ev)
 {
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("mode=%s%s", GrabMode(ev->mode), sep);
-    printf("detail=%s\n", FocusChangeDetail(ev->detail));
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "mode=%s%s", GrabMode(ev->mode), sep);
+    fprintf(stderr, "detail=%s\n", FocusChangeDetail(ev->detail));
 }
 
 static void
@@ -555,156 +555,156 @@ VerbKeymap(XKeymapEvent *ev)
 {
     int i;
 
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("key_vector=");
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "key_vector=");
     for (i = 0; i < 32; i++)
-	printf("%02x", ev->key_vector[i]);
-    printf("\n");
+	fprintf(stderr, "%02x", ev->key_vector[i]);
+    fprintf(stderr, "\n");
 }
 
 static void
 VerbKey(XKeyEvent *ev)
 {
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("root=0x%x%s", (int)ev->root, sep);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "root=0x%x%s", (int)ev->root, sep);
     if(ev->subwindow)
-        printf("subwindow=0x%x%s", (int)ev->subwindow, sep);
-    printf("time=%s%s", ServerTime(ev->time), sep);
-    printf("[%d,%d]%s", ev->x, ev->y, sep);
-    printf("root=[%d,%d]%s", ev->x_root, ev->y_root, sep);
+        fprintf(stderr, "subwindow=0x%x%s", (int)ev->subwindow, sep);
+    fprintf(stderr, "time=%s%s", ServerTime(ev->time), sep);
+    fprintf(stderr, "[%d,%d]%s", ev->x, ev->y, sep);
+    fprintf(stderr, "root=[%d,%d]%s", ev->x_root, ev->y_root, sep);
     if(ev->state)
-        printf("state=%s%s", ButtonAndOrModifierState(ev->state), sep);
-    printf("keycode=%s%s", Keycode(ev), sep);
+        fprintf(stderr, "state=%s%s", ButtonAndOrModifierState(ev->state), sep);
+    fprintf(stderr, "keycode=%s%s", Keycode(ev), sep);
     if(!ev->same_screen)
-        printf("!same_screen");
-    printf("\n");
+        fprintf(stderr, "!same_screen");
+    fprintf(stderr, "\n");
     return;
 
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("root=0x%x%s", (int)ev->root, sep);
-    printf("subwindow=0x%x%s", (int)ev->subwindow, sep);
-    printf("time=%s%s", ServerTime(ev->time), sep);
-    printf("x=%d y=%d%s", ev->x, ev->y, sep);
-    printf("x_root=%d y_root=%d%s", ev->x_root, ev->y_root, sep);
-    printf("state=%s%s", ButtonAndOrModifierState(ev->state), sep);
-    printf("keycode=%s%s", Keycode(ev), sep);
-    printf("same_screen=%s\n", TorF(ev->same_screen));
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "root=0x%x%s", (int)ev->root, sep);
+    fprintf(stderr, "subwindow=0x%x%s", (int)ev->subwindow, sep);
+    fprintf(stderr, "time=%s%s", ServerTime(ev->time), sep);
+    fprintf(stderr, "x=%d y=%d%s", ev->x, ev->y, sep);
+    fprintf(stderr, "x_root=%d y_root=%d%s", ev->x_root, ev->y_root, sep);
+    fprintf(stderr, "state=%s%s", ButtonAndOrModifierState(ev->state), sep);
+    fprintf(stderr, "keycode=%s%s", Keycode(ev), sep);
+    fprintf(stderr, "same_screen=%s\n", TorF(ev->same_screen));
 }
 
 static void
 VerbProperty(XPropertyEvent *ev)
 {
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("atom=%s%s", AtomName(ev->display, ev->atom), sep);
-    printf("time=%s%s", ServerTime(ev->time), sep);
-    printf("state=%s\n", PropertyState(ev->state));
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "atom=%s%s", AtomName(ev->display, ev->atom), sep);
+    fprintf(stderr, "time=%s%s", ServerTime(ev->time), sep);
+    fprintf(stderr, "state=%s\n", PropertyState(ev->state));
 }
 
 static void
 VerbResizeRequest(XResizeRequestEvent *ev)
 {
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("width=%d height=%d\n", ev->width, ev->height);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "width=%d height=%d\n", ev->width, ev->height);
 }
 
 static void
 VerbCirculate(XCirculateEvent *ev)
 {
-    printf("event=0x%x%s", (int)ev->event, sep);
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("place=%s\n", Place(ev->place));
+    fprintf(stderr, "event=0x%x%s", (int)ev->event, sep);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "place=%s\n", Place(ev->place));
 }
 
 static void
 VerbConfigure(XConfigureEvent *ev)
 {
-    printf("event=0x%x%s", (int)ev->event, sep);
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("x=%d y=%d%s", ev->x, ev->y, sep);
-    printf("width=%d height=%d%s", ev->width, ev->height, sep);
-    printf("border_width=%d%s", ev->border_width, sep);
-    printf("above=%s%s", MaybeNone(ev->above), sep);
-    printf("override_redirect=%s\n", TorF(ev->override_redirect));
+    fprintf(stderr, "event=0x%x%s", (int)ev->event, sep);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "x=%d y=%d%s", ev->x, ev->y, sep);
+    fprintf(stderr, "width=%d height=%d%s", ev->width, ev->height, sep);
+    fprintf(stderr, "border_width=%d%s", ev->border_width, sep);
+    fprintf(stderr, "above=%s%s", MaybeNone(ev->above), sep);
+    fprintf(stderr, "override_redirect=%s\n", TorF(ev->override_redirect));
 }
 
 static void
 VerbCreateWindow(XCreateWindowEvent *ev)
 {
-    printf("parent=0x%x%s", (int)ev->parent, sep);
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("x=%d y=%d%s", ev->x, ev->y, sep);
-    printf("width=%d height=%d%s", ev->width, ev->height, sep);
-    printf("border_width=%d%s", ev->border_width, sep);
-    printf("override_redirect=%s\n", TorF(ev->override_redirect));
+    fprintf(stderr, "parent=0x%x%s", (int)ev->parent, sep);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "x=%d y=%d%s", ev->x, ev->y, sep);
+    fprintf(stderr, "width=%d height=%d%s", ev->width, ev->height, sep);
+    fprintf(stderr, "border_width=%d%s", ev->border_width, sep);
+    fprintf(stderr, "override_redirect=%s\n", TorF(ev->override_redirect));
 }
 
 static void
 VerbDestroyWindow(XDestroyWindowEvent *ev)
 {
-    printf("event=0x%x%s", (int)ev->event, sep);
-    printf("window=0x%x\n", (int)ev->window);
+    fprintf(stderr, "event=0x%x%s", (int)ev->event, sep);
+    fprintf(stderr, "window=0x%x\n", (int)ev->window);
 }
 
 static void
 VerbGravity(XGravityEvent *ev)
 {
-    printf("event=0x%x%s", (int)ev->event, sep);
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("x=%d y=%d\n", ev->x, ev->y);
+    fprintf(stderr, "event=0x%x%s", (int)ev->event, sep);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "x=%d y=%d\n", ev->x, ev->y);
 }
 
 static void
 VerbMap(XMapEvent *ev)
 {
-    printf("event=0x%x%s", (int)ev->event, sep);
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("override_redirect=%s\n", TorF(ev->override_redirect));
+    fprintf(stderr, "event=0x%x%s", (int)ev->event, sep);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "override_redirect=%s\n", TorF(ev->override_redirect));
 }
 
 static void
 VerbReparent(XReparentEvent *ev)
 {
-    printf("event=0x%x%s", (int)ev->event, sep);
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("parent=0x%x%s", (int)ev->parent, sep);
-    printf("x=%d y=%d%s", ev->x, ev->y, sep);
-    printf("override_redirect=%s\n", TorF(ev->override_redirect));
+    fprintf(stderr, "event=0x%x%s", (int)ev->event, sep);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "parent=0x%x%s", (int)ev->parent, sep);
+    fprintf(stderr, "x=%d y=%d%s", ev->x, ev->y, sep);
+    fprintf(stderr, "override_redirect=%s\n", TorF(ev->override_redirect));
 }
 
 static void
 VerbUnmap(XUnmapEvent *ev)
 {
-    printf("event=0x%x%s", (int)ev->event, sep);
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("from_configure=%s\n", TorF(ev->from_configure));
+    fprintf(stderr, "event=0x%x%s", (int)ev->event, sep);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "from_configure=%s\n", TorF(ev->from_configure));
 }
 
 static void
 VerbCirculateRequest(XCirculateRequestEvent *ev)
 {
-    printf("parent=0x%x%s", (int)ev->parent, sep);
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("place=%s\n", Place(ev->place));
+    fprintf(stderr, "parent=0x%x%s", (int)ev->parent, sep);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "place=%s\n", Place(ev->place));
 }
 
 static void
 VerbConfigureRequest(XConfigureRequestEvent *ev)
 {
-    printf("parent=0x%x%s", (int)ev->parent, sep);
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("x=%d y=%d%s", ev->x, ev->y, sep);
-    printf("width=%d height=%d%s", ev->width, ev->height, sep);
-    printf("border_width=%d%s", ev->border_width, sep);
-    printf("above=%s%s", MaybeNone(ev->above), sep);
-    printf("detail=%s%s", ConfigureDetail(ev->detail), sep);
-    printf("value_mask=%s\n", ConfigureValueMask(ev->value_mask));
+    fprintf(stderr, "parent=0x%x%s", (int)ev->parent, sep);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "x=%d y=%d%s", ev->x, ev->y, sep);
+    fprintf(stderr, "width=%d height=%d%s", ev->width, ev->height, sep);
+    fprintf(stderr, "border_width=%d%s", ev->border_width, sep);
+    fprintf(stderr, "above=%s%s", MaybeNone(ev->above), sep);
+    fprintf(stderr, "detail=%s%s", ConfigureDetail(ev->detail), sep);
+    fprintf(stderr, "value_mask=%s\n", ConfigureValueMask(ev->value_mask));
 }
 
 static void
 VerbMapRequest(XMapRequestEvent *ev)
 {
-    printf("parent=0x%x%s", (int)ev->parent, sep);
-    printf("window=0x%x\n", (int)ev->window);
+    fprintf(stderr, "parent=0x%x%s", (int)ev->parent, sep);
+    fprintf(stderr, "window=0x%x\n", (int)ev->window);
 }
 
 static void
@@ -712,58 +712,58 @@ VerbClient(XClientMessageEvent *ev)
 {
     int i;
 
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("message_type=%s%s", AtomName(ev->display, ev->message_type), sep);
-    printf("format=%d\n", ev->format);
-    printf("data (shown as longs)=");
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "message_type=%s%s", AtomName(ev->display, ev->message_type), sep);
+    fprintf(stderr, "format=%d\n", ev->format);
+    fprintf(stderr, "data (shown as longs)=");
     for (i = 0; i < 5; i++)
-	printf(" 0x%08lx", ev->data.l[i]);
-    printf("\n");
+	fprintf(stderr, " 0x%08lx", ev->data.l[i]);
+    fprintf(stderr, "\n");
 }
 
 static void
 VerbMapping(XMappingEvent *ev)
 {
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("request=%s%s", MappingRequest(ev->request), sep);
-    printf("first_keycode=0x%x%s", ev->first_keycode, sep);
-    printf("count=0x%x\n", ev->count);
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "request=%s%s", MappingRequest(ev->request), sep);
+    fprintf(stderr, "first_keycode=0x%x%s", ev->first_keycode, sep);
+    fprintf(stderr, "count=0x%x\n", ev->count);
 }
 
 static void
 VerbSelectionClear(XSelectionClearEvent *ev)
 {
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("selection=%s%s", AtomName(ev->display, ev->selection), sep);
-    printf("time=%s\n", ServerTime(ev->time));
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "selection=%s%s", AtomName(ev->display, ev->selection), sep);
+    fprintf(stderr, "time=%s\n", ServerTime(ev->time));
 }
 
 static void
 VerbSelection(XSelectionEvent *ev)
 {
-    printf("requestor=0x%x%s", (int)ev->requestor, sep);
-    printf("selection=%s%s", AtomName(ev->display, ev->selection), sep);
-    printf("target=%s%s", AtomName(ev->display, ev->target), sep);
-    printf("property=%s%s", AtomName(ev->display, ev->property), sep);
-    printf("time=%s\n", ServerTime(ev->time));
+    fprintf(stderr, "requestor=0x%x%s", (int)ev->requestor, sep);
+    fprintf(stderr, "selection=%s%s", AtomName(ev->display, ev->selection), sep);
+    fprintf(stderr, "target=%s%s", AtomName(ev->display, ev->target), sep);
+    fprintf(stderr, "property=%s%s", AtomName(ev->display, ev->property), sep);
+    fprintf(stderr, "time=%s\n", ServerTime(ev->time));
 }
 
 static void
 VerbSelectionRequest(XSelectionRequestEvent *ev)
 {
-    printf("owner=0x%x%s", (int)ev->owner, sep);
-    printf("requestor=0x%x%s", (int)ev->requestor, sep);
-    printf("selection=%s%s", AtomName(ev->display, ev->selection), sep);
-    printf("target=%s%s", AtomName(ev->display, ev->target), sep);
-    printf("property=%s%s", AtomName(ev->display, ev->property), sep);
-    printf("time=%s\n", ServerTime(ev->time));
+    fprintf(stderr, "owner=0x%x%s", (int)ev->owner, sep);
+    fprintf(stderr, "requestor=0x%x%s", (int)ev->requestor, sep);
+    fprintf(stderr, "selection=%s%s", AtomName(ev->display, ev->selection), sep);
+    fprintf(stderr, "target=%s%s", AtomName(ev->display, ev->target), sep);
+    fprintf(stderr, "property=%s%s", AtomName(ev->display, ev->property), sep);
+    fprintf(stderr, "time=%s\n", ServerTime(ev->time));
 }
 
 static void
 VerbVisibility(XVisibilityEvent *ev)
 {
-    printf("window=0x%x%s", (int)ev->window, sep);
-    printf("state=%s\n", VisibilityState(ev->state));
+    fprintf(stderr, "window=0x%x%s", (int)ev->window, sep);
+    fprintf(stderr, "state=%s\n", VisibilityState(ev->state));
 }
 
 /******************************************************************************/
@@ -858,18 +858,18 @@ void printevent(XEvent *e)
     if(ev->window) {
 	    XFetchName(blz.dpy, ev->window, &name);
 	    if(name) {
-		    printf("\ttitle=%s\n", name);
+		    fprintf(stderr, "\ttitle=%s\n", name);
 		    XFree(name);
 	    }
     }
-    printf("%3ld %-20s ", ev->serial, eventtype(e));
+    fprintf(stderr, "%3ld %-20s ", ev->serial, eventtype(e));
     if(ev->send_event)
-        printf("(sendevent) ");
+        fprintf(stderr, "(sendevent) ");
     if(0){
-        printf("type=%s%s", eventtype(e), sep);
-        printf("serial=%lu%s", ev->serial, sep);
-        printf("send_event=%s%s", TorF(ev->send_event), sep);
-        printf("display=0x%p%s", ev->display, sep);
+        fprintf(stderr, "type=%s%s", eventtype(e), sep);
+        fprintf(stderr, "serial=%lu%s", ev->serial, sep);
+        fprintf(stderr, "send_event=%s%s", TorF(ev->send_event), sep);
+        fprintf(stderr, "display=0x%p%s", ev->display, sep);
     }
 
     switch (ev->type) {