===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- src/usr.bin/tmux/server.c	2009/10/10 10:02:48	1.47
+++ src/usr.bin/tmux/server.c	2009/10/10 14:51:16	1.48
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.47 2009/10/10 10:02:48 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.48 2009/10/10 14:51:16 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -825,6 +825,7 @@
 	struct window		*w;
 	struct window_pane	*wp;
 	struct screen		*s;
+	struct options		*oo;
 	struct timeval	 	 tv;
 	struct key_binding	*bd;
 	struct keylist		*keylist;
@@ -849,6 +850,7 @@
 		c->session->activity = time(NULL);
 		w = c->session->curw->window;
 		wp = w->active;	/* could die */
+		oo = &c->session->options;
 
 		/* Special case: number keys jump to pane in identify mode. */
 		if (c->flags & CLIENT_IDENTIFY && key >= '0' && key <= '9') {	
@@ -868,6 +870,10 @@
 
 		/* Check for mouse keys. */
 		if (key == KEYC_MOUSE) {
+			if (options_get_number(oo, "mouse-select-pane")) {
+				window_set_active_at(w, mouse[1], mouse[2]);
+				wp = w->active;
+			}
 			window_pane_mouse(wp, c, mouse[0], mouse[1], mouse[2]);
 			continue;
 		}
@@ -935,7 +941,9 @@
 	}
 	if (c->session == NULL)
 		return;
-	wp = c->session->curw->window->active;	/* could die - do each loop */
+	w = c->session->curw->window;
+	wp = w->active;
+	oo = &c->session->options;
 	s = wp->screen;
 
 	/*
@@ -948,7 +956,7 @@
 	 * tty_region/tty_reset/tty_update_mode already take care of not
 	 * resetting things that are already in their default state.
 	 */
-	status = options_get_number(&c->session->options, "status");
+	status = options_get_number(oo, "status");
 	tty_region(&c->tty, 0, c->tty.sy - 1, 0);
 	if (!window_pane_visible(wp) || wp->yoff + s->cy >= c->tty.sy - status)
 		tty_cursor(&c->tty, 0, 0, 0, 0);
@@ -956,6 +964,9 @@
 		tty_cursor(&c->tty, s->cx, s->cy, wp->xoff, wp->yoff);
 
 	mode = s->mode;
+	if (TAILQ_NEXT(TAILQ_FIRST(&w->panes), entry) != NULL &&
+	    options_get_number(oo, "mouse-select-pane"))
+		mode |= MODE_MOUSE;
 	tty_update_mode(&c->tty, mode);
 	tty_reset(&c->tty);
 }