circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-12 17:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Only forward extended keys if the application has requested them, even though

Browse Source 
we use the CSI u sequence and xterm uses CSI 27 ~ - this is what mintty does as
well.
This commit is contained in:
Nicholas Marriott 2020-05-15 17:40:24 +01:00
parent 3a4f3ee087
commit c364a7142c
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input-keys.c
View File

@ -496,6 +496,8 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key)
} }
/* No builtin key sequence; construct an extended key sequence. */ /* No builtin key sequence; construct an extended key sequence. */
if (~s->mode & MODE_KEXTENDED)
goto missing;
outkey = (key & KEYC_MASK_KEY); outkey = (key & KEYC_MASK_KEY);
if (outkey >= KEYC_BASE) { if (outkey >= KEYC_BASE) {
switch (outkey) { switch (outkey) {

17
input.c
View File

@ -241,6 +241,8 @@ enum input_csi_type {
INPUT_CSI_HPA, INPUT_CSI_HPA,
INPUT_CSI_ICH, INPUT_CSI_ICH,
INPUT_CSI_IL, INPUT_CSI_IL,
INPUT_CSI_MODOFF,
INPUT_CSI_MODSET,
INPUT_CSI_RCP, INPUT_CSI_RCP,
INPUT_CSI_REP, INPUT_CSI_REP,
INPUT_CSI_RM, INPUT_CSI_RM,
@ -288,7 +290,9 @@ static const struct input_table_entry input_csi_table[] = {
{ 'h', "?", INPUT_CSI_SM_PRIVATE }, { 'h', "?", INPUT_CSI_SM_PRIVATE },
{ 'l', "", INPUT_CSI_RM }, { 'l', "", INPUT_CSI_RM },
{ 'l', "?", INPUT_CSI_RM_PRIVATE }, { 'l', "?", INPUT_CSI_RM_PRIVATE },
{ 'm', ">", INPUT_CSI_MODSET },
{ 'm', "", INPUT_CSI_SGR }, { 'm', "", INPUT_CSI_SGR },
{ 'n', ">", INPUT_CSI_MODOFF },
{ 'n', "", INPUT_CSI_DSR }, { 'n', "", INPUT_CSI_DSR },
{ 'q', " ", INPUT_CSI_DECSCUSR }, { 'q', " ", INPUT_CSI_DECSCUSR },
{ 'q', ">", INPUT_CSI_XDA }, { 'q', ">", INPUT_CSI_XDA },
@ -1380,6 +1384,19 @@ input_csi_dispatch(struct input_ctx *ictx)
if (n != -1 && m != -1) if (n != -1 && m != -1)
screen_write_cursormove(sctx, m - 1, n - 1, 1); screen_write_cursormove(sctx, m - 1, n - 1, 1);
break; break;
case INPUT_CSI_MODSET:
n = input_get(ictx, 0, 1, 1);
m = input_get(ictx, 1, 1, 1);
if (n == 0 || (n == 4 && m == 0))
screen_write_mode_clear(sctx, MODE_KEXTENDED);
else if (n == 4 && (m == 1 || m == 2))
screen_write_mode_set(sctx, MODE_KEXTENDED);
break;
case INPUT_CSI_MODOFF:
n = input_get(ictx, 0, 1, 1);
if (n == 4)
screen_write_mode_clear(sctx, MODE_KEXTENDED);
break;
case INPUT_CSI_WINOPS: case INPUT_CSI_WINOPS:
input_csi_dispatch_winops(ictx); input_csi_dispatch_winops(ictx);
break; break;

5
tmux.h
View File

@ -579,8 +579,8 @@ struct msg_write_close {
#define MODE_CURSOR 0x1 #define MODE_CURSOR 0x1
#define MODE_INSERT 0x2 #define MODE_INSERT 0x2
#define MODE_KCURSOR 0x4 #define MODE_KCURSOR 0x4
#define MODE_KKEYPAD 0x8 /* set = application, clear = number */ #define MODE_KKEYPAD 0x8
#define MODE_WRAP 0x10 /* whether lines wrap */ #define MODE_WRAP 0x10
#define MODE_MOUSE_STANDARD 0x20 #define MODE_MOUSE_STANDARD 0x20
#define MODE_MOUSE_BUTTON 0x40 #define MODE_MOUSE_BUTTON 0x40
#define MODE_BLINKING 0x80 #define MODE_BLINKING 0x80
@ -591,6 +591,7 @@ struct msg_write_close {
#define MODE_MOUSE_ALL 0x1000 #define MODE_MOUSE_ALL 0x1000
#define MODE_ORIGIN 0x2000 #define MODE_ORIGIN 0x2000
#define MODE_CRLF 0x4000 #define MODE_CRLF 0x4000
#define MODE_KEXTENDED 0x8000
#define ALL_MODES 0xffffff #define ALL_MODES 0xffffff
#define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON|MODE_MOUSE_ALL) #define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON|MODE_MOUSE_ALL)