Allow prefix and prefix2 to be set to None to disable (useful if you

would rather bind the prefix in the root table).
This commit is contained in:
nicm
2015-12-12 18:19:00 +00:00
parent 88bc8f3528
commit 39cf9c9d31
10 changed files with 69 additions and 45 deletions

View File

@ -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);