From c255b789653120979eacdf8bb8eca02487753a8e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 26 Nov 2022 19:16:48 +0000 Subject: patch 9.0.0954: cannot detect whether modifyOtherKeys is enabled Problem: Cannot detect whether modifyOtherKeys is enabled. Solution: Use XTQMODKEYS introduced by xterm version 377 to request the modifyOtherKeys level. Update the keycode check results. --- src/getchar.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/getchar.c') diff --git a/src/getchar.c b/src/getchar.c index 1e03b86c32..142e394aa6 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2463,7 +2463,11 @@ check_simplify_modifier(int max_offset) static int key_protocol_enabled(void) { - return seenModifyOtherKeys || kitty_protocol_state == KKPS_ENABLED; + // If xterm has responded to XTQMODKEYS it overrules seenModifyOtherKeys. + int using_mok = modify_otherkeys_state != MOKS_INITIAL + ? modify_otherkeys_state == MOKS_ENABLED + : seenModifyOtherKeys; + return using_mok || kitty_protocol_state == KKPS_ENABLED; } /* -- cgit v1.2.3