The branch, master has been updated
via 10db7ec51b484d59fa039e64e85ea463553bf1ad (commit)
from 4f01bfc4bce9688c6c8b35f698c8444270e20cdc (commit)
- Log -----------------------------------------------------------------
commit 10db7ec51b484d59fa039e64e85ea463553bf1ad
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Include the \033 in the key tree and adjust key matching for this change.
---
tmux.h | 2 +-
tty-keys.c | 143 ++++++++++++++++++++++++++----------------------------------
tty.c | 2 +-
3 files changed, 64 insertions(+), 83 deletions(-)
diff --git a/tmux.h b/tmux.h
index 90ee3b0..f5dc0f7 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1202,7 +1202,7 @@ struct tty {
#define TTY_NOCURSOR 0x1
#define TTY_FREEZE 0x2
-#define TTY_ESCAPE 0x4
+#define TTY_TIMER 0x4
#define TTY_UTF8 0x8
#define TTY_STARTED 0x10
#define TTY_OPENED 0x20
diff --git a/tty-keys.c b/tty-keys.c
index 8da621e..b29f647 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -353,17 +353,19 @@ tty_keys_build(struct tty *tty)
tdkr = &tty_default_raw_keys[i];
s = tdkr->string;
- if (s[0] == '\033' && s[1] != '\0')
- tty_keys_add(tty, s + 1, tdkr->key);
+ if (*s != '\0')
+ tty_keys_add(tty, s, tdkr->key);
}
for (i = 0; i < nitems(tty_default_code_keys); i++) {
tdkc = &tty_default_code_keys[i];
s = tty_term_string(tty->term, tdkc->code);
- if (s[0] == '\033' || s[1] == '\0')
- tty_keys_add(tty, s + 1, tdkc->key);
+ if (*s == '\0')
+ tty_keys_add(tty, s, tdkc->key);
}
+
+ tty_keys_add(tty, "abc", 'x');
}
/* Free the entire key tree. */
@@ -439,34 +441,18 @@ tty_keys_next(struct tty *tty)
cc_t bspace;
int key, delay;
+ /* Get key buffer. */
buf = EVBUFFER_DATA(tty->event->input);
len = EVBUFFER_LENGTH(tty->event->input);
if (len == 0)
return (0);
log_debug("keys are %zu (%.*s)", len, (int) len, buf);
- /* If a normal key, return it. */
- if (*buf != '\033') {
- key = (u_char) *buf;
- evbuffer_drain(tty->event->input, 1);
-
- /*
- * Check for backspace key using termios VERASE - the terminfo
- * kbs entry is extremely unreliable, so cannot be safely
- * used. termios should have a better idea.
- */
- bspace = tty->tio.c_cc[VERASE];
- if (bspace != _POSIX_VDISABLE && key == bspace)
- key = KEYC_BSPACE;
- goto handle_key;
- }
-
/* Is this device attributes response? */
switch (tty_keys_device(tty, buf, len, &size)) {
case 0: /* yes */
- evbuffer_drain(tty->event->input, size);
key = KEYC_NONE;
- goto handle_key;
+ goto complete_key;
case -1: /* no, or not valid */
break;
case 1: /* partial */
@@ -476,9 +462,8 @@ tty_keys_next(struct tty *tty)
/* Is this a mouse key press? */
switch (tty_keys_mouse(tty, buf, len, &size)) {
case 0: /* yes */
- evbuffer_drain(tty->event->input, size);
key = KEYC_MOUSE;
- goto handle_key;
+ goto complete_key;
case -1: /* no, or not valid */
break;
case 1: /* partial */
@@ -488,8 +473,8 @@ tty_keys_next(struct tty *tty)
/* Try to parse a key with an xterm-style modifier. */
switch (xterm_keys_find(buf, len, &size, &key)) {
case 0: /* found */
- evbuffer_drain(tty->event->input, size);
- goto handle_key;
+ key = KEYC_NONE;
+ goto complete_key;
case -1: /* not found */
break;
case 1:
@@ -497,93 +482,90 @@ tty_keys_next(struct tty *tty)
}
/* Look for matching key string and return if found. */
- tk = tty_keys_find(tty, buf + 1, len - 1, &size);
+ tk = tty_keys_find(tty, buf, len, &size);
if (tk != NULL) {
+ if (tk->next != NULL)
+ goto partial_key;
key = tk->key;
- goto found_key;
+ goto complete_key;
}
- /* Skip the escape. */
- buf++;
- len--;
-
- /* Is there a normal key following? */
- if (len != 0 && *buf != '\033') {
- key = *buf | KEYC_ESCAPE;
- evbuffer_drain(tty->event->input, 2);
- goto handle_key;
- }
+ /* Is this a meta key? */
+ if (len >= 2 && buf[0] == '\033') {
+ if (buf[1] != '\033') {
+ key = buf[1] | KEYC_ESCAPE;
+ size = 2;
+ goto complete_key;
+ }
- /* Or a key string? */
- if (len > 1) {
tk = tty_keys_find(tty, buf + 1, len - 1, &size);
if (tk != NULL) {
- key = tk->key | KEYC_ESCAPE;
size++; /* include escape */
- goto found_key;
+ if (tk->next != NULL)
+ goto partial_key;
+ key = tk->key;
+ if (key != KEYC_NONE)
+ key |= KEYC_ESCAPE;
+ goto complete_key;
}
}
- /* Escape and then nothing useful - fall through. */
+first_key:
+ /* No key found, take first. */
+ key = (u_char) *buf;
+ size = 1;
-partial_key:
/*
- * Escape but no key string. If have already seen an escape and the
- * timer has expired, give up waiting and send the escape.
+ * Check for backspace key using termios VERASE - the terminfo
+ * kbs entry is extremely unreliable, so cannot be safely
+ * used. termios should have a better idea.
*/
- if ((tty->flags & TTY_ESCAPE) &&
- evtimer_initialized(&tty->key_timer) &&
- !evtimer_pending(&tty->key_timer, NULL)) {
- evbuffer_drain(tty->event->input, 1);
- key = '\033';
- goto handle_key;
- }
+ bspace = tty->tio.c_cc[VERASE];
+ if (bspace != _POSIX_VDISABLE && key == bspace)
+ key = KEYC_BSPACE;
- /* Fall through to start the timer. */
+ goto complete_key;
-start_timer:
- /* If already waiting for timer, do nothing. */
- if (evtimer_initialized(&tty->key_timer) &&
- evtimer_pending(&tty->key_timer, NULL))
+partial_key:
+ log_debug("partial key %.*s", (int) len, buf);
+
+ /* If timer is going, check for expiration. */
+ if (tty->flags & TTY_TIMER) {
+ if (evtimer_initialized(&tty->key_timer) &&
+ !evtimer_pending(&tty->key_timer, NULL))
+ goto first_key;
return (0);
+ }
- /* Start the timer and wait for expiry or more data. */
+ /* Get the time period. */
delay = options_get_number(&global_options, "escape-time");
tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L;
+ /* Start the timer. */
if (event_initialized(&tty->key_timer))
evtimer_del(&tty->key_timer);
evtimer_set(&tty->key_timer, tty_keys_callback, tty);
evtimer_add(&tty->key_timer, &tv);
- tty->flags |= TTY_ESCAPE;
+ tty->flags |= TTY_TIMER;
return (0);
-found_key:
- if (tk->next != NULL) {
- /* Partial key. Start the timer if not already expired. */
- if (!(tty->flags & TTY_ESCAPE))
- goto start_timer;
+complete_key:
+ log_debug("complete key %.*s %#x", (int) size, buf, key);
- /* Otherwise, if no key, send the escape alone. */
- if (tk->key == KEYC_NONE)
- goto partial_key;
+ /* Remove data from buffer. */
+ evbuffer_drain(tty->event->input, size);
- /* Or fall through to send the partial key found. */
- }
- evbuffer_drain(tty->event->input, size + 1);
-
- goto handle_key;
-
-handle_key:
+ /* Remove key timer. */
if (event_initialized(&tty->key_timer))
evtimer_del(&tty->key_timer);
+ tty->flags &= ~TTY_TIMER;
+ /* Fire the key. */
if (key != KEYC_NONE)
server_client_handle_key(tty->client, key);
- tty->flags &= ~TTY_ESCAPE;
return (1);
}
@@ -594,11 +576,10 @@ tty_keys_callback(unused int fd, unused short events,
void *data)
{
struct tty *tty = data;
- if (!(tty->flags & TTY_ESCAPE))
- return;
-
- while (tty_keys_next(tty))
- ;
+ if (tty->flags & TTY_TIMER) {
+ while (tty_keys_next(tty))
+ ;
+ }
}
/*
diff --git a/tty.c b/tty.c
index 868032d..378539c 100644
--- a/tty.c
+++ b/tty.c
@@ -149,7 +149,7 @@ tty_open(struct tty *tty, const char *overrides, char
**cause)
}
tty->flags |= TTY_OPENED;
- tty->flags &= ~(TTY_NOCURSOR|TTY_FREEZE|TTY_ESCAPE);
+ tty->flags &= ~(TTY_NOCURSOR|TTY_FREEZE|TTY_TIMER);
tty->event = bufferevent_new(
tty->fd, tty_read_callback, NULL, tty_error_callback, tty);
-----------------------------------------------------------------------
Summary of changes:
tmux.h | 2 +-
tty-keys.c | 143 ++++++++++++++++++++++++++----------------------------------
tty.c | 2 +-
3 files changed, 64 insertions(+), 83 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
The Go Parallel Website, sponsored by Intel - in partnership with Geeknet,
is your hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials, tech docs,
whitepapers, evaluation guides, and opinion stories. Check out the most
recent posts - join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
