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

Fix regression causing fish_key_reader to not request kitty flags

Browse Source 
Fixes 081c3282b7 (Refresh TTY timestamps also in some rare cases,
2025-01-15).
This commit is contained in:
Johannes Altmanninger 2025-01-21 14:07:07 +01:00
parent 945a535570
commit 29cddabfe4
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/builtins/fish_key_reader.rs
View File

@ -19,8 +19,9 @@ use crate::{
env::env_init, env::env_init,
input::input_terminfo_get_name, input::input_terminfo_get_name,
input_common::{ input_common::{
terminal_protocol_hacks, terminal_protocols_enable_ifn, CharEvent, InputEventQueue, enable_kitty_progressive_enhancements, terminal_protocol_hacks,
InputEventQueuer, KITTY_PROGRESSIVE_ENHANCEMENTS_QUERY, terminal_protocols_enable_ifn, CharEvent, ImplicitEvent, InputEventQueue, InputEventQueuer,
KITTY_PROGRESSIVE_ENHANCEMENTS_QUERY,
}, },
key::{char_to_symbol, Key}, key::{char_to_symbol, Key},
nix::isatty, nix::isatty,
@ -98,8 +99,14 @@ fn process_input(streams: &mut IoStreams, continuous_mode: bool, verbose: bool)
while (!first_char_seen || continuous_mode) && !check_exit_loop_maybe_warning(None) { while (!first_char_seen || continuous_mode) && !check_exit_loop_maybe_warning(None) {
let evt = queue.readch(); let evt = queue.readch();
let CharEvent::Key(kevt) = evt else { let kevt = match evt {
CharEvent::Key(kevt) => kevt,
CharEvent::Readline(_) | CharEvent::Command(_) => continue,
CharEvent::Implicit(ImplicitEvent::KittyKeyboardSupported) => {
enable_kitty_progressive_enhancements();
continue; continue;
}
CharEvent::Implicit(_) => continue,
}; };
let c = kevt.key.codepoint; let c = kevt.key.codepoint;
if verbose { if verbose {