aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2020-05-15 12:16:41 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2020-05-15 12:16:41 +0100
commit340fd691cbd6f575fc1169269dfa675f30ce71d3 (patch)
tree15d3aa92656e6fe413bd2e74b47c9ebb20edafb1 /server-client.c
parent031d4864a94cd7c042fe96a2d236bccde83655e7 (diff)
downloadrtmux-340fd691cbd6f575fc1169269dfa675f30ce71d3.tar.gz
rtmux-340fd691cbd6f575fc1169269dfa675f30ce71d3.tar.bz2
rtmux-340fd691cbd6f575fc1169269dfa675f30ce71d3.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 'server-client.c')
-rw-r--r--server-client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/server-client.c b/server-client.c
index 9631a7de..87a4f533 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1040,7 +1040,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);
}
@@ -1172,7 +1172,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) {