===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -c -r1.87 -r1.88
*** src/usr.bin/tmux/status.c	2012/01/29 09:37:02	1.87
--- src/usr.bin/tmux/status.c	2012/03/03 08:55:56	1.88
***************
*** 1,4 ****
! /* $OpenBSD: status.c,v 1.87 2012/01/29 09:37:02 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: status.c,v 1.88 2012/03/03 08:55:56 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 141,147 ****
  	struct session	*s = c->session;
  	struct winlink	*wl;
  
! 	x += s->wlmouse;
  	RB_FOREACH(wl, winlinks, &s->windows) {
  		if (x < wl->status_width &&
  			session_select(s, wl->idx) == 0) {
--- 141,147 ----
  	struct session	*s = c->session;
  	struct winlink	*wl;
  
! 	x += c->wlmouse;
  	RB_FOREACH(wl, winlinks, &s->windows) {
  		if (x < wl->status_width &&
  			session_select(s, wl->idx) == 0) {
***************
*** 356,362 ****
  		wloffset++;
  
  	/* Copy the window list. */
! 	s->wlmouse = -wloffset + wlstart;
  	screen_write_cursormove(&ctx, wloffset, 0);
  	screen_write_copy(&ctx, &window_list, wlstart, 0, wlwidth, 1);
  	screen_free(&window_list);
--- 356,362 ----
  		wloffset++;
  
  	/* Copy the window list. */
! 	c->wlmouse = -wloffset + wlstart;
  	screen_write_cursormove(&ctx, wloffset, 0);
  	screen_write_copy(&ctx, &window_list, wlstart, 0, wlwidth, 1);
  	screen_free(&window_list);