diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-12-12 20:01:15 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-12-12 20:01:15 +0000 |
| commit | 845a664bb2d06ac1cdc0af37d753d107f4353955 (patch) | |
| tree | bdd2832180ef678265972308ed08e71ab0bbab60 /tty-keys.c | |
| parent | 5a5db02b8514eff40b97b3f3e4e85a3d948b57da (diff) | |
| parent | 5ed17e84faed0a7655ec1eb3de291b60839dcb12 (diff) | |
| download | rtmux-845a664bb2d06ac1cdc0af37d753d107f4353955.tar.gz rtmux-845a664bb2d06ac1cdc0af37d753d107f4353955.tar.bz2 rtmux-845a664bb2d06ac1cdc0af37d753d107f4353955.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'tty-keys.c')
| -rw-r--r-- | tty-keys.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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); |