===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/input.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -c -r1.58 -r1.59
*** src/usr.bin/tmux/input.c	2013/01/18 02:16:21	1.58
--- src/usr.bin/tmux/input.c	2013/03/21 18:47:56	1.59
***************
*** 1,4 ****
! /* $OpenBSD: input.c,v 1.58 2013/01/18 02:16:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: input.c,v 1.59 2013/03/21 18:47:56 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 1033,1042 ****
  		screen_write_reverseindex(sctx);
  		break;
  	case INPUT_ESC_DECKPAM:
! 		screen_write_kkeypadmode(sctx, 1);
  		break;
  	case INPUT_ESC_DECKPNM:
! 		screen_write_kkeypadmode(sctx, 0);
  		break;
  	case INPUT_ESC_DECSC:
  		memcpy(&ictx->old_cell, &ictx->cell, sizeof ictx->old_cell);
--- 1033,1042 ----
  		screen_write_reverseindex(sctx);
  		break;
  	case INPUT_ESC_DECKPAM:
! 		screen_write_mode_set(sctx, MODE_KKEYPAD);
  		break;
  	case INPUT_ESC_DECKPNM:
! 		screen_write_mode_clear(sctx, MODE_KKEYPAD);
  		break;
  	case INPUT_ESC_DECSC:
  		memcpy(&ictx->old_cell, &ictx->cell, sizeof ictx->old_cell);
***************
*** 1232,1238 ****
  	case INPUT_CSI_RM:
  		switch (input_get(ictx, 0, 0, -1)) {
  		case 4:		/* IRM */
! 			screen_write_insertmode(&ictx->ctx, 0);
  			break;
  		default:
  			log_debug("%s: unknown '%c'", __func__, ictx->ch);
--- 1232,1238 ----
  	case INPUT_CSI_RM:
  		switch (input_get(ictx, 0, 0, -1)) {
  		case 4:		/* IRM */
! 			screen_write_mode_clear(&ictx->ctx, MODE_INSERT);
  			break;
  		default:
  			log_debug("%s: unknown '%c'", __func__, ictx->ch);
***************
*** 1242,1264 ****
  	case INPUT_CSI_RM_PRIVATE:
  		switch (input_get(ictx, 0, 0, -1)) {
  		case 1:		/* GATM */
! 			screen_write_kcursormode(&ictx->ctx, 0);
  			break;
  		case 3:		/* DECCOLM */
  			screen_write_cursormove(&ictx->ctx, 0, 0);
  			screen_write_clearscreen(&ictx->ctx);
  			break;
  		case 25:	/* TCEM */
! 			screen_write_cursormode(&ictx->ctx, 0);
  			break;
  		case 1000:
  		case 1001:
  		case 1002:
  		case 1003:
! 			screen_write_mousemode_off(&ictx->ctx);
  			break;
  		case 1005:
! 			screen_write_utf8mousemode(&ictx->ctx, 0);
  			break;
  		case 47:
  		case 1047:
--- 1242,1264 ----
  	case INPUT_CSI_RM_PRIVATE:
  		switch (input_get(ictx, 0, 0, -1)) {
  		case 1:		/* GATM */
! 			screen_write_mode_clear(&ictx->ctx, MODE_KCURSOR);
  			break;
  		case 3:		/* DECCOLM */
  			screen_write_cursormove(&ictx->ctx, 0, 0);
  			screen_write_clearscreen(&ictx->ctx);
  			break;
  		case 25:	/* TCEM */
! 			screen_write_mode_clear(&ictx->ctx, MODE_CURSOR);
  			break;
  		case 1000:
  		case 1001:
  		case 1002:
  		case 1003:
! 			screen_write_mode_clear(&ictx->ctx, ALL_MOUSE_MODES);
  			break;
  		case 1005:
! 			screen_write_mode_clear(&ictx->ctx, MODE_MOUSE_UTF8);
  			break;
  		case 47:
  		case 1047:
***************
*** 1268,1274 ****
  			window_pane_alternate_off(wp, &ictx->cell, 1);
  			break;
  		case 2004:
! 			screen_write_bracketpaste(&ictx->ctx, 0);
  			break;
  		default:
  			log_debug("%s: unknown '%c'", __func__, ictx->ch);
--- 1268,1274 ----
  			window_pane_alternate_off(wp, &ictx->cell, 1);
  			break;
  		case 2004:
! 			screen_write_mode_clear(&ictx->ctx, MODE_BRACKETPASTE);
  			break;
  		default:
  			log_debug("%s: unknown '%c'", __func__, ictx->ch);
***************
*** 1286,1292 ****
  	case INPUT_CSI_SM:
  		switch (input_get(ictx, 0, 0, -1)) {
  		case 4:		/* IRM */
! 			screen_write_insertmode(&ictx->ctx, 1);
  			break;
  		default:
  			log_debug("%s: unknown '%c'", __func__, ictx->ch);
--- 1286,1292 ----
  	case INPUT_CSI_SM:
  		switch (input_get(ictx, 0, 0, -1)) {
  		case 4:		/* IRM */
! 			screen_write_mode_set(&ictx->ctx, MODE_INSERT);
  			break;
  		default:
  			log_debug("%s: unknown '%c'", __func__, ictx->ch);
***************
*** 1296,1323 ****
  	case INPUT_CSI_SM_PRIVATE:
  		switch (input_get(ictx, 0, 0, -1)) {
  		case 1:		/* GATM */
! 			screen_write_kcursormode(&ictx->ctx, 1);
  			break;
  		case 3:		/* DECCOLM */
  			screen_write_cursormove(&ictx->ctx, 0, 0);
  			screen_write_clearscreen(&ictx->ctx);
  			break;
  		case 25:	/* TCEM */
! 			screen_write_cursormode(&ictx->ctx, 1);
  			break;
  		case 1000:
! 			screen_write_mousemode_on(
! 			    &ictx->ctx, MODE_MOUSE_STANDARD);
  			break;
  		case 1002:
! 			screen_write_mousemode_on(
! 			    &ictx->ctx, MODE_MOUSE_BUTTON);
  			break;
  		case 1003:
! 			screen_write_mousemode_on(&ictx->ctx, MODE_MOUSE_ANY);
  			break;
  		case 1005:
! 			screen_write_utf8mousemode(&ictx->ctx, 1);
  			break;
  		case 47:
  		case 1047:
--- 1296,1324 ----
  	case INPUT_CSI_SM_PRIVATE:
  		switch (input_get(ictx, 0, 0, -1)) {
  		case 1:		/* GATM */
! 			screen_write_mode_set(&ictx->ctx, MODE_KCURSOR);
  			break;
  		case 3:		/* DECCOLM */
  			screen_write_cursormove(&ictx->ctx, 0, 0);
  			screen_write_clearscreen(&ictx->ctx);
  			break;
  		case 25:	/* TCEM */
! 			screen_write_mode_set(&ictx->ctx, MODE_CURSOR);
  			break;
  		case 1000:
! 			screen_write_mode_clear(&ictx->ctx, ALL_MOUSE_MODES);
! 			screen_write_mode_set(&ictx->ctx, MODE_MOUSE_STANDARD);
  			break;
  		case 1002:
! 			screen_write_mode_clear(&ictx->ctx, ALL_MOUSE_MODES);
! 			screen_write_mode_set(&ictx->ctx, MODE_MOUSE_BUTTON);
  			break;
  		case 1003:
! 			screen_write_mode_clear(&ictx->ctx, ALL_MOUSE_MODES);
! 			screen_write_mode_set(&ictx->ctx, MODE_MOUSE_ANY);
  			break;
  		case 1005:
! 			screen_write_mode_set(&ictx->ctx, MODE_MOUSE_UTF8);
  			break;
  		case 47:
  		case 1047:
***************
*** 1327,1333 ****
  			window_pane_alternate_on(wp, &ictx->cell, 1);
  			break;
  		case 2004:
! 			screen_write_bracketpaste(&ictx->ctx, 1);
  			break;
  		default:
  			log_debug("%s: unknown '%c'", __func__, ictx->ch);
--- 1328,1334 ----
  			window_pane_alternate_on(wp, &ictx->cell, 1);
  			break;
  		case 2004:
! 			screen_write_mode_set(&ictx->ctx, MODE_BRACKETPASTE);
  			break;
  		default:
  			log_debug("%s: unknown '%c'", __func__, ictx->ch);