===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/input.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -c -r1.64 -r1.65
*** src/usr.bin/tmux/input.c	2013/10/10 11:57:14	1.64
--- src/usr.bin/tmux/input.c	2014/01/31 11:17:20	1.65
***************
*** 1,4 ****
! /* $OpenBSD: input.c,v 1.64 2013/10/10 11:57:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: input.c,v 1.65 2014/01/31 11:17:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 74,79 ****
--- 74,80 ----
  void	input_csi_dispatch_rm_private(struct input_ctx *);
  void	input_csi_dispatch_sm(struct input_ctx *);
  void	input_csi_dispatch_sm_private(struct input_ctx *);
+ void	input_csi_dispatch_winops(struct input_ctx *);
  void	input_csi_dispatch_sgr(struct input_ctx *);
  int	input_dcs_dispatch(struct input_ctx *);
  int	input_utf8_open(struct input_ctx *);
***************
*** 154,159 ****
--- 155,161 ----
  	INPUT_CSI_SM_PRIVATE,
  	INPUT_CSI_TBC,
  	INPUT_CSI_VPA,
+ 	INPUT_CSI_WINOPS,
  };
  
  /* Control (CSI) command table. */
***************
*** 188,193 ****
--- 190,196 ----
  	{ 'q', " ", INPUT_CSI_DECSCUSR },
  	{ 'r', "",  INPUT_CSI_DECSTBM },
  	{ 's', "",  INPUT_CSI_SCP },
+ 	{ 't', "",  INPUT_CSI_WINOPS },
  	{ 'u', "",  INPUT_CSI_RCP },
  };
  
***************
*** 1077,1083 ****
  	struct screen_write_ctx	       *sctx = &ictx->ctx;
  	struct screen		       *s = sctx->s;
  	struct input_table_entry       *entry;
! 	int			 	n, m;
  
  	if (ictx->flags & INPUT_DISCARD)
  		return (0);
--- 1080,1086 ----
  	struct screen_write_ctx	       *sctx = &ictx->ctx;
  	struct screen		       *s = sctx->s;
  	struct input_table_entry       *entry;
! 	int				n, m;
  
  	if (ictx->flags & INPUT_DISCARD)
  		return (0);
***************
*** 1117,1122 ****
--- 1120,1128 ----
  		m = input_get(ictx, 1, 1, 1);
  		screen_write_cursormove(sctx, m - 1, n - 1);
  		break;
+ 	case INPUT_CSI_WINOPS:
+ 		input_csi_dispatch_winops(ictx);
+ 		break;
  	case INPUT_CSI_CUU:
  		screen_write_cursorup(sctx, input_get(ictx, 0, 1, 1));
  		break;
***************
*** 1427,1432 ****
--- 1433,1487 ----
  			log_debug("%s: unknown '%c'", __func__, ictx->ch);
  			break;
  		}
+ 	}
+ }
+ 
+ /* Handle CSI window operations. */
+ void
+ input_csi_dispatch_winops(struct input_ctx *ictx)
+ {
+ 	struct window_pane	*wp = ictx->wp;
+ 	int			 n, m;
+ 
+ 	m = 0;
+ 	while ((n = input_get(ictx, m, 0, -1)) != -1) {
+ 		switch (n) {
+ 		case 1:
+ 		case 2:
+ 		case 5:
+ 		case 6:
+ 		case 7:
+ 		case 11:
+ 		case 13:
+ 		case 14:
+ 		case 19:
+ 		case 20:
+ 		case 21:
+ 		case 24:
+ 			break;
+ 		case 3:
+ 		case 4:
+ 		case 8:
+ 			m++;
+ 			if (input_get(ictx, m, 0, -1) == -1)
+ 				return;
+ 			/* FALLTHROUGH */
+ 		case 9:
+ 		case 10:
+ 		case 22:
+ 		case 23:
+ 			m++;
+ 			if (input_get(ictx, m, 0, -1) == -1)
+ 				return;
+ 			break;
+ 		case 18:
+ 			input_reply(ictx, "\033[8;%u;%u", wp->sy, wp->sx);
+ 			break;
+ 		default:
+ 			log_debug("%s: unknown '%c'", __func__, ictx->ch);
+ 			break;
+ 		}
+ 		m++;
  	}
  }