diff options
| author |   nicm <nicm@openbsd.org> | 2020-05-16 16:35:13 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2020-05-16 16:35:13 +0000 |
| commit | 5416581e0b94b173c3d9362360b6a4da2992baac (patch) | |
| tree | c59f33feeea143bf688e855caa04cdbdb1c0d8de /usr.bin/tmux/server-client.c | |
| parent | Rename KEYC_ESCAPE to KEYC_META. (diff) | |
| download | wireguard-openbsd-5416581e0b94b173c3d9362360b6a4da2992baac.tar.xz wireguard-openbsd-5416581e0b94b173c3d9362360b6a4da2992baac.zip | |
Separate key flags and modifiers, log key flags, make the "xterm" flag
more explicit and fix M- keys with a leading escape.
Diffstat (limited to 'usr.bin/tmux/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 84c2be2e776..7c878911e24 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.342 2020/05/16 16:33:16 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.343 2020/05/16 16:35:13 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1042,7 +1042,7 @@ out: key |= KEYC_SHIFT; if (log_get_level() != 0) - log_debug("mouse key is %s", key_string_lookup_key (key)); + log_debug("mouse key is %s", key_string_lookup_key (key, 1)); return (key); } @@ -1174,7 +1174,7 @@ table_changed: * The prefix always takes precedence and forces a switch to the prefix * table, unless we are already there. */ - key0 = (key & ~KEYC_XTERM); + key0 = (key & (KEYC_MASK_KEY|KEYC_MASK_MODIFIERS)); if ((key0 == (key_code)options_get_number(s->options, "prefix") || key0 == (key_code)options_get_number(s->options, "prefix2")) && strcmp(table->name, "prefix") != 0) { |