diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/zle_keymap.c | 28 |
2 files changed, 31 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2025-03-03 Oliver Kiddle <opk@zsh.org> + + * 53394: Src/Zle/zle_keymap.c: drop OSC and DCS sequences in key + input as they are likely to be terminal query responses not keys + 2025-03-02 Bart Schaefer <schaefer@toltec-ubuntu> * 53368: Src/options.c: ignore no-op changes to EMACS/VI options diff --git a/Src/Zle/zle_keymap.c b/Src/Zle/zle_keymap.c index 5012917f5..ce52abe66 100644 --- a/Src/Zle/zle_keymap.c +++ b/Src/Zle/zle_keymap.c @@ -1580,7 +1580,7 @@ getkeymapcmd(Keymap km, Thingy *funcp, char **strp) Thingy func = t_undefinedkey; char *str = NULL; int lastlen = 0, lastc = lastchar; - int timeout = 0, csi = 0; + int timeout = 0, csi = 0, oscdcs = 0; keybuflen = 0; keybuf[0] = 0; @@ -1647,14 +1647,38 @@ getkeymapcmd(Keymap km, Thingy *funcp, char **strp) if (keybuf[keybuflen - 1] >= 0x40 && keybuf[keybuflen - 1] <= 0x7e && lastlen > csi - 2 && lastlen <= csi) { + if (keybuf[csi] == '?' && (keybuf[keybuflen - 1] == 'c' || + keybuf[keybuflen - 1] == 'u')) + { /* is a terminal query response - discard */ + keybuflen = csi - 2; + timeout = csi = 0; + continue; + } func = t_undefinedkey; lastlen = keybuflen; } csi = 0; } } + /* An OSC or DCS sequence is likely a late arriving terminal query + * response. Keep looping; if we reach an ST, discard the sequence + * - unless we first match a keybinding or a keytimeout elapses. */ + if (oscdcs) { + if (keybuf[keybuflen - 1] == '\007' || /* BEL sometimes used */ + (keybuf[keybuflen - 2] == '\033' && + keybuf[keybuflen - 1] == '\\') || + (keybuf[keybuflen - 2] == Meta && /* ST can be 0x9b */ + (unsigned char) keybuf[keybuflen - 1] == (0x9b ^ 32))) + { + keybuflen = oscdcs - 2; /* discard */ + timeout = oscdcs = 0; + continue; + } + } else if (keybuflen >= 2 && keybuf[keybuflen - 2] == '\033' && + (keybuf[keybuflen - 1] == ']' || keybuf[keybuflen - 1] == 'P')) + oscdcs = keybuflen; - if (!ispfx && !csi) + if (!ispfx && !csi && !oscdcs) break; } if(!lastlen && keybuflen) |