leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix ctrl or alt + arrows

Browse source
This commit is contained in:
Dominic Gerhauser 2024-07-27 14:37:38 +02:00 • committed by Jeremy Soller
parent 7ca862e4ae
commit b3971499ac
1 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/terminal_box.rs
View file

@ -600,7 +600,6 @@ where
let is_app_cursor = terminal.term.lock().mode().contains(TermMode::APP_CURSOR); let is_app_cursor = terminal.term.lock().mode().contains(TermMode::APP_CURSOR);
let is_mouse_mode = terminal.term.lock().mode().intersects(TermMode::MOUSE_MODE); let is_mouse_mode = terminal.term.lock().mode().intersects(TermMode::MOUSE_MODE);
let mut status = Status::Ignored; let mut status = Status::Ignored;
match event { match event {
Event::Keyboard(KeyEvent::KeyPressed { Event::Keyboard(KeyEvent::KeyPressed {
@ -613,6 +612,7 @@ where
return Status::Captured; return Status::Captured;
} }
} }
let mod_no = calculate_modifier_number(state); let mod_no = calculate_modifier_number(state);
let escape_code = match named { let escape_code = match named {
Named::Insert => csi("2", "~", mod_no), Named::Insert => csi("2", "~", mod_no),
@ -637,28 +637,28 @@ where
if is_app_cursor { if is_app_cursor {
ss3("A", mod_no) ss3("A", mod_no)
} else { } else {
csi("A", "", mod_no) csi2("A", mod_no)
} }
} }
Named::ArrowDown => { Named::ArrowDown => {
if is_app_cursor { if is_app_cursor {
ss3("B", mod_no) ss3("B", mod_no)
} else { } else {
csi("B", "", mod_no) csi2("B", mod_no)
} }
} }
Named::ArrowRight => { Named::ArrowRight => {
if is_app_cursor { if is_app_cursor {
ss3("C", mod_no) ss3("C", mod_no)
} else { } else {
csi("C", "", mod_no) csi2("C", mod_no)
} }
} }
Named::ArrowLeft => { Named::ArrowLeft => {
if is_app_cursor { if is_app_cursor {
ss3("D", mod_no) ss3("D", mod_no)
} else { } else {
csi("D", "", mod_no) csi2("D", mod_no)
} }
} }
Named::End => { Named::End => {
@ -668,7 +668,7 @@ where
} else if is_app_cursor { } else if is_app_cursor {
ss3("F", mod_no) ss3("F", mod_no)
} else { } else {
csi("F", "", mod_no) csi2("F", mod_no)
} }
} }
Named::Home => { Named::Home => {
@ -678,7 +678,7 @@ where
} else if is_app_cursor { } else if is_app_cursor {
ss3("H", mod_no) ss3("H", mod_no)
} else { } else {
csi("H", "", mod_no) csi2("H", mod_no)
} }
} }
Named::F1 => ss3("P", mod_no), Named::F1 => ss3("P", mod_no),
@ -707,12 +707,11 @@ where
match named { match named {
Named::Backspace => { Named::Backspace => {
let code = if modifiers.control() { "\x08" } else { "\x7f" }; let code = if modifiers.control() { "\x08" } else { "\x7f" };
terminal.input_scroll(format!("{alt_prefix}{code}").as_bytes().to_vec()); terminal.input_scroll(format!("{alt_prefix}{code}").into_bytes());
status = Status::Captured; status = Status::Captured;
} }
Named::Enter => { Named::Enter => {
terminal terminal.input_scroll(format!("{}{}", alt_prefix, "\x0D").into_bytes());
.input_scroll(format!("{}{}", alt_prefix, "\x0D").as_bytes().to_vec());
status = Status::Captured; status = Status::Captured;
} }
Named::Escape => { Named::Escape => {
@ -724,19 +723,17 @@ where
if had_selection { if had_selection {
terminal.update(); terminal.update();
} else { } else {
terminal.input_scroll( terminal.input_scroll(format!("{}{}", alt_prefix, "\x1B").into_bytes());
format!("{}{}", alt_prefix, "\x1B").as_bytes().to_vec(),
);
} }
status = Status::Captured; status = Status::Captured;
} }
Named::Space => { Named::Space => {
terminal.input_scroll(format!("{}{}", alt_prefix, " ").as_bytes().to_vec()); terminal.input_scroll(format!("{}{}", alt_prefix, " ").into_bytes());
status = Status::Captured; status = Status::Captured;
} }
Named::Tab => { Named::Tab => {
let code = if modifiers.shift() { "\x1b[Z" } else { "\x09" }; let code = if modifiers.shift() { "\x1b[Z" } else { "\x09" };
terminal.input_scroll(format!("{alt_prefix}{code}").as_bytes().to_vec()); terminal.input_scroll(format!("{alt_prefix}{code}").into_bytes());
status = Status::Captured; status = Status::Captured;
} }
_ => {} _ => {}
@ -1167,21 +1164,28 @@ fn calculate_modifier_number(state: &State) -> u8 {
#[inline(always)] #[inline(always)]
fn csi(code: &str, suffix: &str, modifiers: u8) -> Option<Vec<u8>> { fn csi(code: &str, suffix: &str, modifiers: u8) -> Option<Vec<u8>> {
if modifiers == 1 { if modifiers == 1 {
Some(format!("\x1B[{code}{suffix}").as_bytes().to_vec()) Some(format!("\x1B[{code}{suffix}").into_bytes())
} else { } else {
Some( Some(format!("\x1B[{code};{modifiers}{suffix}").into_bytes())
format!("\x1B[{code};{modifiers}{suffix}") }
.as_bytes() }
.to_vec(), // https://sw.kovidgoyal.net/kitty/keyboard-protocol/#legacy-functional-keys
) // CSI 1 ; modifier {ABCDEFHPQS}
// code is ABCDEFHPQS
#[inline(always)]
fn csi2(code: &str, modifiers: u8) -> Option<Vec<u8>> {
if modifiers == 1 {
Some(format!("\x1B[{code}").into_bytes())
} else {
Some(format!("\x1B[1;{modifiers}{code}").into_bytes())
} }
} }
#[inline(always)] #[inline(always)]
fn ss3(code: &str, modifiers: u8) -> Option<Vec<u8>> { fn ss3(code: &str, modifiers: u8) -> Option<Vec<u8>> {
if modifiers == 1 { if modifiers == 1 {
Some(format!("\x1B\x4F{code}").as_bytes().to_vec()) Some(format!("\x1B\x4F{code}").into_bytes())
} else { } else {
Some(format!("\x1B[1;{modifiers}{code}").as_bytes().to_vec()) Some(format!("\x1B[1;{modifiers}{code}").into_bytes())
} }
} }