===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -c -r1.30 -r1.31
*** src/usr.bin/tmux/window.c	2009/10/10 15:29:34	1.30
--- src/usr.bin/tmux/window.c	2009/10/11 07:01:10	1.31
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.30 2009/10/10 15:29:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.31 2009/10/11 07:01:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 653,677 ****
  
  void
  window_pane_mouse(
!     struct window_pane *wp, struct client *c, u_char b, u_char x, u_char y)
  {
  	if (!window_pane_visible(wp))
  		return;
  
! 	/* XXX convert from 1-based? */
! 
! 	if (x < wp->xoff || x >= wp->xoff + wp->sx)
  		return;
! 	if (y < wp->yoff || y >= wp->yoff + wp->sy)
  		return;
! 	x -= wp->xoff;
! 	y -= wp->yoff;
  
  	if (wp->mode != NULL) {
  		if (wp->mode->mouse != NULL)
! 			wp->mode->mouse(wp, c, b, x, y);
  	} else if (wp->fd != -1)
! 		input_mouse(wp, b, x, y);
  }
  
  int
--- 653,675 ----
  
  void
  window_pane_mouse(
!     struct window_pane *wp, struct client *c, struct mouse_event *m)
  {
  	if (!window_pane_visible(wp))
  		return;
  
! 	if (m->x < wp->xoff || m->x >= wp->xoff + wp->sx)
  		return;
! 	if (m->y < wp->yoff || m->y >= wp->yoff + wp->sy)
  		return;
! 	m->x -= wp->xoff;
! 	m->y -= wp->yoff;
  
  	if (wp->mode != NULL) {
  		if (wp->mode->mouse != NULL)
! 			wp->mode->mouse(wp, c, m);
  	} else if (wp->fd != -1)
! 		input_mouse(wp, m);
  }
  
  int