From 97350cd883590a3dfaa3307446f3ca979134533d Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Wed, 2 Dec 2009 15:06:35 +0000
Subject: Sync OpenBSD patchset 575:

Handle partial xterm function key sequences.
---
 tty-keys.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'tty-keys.c')

diff --git a/tty-keys.c b/tty-keys.c
index 82a23a0c..78b267b3 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -1,4 +1,4 @@
-/* $Id: tty-keys.c,v 1.50 2009-11-28 14:51:37 tcunha Exp $ */
+/* $Id: tty-keys.c,v 1.51 2009-12-02 15:06:35 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -472,12 +472,15 @@ tty_keys_next(struct tty *tty)
 		goto partial_key;
 	}
 
-
 	/* Not found. Try to parse a key with an xterm-style modifier. */
-	key = xterm_keys_find(buf, len, &size);
-	if (key != KEYC_NONE) {
+	switch (xterm_keys_find(buf, len, &size, &key)) {
+	case 0:		/* found */
 		evbuffer_drain(tty->event->input, size);
 		goto handle_key;
+	case -1:	/* not found */
+		break;
+	case 1:
+		goto partial_key;
 	}
 
 	/* Skip the escape. */
-- 
cgit