circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-04 11:55:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2024-10-21 10:01:08 +01:00
commit a269c33a54
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
input-keys.c
View File

@ -542,12 +542,16 @@ input_key_mode1(struct bufferevent *bev, key_code key)
log_debug("%s: key in %llx", __func__, key); log_debug("%s: key in %llx", __func__, key);
/* A regular or shifted key + Meta. */
if ((key & (KEYC_CTRL | KEYC_META)) == KEYC_META)
return (input_key_vt10x(bev, key));
/* /*
* As per * As per
* https://invisible-island.net/xterm/modified-keys-us-pc105.html. * https://invisible-island.net/xterm/modified-keys-us-pc105.html.
*/ */
onlykey = key & KEYC_MASK_KEY; onlykey = key & KEYC_MASK_KEY;
if ((key & (KEYC_META | KEYC_CTRL)) == KEYC_CTRL && if ((key & KEYC_CTRL) &&
(onlykey == ' ' || (onlykey == ' ' ||
onlykey == '/' || onlykey == '/' ||
onlykey == '@' || onlykey == '@' ||
@ -556,13 +560,6 @@ input_key_mode1(struct bufferevent *bev, key_code key)
(onlykey >= '@' && onlykey <= '~'))) (onlykey >= '@' && onlykey <= '~')))
return (input_key_vt10x(bev, key)); return (input_key_vt10x(bev, key));
/*
* A regular key + Meta. In the absence of a standard to back this, we
* mimic what iTerm 2 does.
*/
if ((key & (KEYC_CTRL | KEYC_META)) == KEYC_META)
return (input_key_vt10x(bev, key));
return (-1); return (-1);
} }