circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 14:27:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2024-12-04 22:01:08 +00:00
parent 98e322d5a5 6d792e4123
commit 99790c90aa
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
input-keys.c
View File

@ -585,9 +585,11 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key)
/* Is this backspace? */ /* Is this backspace? */
if ((key & KEYC_MASK_KEY) == KEYC_BSPACE) { if ((key & KEYC_MASK_KEY) == KEYC_BSPACE) {
newkey = options_get_number(global_options, "backspace"); newkey = options_get_number(global_options, "backspace");
if (newkey >= 0x7f) if (newkey == KEYC_BSPACE)
newkey = '\177'; newkey = '\b';
key = newkey|(key & (KEYC_MASK_MODIFIERS|KEYC_MASK_FLAGS)); log_debug("%s: key 0x%llx is backspace -> 0x%llx", __func__,
key, newkey|(key & KEYC_MASK_FLAGS));
key = newkey|(key & KEYC_MASK_FLAGS);
} }
/* Is this backtab? */ /* Is this backtab? */
@ -609,6 +611,7 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key)
if (!(key & ~KEYC_MASK_KEY)) { if (!(key & ~KEYC_MASK_KEY)) {
if (key == C0_HT || if (key == C0_HT ||
key == C0_CR || key == C0_CR ||
key == C0_BS ||
key == C0_ESC || key == C0_ESC ||
(key >= 0x20 && key <= 0x7f)) { (key >= 0x20 && key <= 0x7f)) {
ud.data[0] = key; ud.data[0] = key;

1
tty-keys.c
View File

@ -894,6 +894,7 @@ first_key:
if (onlykey < 0x20 && if (onlykey < 0x20 &&
onlykey != C0_HT && onlykey != C0_HT &&
onlykey != C0_CR && onlykey != C0_CR &&
onlykey != C0_BS &&
onlykey != C0_ESC) { onlykey != C0_ESC) {
onlykey |= 0x40; onlykey |= 0x40;
if (onlykey >= 'A' && onlykey <= 'Z') if (onlykey >= 'A' && onlykey <= 'Z')