nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

New function-key mode similar to modern xterm.

Browse Source 
This is the same as the previous FUNKY_XTERM mode if you don't press
any modifier keys, but now Shift or Ctrl or Alt with function keys
adds an extra bitmap parameter. The bitmaps are the same as the ones
used by the new SHARROW_BITMAP arrow key mode.
This commit is contained in:
Simon Tatham
2021-10-23 11:04:53 +01:00
parent a40b581fc1
commit b13f3d079b
6 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
terminal/terminal.c
View File

@ -7301,7 +7301,7 @@ int format_arrow_key(char *buf, Terminal *term, int xkey,
}
int format_function_key(char *buf, Terminal *term, int key_number,
bool shift, bool ctrl)
bool shift, bool ctrl, bool alt, bool *consumed_alt)
{
char *p = buf;
@ -7314,7 +7314,14 @@ int format_function_key(char *buf, Terminal *term, int key_number,
assert(key_number > 0);
assert(key_number < lenof(key_number_to_tilde_code));
int index = (shift && key_number <= 10) ? key_number + 10 : key_number;
int index = key_number;
if (term->funky_type != FUNKY_XTERM_216) {
if (shift && index <= 10) {
shift = false;
index += 10;
}
}
int code = key_number_to_tilde_code[index];
if (term->funky_type == FUNKY_SCO) {
@ -7338,13 +7345,28 @@ int format_function_key(char *buf, Terminal *term, int key_number,
p += sprintf(p, "\x1BO%c", code + 'P' - 11 - offt);
} else if (term->funky_type == FUNKY_LINUX && code >= 11 && code <= 15) {
p += sprintf(p, "\x1B[[%c", code + 'A' - 11);
} else if (term->funky_type == FUNKY_XTERM && code >= 11 && code <= 14) {
} else if ((term->funky_type == FUNKY_XTERM ||
term->funky_type == FUNKY_XTERM_216) &&
code >= 11 && code <= 14) {
if (term->vt52_mode)
p += sprintf(p, "\x1B%c", code + 'P' - 11);
else
p += sprintf(p, "\x1BO%c", code + 'P' - 11);
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[1;%d%c", bitmap, code + 'P' - 11);
else
p += sprintf(p, "\x1BO%c", code + 'P' - 11);
}
} else {
p += sprintf(p, "\x1B[%d~", code);
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;