From 4aaf2c8dccdddb366926e54c92fcbe317715f9c6 Mon Sep 17 00:00:00 2001 From: nicm Date: Mon, 26 Aug 2024 07:45:05 +0000 Subject: [PATCH] C-h should not be treated specially and represented internally as \b but as C-h like the other Ctrl keys. Backspace is already handled separately if it VERASE. --- usr.bin/tmux/input-keys.c | 7 ++++--- usr.bin/tmux/tty-keys.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/usr.bin/tmux/input-keys.c b/usr.bin/tmux/input-keys.c index d8dc2aa2127..42b5b235ee0 100644 --- a/usr.bin/tmux/input-keys.c +++ b/usr.bin/tmux/input-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: input-keys.c,v 1.97 2024/08/23 13:25:39 nicm Exp $ */ +/* $OpenBSD: input-keys.c,v 1.98 2024/08/26 07:45:05 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -608,8 +608,9 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key) * key and no modifiers. */ if (!(key & ~KEYC_MASK_KEY)) { - if (key == C0_BS || key == C0_HT || - key == C0_CR || key == C0_ESC || + if (key == C0_HT || + key == C0_CR || + key == C0_ESC || (key >= 0x20 && key <= 0x7f)) { ud.data[0] = key; input_key_write(__func__, bev, &ud.data[0], 1); diff --git a/usr.bin/tmux/tty-keys.c b/usr.bin/tmux/tty-keys.c index f859747e3c0..a3b5f624b67 100644 --- a/usr.bin/tmux/tty-keys.c +++ b/usr.bin/tmux/tty-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty-keys.c,v 1.177 2024/08/21 04:17:09 nicm Exp $ */ +/* $OpenBSD: tty-keys.c,v 1.178 2024/08/26 07:45:05 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -812,8 +812,9 @@ first_key: * lowercase, so ^A becomes a|CTRL. */ onlykey = key & KEYC_MASK_KEY; - if (onlykey < 0x20 && onlykey != C0_BS && - onlykey != C0_HT && onlykey != C0_CR && + if (onlykey < 0x20 && + onlykey != C0_HT && + onlykey != C0_CR && onlykey != C0_ESC) { onlykey |= 0x40; if (onlykey >= 'A' && onlykey <= 'Z') -- 2.20.1