===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-keys.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- src/usr.bin/tmux/tty-keys.c	2015/11/14 10:57:59	1.79
+++ src/usr.bin/tmux/tty-keys.c	2015/11/14 11:45:43	1.80
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-keys.c,v 1.79 2015/11/14 10:57:59 nicm Exp $ */
+/* $OpenBSD: tty-keys.c,v 1.80 2015/11/14 11:45:43 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -472,9 +472,10 @@
 	const char		*buf;
 	size_t			 len, size;
 	cc_t			 bspace;
-	int			 delay, expired = 0, more;
+	int			 delay, expired = 0;
 	key_code		 key;
 	struct utf8_data	 ud;
+	enum utf8_state		 more;
 	u_int			 i;
 
 	/* Get key buffer. */
@@ -539,17 +540,16 @@
 	}
 
 	/* Is this valid UTF-8? */
-	if (utf8_open(&ud, (u_char)*buf)) {
+	if ((more = utf8_open(&ud, (u_char)*buf) == UTF8_MORE)) {
 		size = ud.size;
 		if (len < size) {
 			if (expired)
 				goto discard_key;
 			goto partial_key;
 		}
-		more = 1;
 		for (i = 1; i < size; i++)
 			more = utf8_append(&ud, (u_char)buf[i]);
-		if (more != 0)
+		if (more != UTF8_DONE)
 			goto discard_key;
 		key = utf8_combine(&ud);
 		log_debug("UTF-8 key %.*s %#llx", (int)size, buf, key);
@@ -656,7 +656,7 @@
 	struct utf8_data	 ud;
 	u_int			 i, value, x, y, b, sgr_b;
 	u_char			 sgr_type, c;
-	int			 more;
+	enum utf8_state		 more;
 
 	/*
 	 * Standard mouse sequences are \033[M followed by three characters
@@ -697,14 +697,14 @@
 				return (1);
 
 			if (tty->mode & MODE_MOUSE_UTF8) {
-				if (utf8_open(&ud, buf[*size])) {
+				if (utf8_open(&ud, buf[*size]) == UTF8_MORE) {
 					if (ud.size != 2)
 						return (-1);
 					(*size)++;
 					if (len <= *size)
 						return (1);
 					more = utf8_append(&ud, buf[*size]);
-					if (more != 0)
+					if (more != UTF8_DONE)
 						return (-1);
 					value = utf8_combine(&ud);
 				} else