github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-02 09:42:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Workaround Kitty spamming the log for ModifyOtherKeys
Some checks failed
make test / ubuntu (push) Has been cancelled
Details
make test / ubuntu-32bit-static-pcre2 (push) Has been cancelled
Details
make test / ubuntu-asan (push) Has been cancelled
Details
make test / macos (push) Has been cancelled
Details
Rust checks / rustfmt (push) Has been cancelled
Details
Rust checks / clippy (push) Has been cancelled
Details

Browse Source 
Fixes #11040
This commit is contained in:
Fabian Boehm 2025-01-14 20:08:12 +01:00
parent 806734cc56
commit d2bfb51611
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/input_common.rs
View File

@ -435,6 +435,7 @@ static IS_TMUX: RelaxedAtomicBool = RelaxedAtomicBool::new(false);
pub static IN_MIDNIGHT_COMMANDER_PRE_CSI_U: RelaxedAtomicBool = RelaxedAtomicBool::new(false);
static IN_ITERM_PRE_CSI_U: RelaxedAtomicBool = RelaxedAtomicBool::new(false);
static IN_JETBRAINS: RelaxedAtomicBool = RelaxedAtomicBool::new(false);
static IN_KITTY: RelaxedAtomicBool = RelaxedAtomicBool::new(false);
pub fn terminal_protocol_hacks() {
use std::env::var_os;
@ -453,6 +454,8 @@ pub fn terminal_protocol_hacks() {
var_os("TERMINAL_EMULATOR")
.is_some_and(|term| term.as_os_str().as_bytes() == b"JetBrains-JediTerm"),
);
IN_KITTY
.store(var_os("TERM").is_some_and(|term| term.as_os_str().as_bytes() == b"xterm-kitty"));
}
fn parse_version(version: &wstr) -> Option<(i64, i64, i64)> {
@ -486,6 +489,13 @@ pub fn terminal_protocols_enable_ifn() {
} else if IN_JETBRAINS.load() {
// Jetbrains IDE terminals vomit CSI u
concat!("\x1b[?2004h", "\x1b[>4;1m", "\x1b=",)
} else if IN_KITTY.load() {
// Kitty spams the log for modifyotherkeys
concat!(
"\x1b[?2004h", // Bracketed paste
"\x1b[=5u", // CSI u with kitty progressive enhancement
"\x1b=", // set application keypad mode, so the keypad keys send unique codes
)
} else {
concat!(
"\x1b[?2004h", // Bracketed paste
@ -510,6 +520,13 @@ pub(crate) fn terminal_protocols_disable_ifn() {
concat!("\x1b[?2004l", "\x1b[>4;0m", "\x1b[<1u", "\x1b>",)
} else if IN_JETBRAINS.load() {
concat!("\x1b[?2004l", "\x1b[>4;0m", "\x1b>",)
} else if IN_KITTY.load() {
// Kitty spams the log for modifyotherkeys
concat!(
"\x1b[?2004l", // Bracketed paste
"\x1b[=0u", // CSI u with kitty progressive enhancement
"\x1b>", // application keypad mode
)
} else {
concat!(
"\x1b[?2004l", // Bracketed paste