summaryrefslogtreecommitdiffstats
path: root/tty-keys.c
diff options
context:
space:
mode:
authornicm <nicm>2017-04-18 21:41:42 +0000
committernicm <nicm>2017-04-18 21:41:42 +0000
commitf731ae4a2dc6aca565b20dffd6ddf661e585cbb5 (patch)
treea76fe1ffcb324ce0723b653234db7e0191864cb7 /tty-keys.c
parent8c8ce08d7927e6a83f0cb09388b2d1068fded529 (diff)
Revert use of DECSLRM on iTerm2, it doesn't help as much as we throught,
and there are some question marks about it's support.
Diffstat (limited to 'tty-keys.c')
-rw-r--r--tty-keys.c44
1 files changed, 0 insertions, 44 deletions
diff --git a/tty-keys.c b/tty-keys.c
index 9cd61e19..a011fcab 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -46,8 +46,6 @@ static void tty_keys_callback(int, short, void *);
static int tty_keys_mouse(struct tty *, const char *, size_t, size_t *);
static int tty_keys_device_attributes(struct tty *, const char *, size_t,
size_t *);
-static int tty_keys_iterm2_version(struct tty *, const char *, size_t,
- size_t *);
/* Default raw keys. */
struct tty_default_key_raw {
@@ -555,17 +553,6 @@ tty_keys_next(struct tty *tty)
goto partial_key;
}
- /* Or a response from iTerm2? */
- switch (tty_keys_iterm2_version(tty, buf, len, &size)) {
- case 0: /* yes */
- key = KEYC_UNKNOWN;
- goto complete_key;
- case -1: /* no, or not valid */
- break;
- case 1: /* partial */
- goto partial_key;
- }
-
/* Is this a mouse key press? */
switch (tty_keys_mouse(tty, buf, len, &size)) {
case 0: /* yes */
@@ -925,34 +912,3 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len,
types[type]);
return (0);
}
-
-/*
- * Handle a version response from iTerm2. Returns 0 for success, -1 for
- * failure, 1 for partial.
- */
-static int
-tty_keys_iterm2_version(struct tty *tty, const char *buf, size_t len,
- size_t *size)
-{
- struct client *c = tty->client;
- u_int i;
-
- *size = 0;
-
- if (memcmp("\033[ITERM2 ", buf, (len > 9) ? 9 : len) != 0)
- return (-1);
- if (len < 10)
- return (1);
- for (i = 9; i < len; i++) {
- if (buf[i] == 'n')
- break;
- }
- if (i == len)
- return (1);
- *size = i + 1;
-
- tty_set_type(tty, TTY_ITERM2);
-
- log_debug("%s: this is iTerm2", c->name);
- return (0);
-}