===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-keys.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** src/usr.bin/tmux/tty-keys.c	2012/04/22 05:21:40	1.39
--- src/usr.bin/tmux/tty-keys.c	2012/05/22 14:11:30	1.40
***************
*** 1,4 ****
! /* $OpenBSD: tty-keys.c,v 1.39 2012/04/22 05:21:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty-keys.c,v 1.40 2012/05/22 14:11:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 40,47 ****
  		    struct tty_key *, const char *, size_t, size_t *);
  struct tty_key *tty_keys_find(struct tty *, const char *, size_t, size_t *);
  void		tty_keys_callback(int, short, void *);
! int		tty_keys_mouse(struct tty *,
! 		    const char *, size_t, size_t *, struct mouse_event *);
  int		tty_keys_device(struct tty *, const char *, size_t, size_t *);
  
  struct tty_key_ent {
--- 40,46 ----
  		    struct tty_key *, const char *, size_t, size_t *);
  struct tty_key *tty_keys_find(struct tty *, const char *, size_t, size_t *);
  void		tty_keys_callback(int, short, void *);
! int		tty_keys_mouse(struct tty *, const char *, size_t, size_t *);
  int		tty_keys_device(struct tty *, const char *, size_t, size_t *);
  
  struct tty_key_ent {
***************
*** 434,446 ****
  int
  tty_keys_next(struct tty *tty)
  {
! 	struct tty_key		*tk;
! 	struct timeval		 tv;
! 	struct mouse_event	 mouse;
! 	const char		*buf;
! 	size_t			 len, size;
! 	cc_t			 bspace;
! 	int			 key, delay;
  
  	buf = EVBUFFER_DATA(tty->event->input);
  	len = EVBUFFER_LENGTH(tty->event->input);
--- 433,444 ----
  int
  tty_keys_next(struct tty *tty)
  {
! 	struct tty_key	*tk;
! 	struct timeval	 tv;
! 	const char	*buf;
! 	size_t		 len, size;
! 	cc_t		 bspace;
! 	int		 key, delay;
  
  	buf = EVBUFFER_DATA(tty->event->input);
  	len = EVBUFFER_LENGTH(tty->event->input);
***************
*** 477,483 ****
  	}
  
  	/* Is this a mouse key press? */
! 	switch (tty_keys_mouse(tty, buf, len, &size, &mouse)) {
  	case 0:		/* yes */
  		evbuffer_drain(tty->event->input, size);
  		key = KEYC_MOUSE;
--- 475,481 ----
  	}
  
  	/* Is this a mouse key press? */
! 	switch (tty_keys_mouse(tty, buf, len, &size)) {
  	case 0:		/* yes */
  		evbuffer_drain(tty->event->input, size);
  		key = KEYC_MOUSE;
***************
*** 582,588 ****
  		evtimer_del(&tty->key_timer);
  
  	if (key != KEYC_NONE)
! 		tty->key_callback(key, &mouse, tty->key_data);
  
  	tty->flags &= ~TTY_ESCAPE;
  	return (1);
--- 580,586 ----
  		evtimer_del(&tty->key_timer);
  
  	if (key != KEYC_NONE)
! 		tty->key_callback(key, &tty->mouse_event, tty->key_data);
  
  	tty->flags &= ~TTY_ESCAPE;
  	return (1);
***************
*** 607,617 ****
   * (probably a mouse sequence but need more data).
   */
  int
! tty_keys_mouse(struct tty *tty,
!     const char *buf, size_t len, size_t *size, struct mouse_event *m)
  {
! 	struct utf8_data	utf8data;
! 	u_int			i, value;
  
  	/*
  	 * Standard mouse sequences are \033[M followed by three characters
--- 605,615 ----
   * (probably a mouse sequence but need more data).
   */
  int
! tty_keys_mouse(struct tty *tty, const char *buf, size_t len, size_t *size)
  {
! 	struct mouse_event	*m = &tty->mouse_event;
! 	struct utf8_data	 utf8data;
! 	u_int			 i, value;
  
  	/*
  	 * Standard mouse sequences are \033[M followed by three characters