===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- src/usr.bin/tmux/server-client.c	2011/03/29 19:30:16	1.52
+++ src/usr.bin/tmux/server-client.c	2011/04/18 19:49:05	1.53
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.52 2011/03/29 19:30:16 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.53 2011/04/18 19:49:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -319,6 +319,12 @@
 			server_redraw_window_borders(w);
 			wp = w->active;
 		}
+		if (mouse->y + 1 == c->tty.sy && mouse->b == MOUSE_UP &&
+		    options_get_number(oo, "mouse-select-window") &&
+		    options_get_number(oo, "status")) {
+			status_set_window_at(c, mouse->x);
+			return;
+		}
 		window_pane_mouse(wp, c->session, mouse);
 		return;
 	}
@@ -456,6 +462,10 @@
 	mode = s->mode;
 	if (TAILQ_NEXT(TAILQ_FIRST(&w->panes), entry) != NULL &&
 	    options_get_number(oo, "mouse-select-pane") &&
+	    (mode & ALL_MOUSE_MODES) == 0)
+		mode |= MODE_MOUSE_STANDARD;
+
+	if (options_get_number(oo, "mouse-select-window") &&
 	    (mode & ALL_MOUSE_MODES) == 0)
 		mode |= MODE_MOUSE_STANDARD;