From c87379b04dd1f74bb2c99b8f2c5a8f32a4c801f8 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 2 Dec 2009 15:07:28 +0000 Subject: [PATCH] Sync OpenBSD patchset 576: Look for mice and xterm keys before standard function keys as they are less likely to be partial versions. --- tty-keys.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tty-keys.c b/tty-keys.c index 78b267b3..ecb7ce22 100644 --- a/tty-keys.c +++ b/tty-keys.c @@ -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 @@ -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--;