===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/input-keys.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/tmux/input-keys.c	2009/10/26 17:59:46	1.13
--- src/usr.bin/tmux/input-keys.c	2009/11/04 22:43:11	1.14
***************
*** 1,4 ****
! /* $OpenBSD: input-keys.c,v 1.13 2009/10/26 17:59:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: input-keys.c,v 1.14 2009/11/04 22:43:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 163,168 ****
--- 163,169 ----
  	u_int			i;
  	size_t			dlen;
  	char		       *out;
+ 	u_char			ch;
  
  	log_debug2("writing key 0x%x", key);
  
***************
*** 172,179 ****
  	 */
  	if (key != KEYC_NONE && (key & ~KEYC_ESCAPE) < 0x100) {
  		if (key & KEYC_ESCAPE)
! 			buffer_write8(wp->out, '\033');
! 		buffer_write8(wp->out, (uint8_t) (key & ~KEYC_ESCAPE));
  		return;
  	}
  
--- 173,182 ----
  	 */
  	if (key != KEYC_NONE && (key & ~KEYC_ESCAPE) < 0x100) {
  		if (key & KEYC_ESCAPE)
! 			ch = '\033';
! 		else
! 			ch = key & ~KEYC_ESCAPE;
! 		bufferevent_write(wp->event, &ch, 1);
  		return;
  	}
  
***************
*** 183,189 ****
  	 */
  	if (options_get_number(&wp->window->options, "xterm-keys")) {
  		if ((out = xterm_keys_lookup(key)) != NULL) {
! 			buffer_write(wp->out, out, strlen(out));
  			xfree(out);
  			return;
  		}
--- 186,192 ----
  	 */
  	if (options_get_number(&wp->window->options, "xterm-keys")) {
  		if ((out = xterm_keys_lookup(key)) != NULL) {
! 			bufferevent_write(wp->event, out, strlen(out));
  			xfree(out);
  			return;
  		}
***************
*** 214,231 ****
  
  	/* Prefix a \033 for escape. */
  	if (key & KEYC_ESCAPE)
! 		buffer_write8(wp->out, '\033');
! 	buffer_write(wp->out, ike->data, dlen);
  }
  
  /* Translate mouse and output. */
  void
  input_mouse(struct window_pane *wp, struct mouse_event *m)
  {
  	if (wp->screen->mode & MODE_MOUSE) {
! 		buffer_write(wp->out, "\033[M", 3);
! 		buffer_write8(wp->out, m->b + 32);
! 		buffer_write8(wp->out, m->x + 33);
! 		buffer_write8(wp->out, m->y + 33);
  	}
  }
--- 217,235 ----
  
  	/* Prefix a \033 for escape. */
  	if (key & KEYC_ESCAPE)
! 		bufferevent_write(wp->event, "\033", 1);
! 	bufferevent_write(wp->event, ike->data, dlen);
  }
  
  /* Translate mouse and output. */
  void
  input_mouse(struct window_pane *wp, struct mouse_event *m)
  {
+ 	char	out[8];
+ 
  	if (wp->screen->mode & MODE_MOUSE) {
! 		xsnprintf(out, sizeof out,
! 		    "\033[M%c%c%c", m->b + 32, m->x + 33, m->y + 33);
! 		bufferevent_write(wp->event, out, strlen(out));
  	}
  }