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 config option for shifted arrow key handling.

Browse Source 
This commit introduces a new config option for how to handle shifted
arrow keys.

In the default mode (SHARROW_APPLICATION), we do what we've always
done: Ctrl flips the arrow keys between sending their most usual
escape sequences (ESC [ A ... ESC [ D) and sending the 'application
cursor keys' sequences (ESC O A ... ESC O D). Whichever of those modes
is currently configured, Ctrl+arrow sends the other one.

In the new mode (SHARROW_BITMAP), application cursor key mode is
unaffected by any shift keys, but the default sequences acquire two
numeric arguments. The first argument is 1 (reflecting the fact that a
shifted arrow key still notionally moves just 1 character cell); the
second is the bitmap (1 for Shift) + (2 for Alt) + (4 for Ctrl),
offset by 1. (Except that if _none_ of those modifiers is pressed,
both numeric arguments are simply omitted.)

The new bitmap mode is what current xterm generates, and also what
Windows ConPTY seems to expect. If you start an ordinary Command
Prompt and launch into WSL, those are the sequences it will generate
for shifted arrow keys; conversely, if you run a Command Prompt within
a ConPTY, then these sequences for Ctrl+arrow will have the effect you
expect in cmd.exe command-line editing (going backward or forward a
word). For that reason, I enable this mode unconditionally when
launching Windows pterm.
This commit is contained in:
Simon Tatham
2021-10-18 20:00:25 +01:00
parent c35d8b8328
commit 22911ccdcc
11 changed files with 74 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
terminal/terminal.c
View File

@ -1555,6 +1555,7 @@ void term_copy_stuff_from_conf(Terminal *term)
term->crhaslf = conf_get_bool(term->conf, CONF_crhaslf);
term->erase_to_scrollback = conf_get_bool(term->conf, CONF_erase_to_scrollback);
term->funky_type = conf_get_int(term->conf, CONF_funky_type);
term->sharrow_type = conf_get_int(term->conf, CONF_sharrow_type);
term->lfhascr = conf_get_bool(term->conf, CONF_lfhascr);
term->logflush = conf_get_bool(term->conf, CONF_logflush);
term->logtype = conf_get_int(term->conf, CONF_logtype);
@ -7240,7 +7241,16 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked,
term_schedule_update(term);
}
int format_arrow_key(char *buf, Terminal *term, int xkey, bool ctrl)
static int shift_bitmap(bool shift, bool ctrl, bool alt)
{
int bitmap = (shift ? 1 : 0) + (alt ? 2 : 0) + (ctrl ? 4 : 0);
if (bitmap)
bitmap++;
return bitmap;
}
int format_arrow_key(char *buf, Terminal *term, int xkey,
bool shift, bool ctrl, bool alt)
{
char *p = buf;
@ -7263,12 +7273,24 @@ int format_arrow_key(char *buf, Terminal *term, int xkey, bool ctrl)
if (!term->app_keypad_keys)
app_flg = 0;
#endif
/* Useful mapping of Ctrl-arrows */
if (ctrl)
app_flg = !app_flg;
int bitmap = 0;
/* Adjustment based on Shift, Ctrl and/or Alt */
switch (term->sharrow_type) {
case SHARROW_APPLICATION:
if (ctrl)
app_flg = !app_flg;
break;
case SHARROW_BITMAP:
bitmap = shift_bitmap(shift, ctrl, alt);
break;
}
if (app_flg)
p += sprintf(p, "\x1BO%c", xkey);
else if (bitmap)
p += sprintf(p, "\x1B[1;%d%c", bitmap, xkey);
else
p += sprintf(p, "\x1B[%c", xkey);
}