Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-27 05:23:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Respect $env.config.use_kitty_protocol in input listen (#13892)

Browse source 
Fixes nushell/nushell#13891

# Description

`input listen` now respects `$env.config.use_kitty_protocol`
This is essentially a copy-paste from `keybindings listen` where it was
already implemented.

# User-Facing Changes

`input listen` now respects `$env.config.use_kitty_protocol`

# Tests + Formatting

# After Submitting

---------

Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
This commit is contained in:
Bruce Weirdan 2024-09-25 15:57:00 +02:00 committed by GitHub
parent 1afff777a6
commit 54e9aa92bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
crates/nu-command/src/platform/input/input_listen.rs
View file

@ -2,7 +2,7 @@ use crossterm::event::{
DisableBracketedPaste, DisableFocusChange, DisableMouseCapture, EnableBracketedPaste, DisableBracketedPaste, DisableFocusChange, DisableMouseCapture, EnableBracketedPaste,
EnableMouseCapture, KeyCode, KeyEventKind, KeyModifiers, MouseEvent, MouseEventKind, EnableMouseCapture, KeyCode, KeyEventKind, KeyModifiers, MouseEvent, MouseEventKind,
}; };
use crossterm::terminal; use crossterm::{execute, terminal};
use nu_engine::command_prelude::*; use nu_engine::command_prelude::*;
use num_traits::AsPrimitive; use num_traits::AsPrimitive;
@ -81,8 +81,36 @@ There are 4 `key_type` variants:
let head = call.head; let head = call.head;
let event_type_filter = get_event_type_filter(engine_state, stack, call, head)?; let event_type_filter = get_event_type_filter(engine_state, stack, call, head)?;
let add_raw = call.has_flag(engine_state, stack, "raw")?; let add_raw = call.has_flag(engine_state, stack, "raw")?;
let config = engine_state.get_config();
terminal::enable_raw_mode()?; terminal::enable_raw_mode()?;
if config.use_kitty_protocol {
if let Ok(false) = crossterm::terminal::supports_keyboard_enhancement() {
println!("WARN: The terminal doesn't support use_kitty_protocol config.\r");
}
// enable kitty protocol
//
// Note that, currently, only the following support this protocol:
// * [kitty terminal](https://sw.kovidgoyal.net/kitty/)
// * [foot terminal](https://codeberg.org/dnkl/foot/issues/319)
// * [WezTerm terminal](https://wezfurlong.org/wezterm/config/lua/config/enable_kitty_keyboard.html)
// * [notcurses library](https://github.com/dankamongmen/notcurses/issues/2131)
// * [neovim text editor](https://github.com/neovim/neovim/pull/18181)
// * [kakoune text editor](https://github.com/mawww/kakoune/issues/4103)
// * [dte text editor](https://gitlab.com/craigbarnes/dte/-/issues/138)
// * [ghostty terminal](https://github.com/ghostty-org/ghostty/pull/317)
//
// Refer to https://sw.kovidgoyal.net/kitty/keyboard-protocol/ if you're curious.
let _ = execute!(
stdout(),
crossterm::event::PushKeyboardEnhancementFlags(
crossterm::event::KeyboardEnhancementFlags::DISAMBIGUATE_ESCAPE_CODES
)
);
}
let console_state = event_type_filter.enable_events()?; let console_state = event_type_filter.enable_events()?;
loop { loop {
let event = crossterm::event::read().map_err(|_| ShellError::GenericError { let event = crossterm::event::read().map_err(|_| ShellError::GenericError {
@ -95,6 +123,13 @@ There are 4 `key_type` variants:
let event = parse_event(head, &event, &event_type_filter, add_raw); let event = parse_event(head, &event, &event_type_filter, add_raw);
if let Some(event) = event { if let Some(event) = event {
terminal::disable_raw_mode()?; terminal::disable_raw_mode()?;
if config.use_kitty_protocol {
let _ = execute!(
std::io::stdout(),
crossterm::event::PopKeyboardEnhancementFlags
);
}
console_state.restore(); console_state.restore();
return Ok(event.into_pipeline_data()); return Ok(event.into_pipeline_data());
} }