circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 576: 

Look for mice and xterm keys before standard function keys as they are less
likely to be partial versions.
pull/1/head
Tiago Cunha 2009-12-02 15:07:28 +00:00
parent 97350cd883
commit c87379b04d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tty-keys.c
View File

@ -1,4 +1,4 @@
/* $Id: tty-keys.c,v 1.51 2009-12-02 15:06:35 tcunha Exp $ */
/* $Id: tty-keys.c,v 1.52 2009-12-02 15:07:28 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -453,14 +453,7 @@ tty_keys_next(struct tty *tty)
goto handle_key;
}
/* Look for matching key string and return if found. */
tk = tty_keys_find(tty, buf + 1, len - 1, &size);
if (tk != NULL) {
key = tk->key;
goto found_key;
}
/* Not found. Is this a mouse key press? */
/* Is this a mouse key press? */
switch (tty_keys_mouse(buf, len, &size, &mouse)) {
case 0: /* yes */
evbuffer_drain(tty->event->input, size);
@ -472,7 +465,7 @@ tty_keys_next(struct tty *tty)
goto partial_key;
}
/* Not found. Try to parse a key with an xterm-style modifier. */
/* 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);
@ -483,6 +476,13 @@ tty_keys_next(struct tty *tty)
goto partial_key;
}
/* Look for matching key string and return if found. */
tk = tty_keys_find(tty, buf + 1, len - 1, &size);
if (tk != NULL) {
key = tk->key;
goto found_key;
}
/* Skip the escape. */
buf++;
len--;