mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-07-01 03:22:48 -05:00
Send xterm 216+ modifiers in small-keypad key escape sequences.
In the 'xterm 216+' function key mode, a function key pressed with a combination of Shift, Ctrl and Alt has its usual sequence like ESC[n~ (for some integer n) turned into ESC[n;m~ where m-1 is a 3-bit bitmap of currently pressed modifier keys. This mode now also applies to the keys on the small keypad above the arrow keys (Ins, Home, PgUp etc). If xterm 216+ mode is selected, those keys are modified in the same way as the function keys. As with the function keys, this doesn't guarantee that PuTTY will _receive_ any particular shifted key of this kind, and not repurpose it. Just as Alt+F4 still closes the window (at least on Windows) rather than sending a modified F4 sequence, Shift+Ins will still perform a paste action rather than sending a modified Ins sequence, Shift-PgUp will still scroll the scrollback, etc. But the keys not already used by PuTTY for other purposes should now have their modern-xterm behaviour in modern-xterm mode. Thanks to H.Merijn Brand for developing and testing a version of this patch.
This commit is contained in:
@ -7477,7 +7477,9 @@ int format_function_key(char *buf, Terminal *term, int key_number,
|
||||
return p - buf;
|
||||
}
|
||||
|
||||
int format_small_keypad_key(char *buf, Terminal *term, SmallKeypadKey key)
|
||||
int format_small_keypad_key(char *buf, Terminal *term, SmallKeypadKey key,
|
||||
bool shift, bool ctrl, bool alt,
|
||||
bool *consumed_alt)
|
||||
{
|
||||
char *p = buf;
|
||||
|
||||
@ -7508,7 +7510,17 @@ int format_small_keypad_key(char *buf, Terminal *term, SmallKeypadKey key)
|
||||
} else if ((code == 1 || code == 4) && term->rxvt_homeend) {
|
||||
p += sprintf(p, code == 1 ? "\x1B[H" : "\x1BOw");
|
||||
} else {
|
||||
p += sprintf(p, "\x1B[%d~", code);
|
||||
if (term->vt52_mode) {
|
||||
p += sprintf(p, "\x1B[%d~", code);
|
||||
} else {
|
||||
int bitmap = 0;
|
||||
if (term->funky_type == FUNKY_XTERM_216)
|
||||
bitmap = shift_bitmap(shift, ctrl, alt, consumed_alt);
|
||||
if (bitmap)
|
||||
p += sprintf(p, "\x1B[%d;%d~", code, bitmap);
|
||||
else
|
||||
p += sprintf(p, "\x1B[%d~", code);
|
||||
}
|
||||
}
|
||||
|
||||
return p - buf;
|
||||
|
Reference in New Issue
Block a user