diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-10-20 17:59:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-10-20 17:59:38 +0100 |
| commit | 49660f5139d3fd55326a54eadf6bb31a3ffec2bf (patch) | |
| tree | adc4a0ba93db10b1bd3fe9033bd93826203ab161 /src/getchar.c | |
| parent | d0fab10ed2a86698937e3c3fed2f10bd9bb5e731 (diff) | |
patch 9.0.0806: 'langmap' works differently when there are modifiersv9.0.0806
Problem: 'langmap' works differently when there are modifiers.
Solution: Only apply 'langmap' to a character where modifiers have no
effect. (closes #11395, closes #11404)
Diffstat (limited to 'src/getchar.c')
| -rw-r--r-- | src/getchar.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/src/getchar.c b/src/getchar.c index 3f83b8484b..da8132cbff 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2590,24 +2590,35 @@ handle_mapping( { #ifdef FEAT_LANGMAP int nomap = nolmaplen; - int c2; + int modifiers = 0; #endif // find the match length of this mapping for (mlen = 1; mlen < typebuf.tb_len; ++mlen) { + int c2 = typebuf.tb_buf[typebuf.tb_off + mlen]; #ifdef FEAT_LANGMAP - c2 = typebuf.tb_buf[typebuf.tb_off + mlen]; if (nomap > 0) + { + if (nomap == 2 && c2 == KS_MODIFIER) + modifiers = 1; + else if (nomap == 1 && modifiers == 1) + modifiers = c2; --nomap; - else if (c2 == K_SPECIAL) - nomap = 2; + } else - LANGMAP_ADJUST(c2, TRUE); - if (mp->m_keys[mlen] != c2) -#else - if (mp->m_keys[mlen] != - typebuf.tb_buf[typebuf.tb_off + mlen]) + { + if (c2 == K_SPECIAL) + nomap = 2; + else if (merge_modifyOtherKeys(c2, &modifiers) == c2) + // Only apply 'langmap' if merging modifiers into + // the key will not result in another character, + // so that 'langmap' behaves consistently in + // different terminals and GUIs. + LANGMAP_ADJUST(c2, TRUE); + modifiers = 0; + } #endif + if (mp->m_keys[mlen] != c2) break; } |