Sync OpenBSD patchset 449:

Remove the xterm-keys code which is broken (a replacement is coming but some
more cleanup is needed first).

1 files changed, 27 insertions, 59 deletions

diff --git a/input-keys.c b/input-keys.c
index a279fdb6..1b14f81e 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -1,4 +1,4 @@
-/* $Id: input-keys.c,v 1.30 2009-10-12 00:18:19 tcunha Exp $ */
+/* $Id: input-keys.c,v 1.31 2009-10-28 22:51:55 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,6 @@ struct input_key_ent {
 #define INPUTKEY_KEYPAD 0x1	/* keypad key */
 #define INPUTKEY_CURSOR 0x2	/* cursor key */
 #define INPUTKEY_CTRL 0x4	/* may be modified with ctrl */
-#define INPUTKEY_XTERM 0x4	/* may have xterm argument appended */
 };
 
 struct input_key_ent input_keys[] = {
@@ -40,32 +39,32 @@ struct input_key_ent input_keys[] = {
 	{ KEYC_BSPACE, "\177",	   0 },
 
 	/* Function keys. */
-	{ KEYC_F1,     "\033OP",   INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F2,     "\033OQ",   INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F3,     "\033OR",   INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F4,     "\033OS",   INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F5,     "\033[15~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F6,     "\033[17~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F7,     "\033[18~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F8,     "\033[19~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F9,     "\033[20~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F10,    "\033[21~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F11,    "\033[23~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F12,    "\033[24~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F13,    "\033[25~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F14,    "\033[26~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F15,    "\033[28~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F16,    "\033[29~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F17,    "\033[31~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F18,    "\033[32~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F19,    "\033[33~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_F20,    "\033[34~", INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_IC,     "\033[2~",  INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_DC,     "\033[3~",  INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_HOME,   "\033[1~",  INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_END,    "\033[4~",  INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_NPAGE,  "\033[6~",  INPUTKEY_CTRL|INPUTKEY_XTERM },
-	{ KEYC_PPAGE,  "\033[5~",  INPUTKEY_CTRL|INPUTKEY_XTERM },
+	{ KEYC_F1,     "\033OP",   INPUTKEY_CTRL },
+	{ KEYC_F2,     "\033OQ",   INPUTKEY_CTRL },
+	{ KEYC_F3,     "\033OR",   INPUTKEY_CTRL },
+	{ KEYC_F4,     "\033OS",   INPUTKEY_CTRL },
+	{ KEYC_F5,     "\033[15~", INPUTKEY_CTRL },
+	{ KEYC_F6,     "\033[17~", INPUTKEY_CTRL },
+	{ KEYC_F7,     "\033[18~", INPUTKEY_CTRL },
+	{ KEYC_F8,     "\033[19~", INPUTKEY_CTRL },
+	{ KEYC_F9,     "\033[20~", INPUTKEY_CTRL },
+	{ KEYC_F10,    "\033[21~", INPUTKEY_CTRL },
+	{ KEYC_F11,    "\033[23~", INPUTKEY_CTRL },
+	{ KEYC_F12,    "\033[24~", INPUTKEY_CTRL },
+	{ KEYC_F13,    "\033[25~", INPUTKEY_CTRL },
+	{ KEYC_F14,    "\033[26~", INPUTKEY_CTRL },
+	{ KEYC_F15,    "\033[28~", INPUTKEY_CTRL },
+	{ KEYC_F16,    "\033[29~", INPUTKEY_CTRL },
+	{ KEYC_F17,    "\033[31~", INPUTKEY_CTRL },
+	{ KEYC_F18,    "\033[32~", INPUTKEY_CTRL },
+	{ KEYC_F19,    "\033[33~", INPUTKEY_CTRL },
+	{ KEYC_F20,    "\033[34~", INPUTKEY_CTRL },
+	{ KEYC_IC,     "\033[2~",  INPUTKEY_CTRL },
+	{ KEYC_DC,     "\033[3~",  INPUTKEY_CTRL },
+	{ KEYC_HOME,   "\033[1~",  INPUTKEY_CTRL },
+	{ KEYC_END,    "\033[4~",  INPUTKEY_CTRL },
+	{ KEYC_NPAGE,  "\033[6~",  INPUTKEY_CTRL },
+	{ KEYC_PPAGE,  "\033[5~",  INPUTKEY_CTRL },
 	{ KEYC_BTAB,   "\033[Z",   INPUTKEY_CTRL },
 
 	/* Arrow keys. Cursor versions must come first. */
@@ -173,37 +172,6 @@ input_key(struct window_pane *wp, int key)
 	log_debug2("found key 0x%x: \"%s\"", key, ike->data);
 
 	/*
-	 * If in xterm keys mode, work out and append the modifier as an
-	 * argument.
-	 */
-	xterm_keys = options_get_number(&wp->window->options, "xterm-keys");
-	if (xterm_keys && ike->flags & INPUTKEY_XTERM) {
-		ch = '\0';
-		if (key & (KEYC_SHIFT|KEYC_ESCAPE|KEYC_CTRL))
-			ch = '8';
-		else if (key & (KEYC_ESCAPE|KEYC_CTRL))
-			ch = '7';
-		else if (key & (KEYC_SHIFT|KEYC_CTRL))
-			ch = '6';
-		else if (key & KEYC_CTRL)
-			ch = '5';
-		else if (key & (KEYC_SHIFT|KEYC_ESCAPE))
-			ch = '4';
-		else if (key & KEYC_ESCAPE)
-			ch = '3';
-		else if (key & KEYC_SHIFT)
-			ch = '2';
-		if (ch != '\0') {
-			buffer_write(wp->out, ike->data, dlen - 1);
-			buffer_write8(wp->out, ';');
-			buffer_write8(wp->out, ch);
-			buffer_write8(wp->out, ike->data[dlen - 1]);
-		} else
-			buffer_write(wp->out, ike->data, dlen);
-		return;
-	}
-
-	/*
 	 * Not in xterm mode. Prefix a \033 for escape, and set bit 5 of the
 	 * last byte for ctrl.
 	 */