summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/tty-keys.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2015-12-12 18:19:00 +0000
committernicm <nicm@openbsd.org>2015-12-12 18:19:00 +0000
commit0bd9fd8f2d4f4289ee483c71331058cc126d71aa (patch)
tree9ae5e6c75ba58ca271fce73b7dc54991e2feb713 /usr.bin/tmux/tty-keys.c
parentcorrect comment (diff)
downloadwireguard-openbsd-0bd9fd8f2d4f4289ee483c71331058cc126d71aa.tar.xz
wireguard-openbsd-0bd9fd8f2d4f4289ee483c71331058cc126d71aa.zip
Allow prefix and prefix2 to be set to None to disable (useful if you
would rather bind the prefix in the root table).
Diffstat (limited to 'usr.bin/tmux/tty-keys.c')
-rw-r--r--usr.bin/tmux/tty-keys.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/tty-keys.c b/usr.bin/tmux/tty-keys.c
index 08482684c73..c8659467d90 100644
--- a/usr.bin/tmux/tty-keys.c
+++ b/usr.bin/tmux/tty-keys.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-keys.c,v 1.82 2015/11/23 20:53:09 nicm Exp $ */
+/* $OpenBSD: tty-keys.c,v 1.83 2015/12/12 18:19:00 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -344,7 +344,7 @@ tty_keys_add1(struct tty_key **tkp, const char *s, key_code key)
if (tk == NULL) {
tk = *tkp = xcalloc(1, sizeof *tk);
tk->ch = *s;
- tk->key = KEYC_NONE;
+ tk->key = KEYC_UNKNOWN;
}
/* Find the next entry. */
@@ -444,7 +444,7 @@ tty_keys_find1(struct tty_key *tk, const char *buf, size_t len, size_t *size)
(*size)++;
/* At the end of the string, return the current node. */
- if (len == 0 || (tk->next == NULL && tk->key != KEYC_NONE))
+ if (len == 0 || (tk->next == NULL && tk->key != KEYC_UNKNOWN))
return (tk);
/* Move into the next tree for the following character. */
@@ -534,7 +534,7 @@ first_key:
if (tk->next != NULL)
goto partial_key;
key = tk->key;
- if (key != KEYC_NONE)
+ if (key != KEYC_UNKNOWN)
key |= KEYC_ESCAPE;
goto complete_key;
}
@@ -620,7 +620,7 @@ complete_key:
}
/* Fire the key. */
- if (key != KEYC_NONE)
+ if (key != KEYC_UNKNOWN)
server_client_handle_key(tty->client, key);
return (1);