Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added alt as meta setting

Browse source
This commit is contained in:
Mikayla Maki 2022-09-12 23:22:55 -07:00
parent 7c6769b392
commit 9c42b92663
4 changed files with 79 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

79
crates/terminal/src/mappings/keys.rs
View file

@ -2,7 +2,7 @@
use alacritty_terminal::term::TermMode; use alacritty_terminal::term::TermMode;
use gpui::keymap::Keystroke; use gpui::keymap::Keystroke;
#[derive(Debug)] #[derive(Debug, PartialEq, Eq)]
pub enum Modifiers { pub enum Modifiers {
None, None,
Alt, Alt,
@ -45,10 +45,10 @@ impl Modifiers {
///that depend on terminal modes also have a mapping that doesn't depend on the terminal mode. ///that depend on terminal modes also have a mapping that doesn't depend on the terminal mode.
///This is fragile, but as these mappings are locked up in legacy compatibility, it's probably good enough ///This is fragile, but as these mappings are locked up in legacy compatibility, it's probably good enough
pub fn might_convert(keystroke: &Keystroke) -> bool { pub fn might_convert(keystroke: &Keystroke) -> bool {
to_esc_str(keystroke, &TermMode::NONE).is_some() to_esc_str(keystroke, &TermMode::NONE, false).is_some()
} }
pub fn to_esc_str(keystroke: &Keystroke, mode: &TermMode) -> Option<String> { pub fn to_esc_str(keystroke: &Keystroke, mode: &TermMode, alt_is_meta: bool) -> Option<String> {
let modifiers = Modifiers::new(keystroke); let modifiers = Modifiers::new(keystroke);
// Manual Bindings including modifiers // Manual Bindings including modifiers
@ -244,6 +244,17 @@ pub fn to_esc_str(keystroke: &Keystroke, mode: &TermMode) -> Option<String> {
} }
} }
let alt_meta_binding = if alt_is_meta && modifiers == Modifiers::Alt && keystroke.key.is_ascii()
{
Some(format!("\x1b{}", keystroke.key))
} else {
None
};
if alt_meta_binding.is_some() {
return alt_meta_binding;
}
None None
} }
@ -286,26 +297,26 @@ mod test {
let shift_end = Keystroke::parse("shift-end").unwrap(); let shift_end = Keystroke::parse("shift-end").unwrap();
let none = TermMode::NONE; let none = TermMode::NONE;
assert_eq!(to_esc_str(&shift_pageup, &none), None); assert_eq!(to_esc_str(&shift_pageup, &none, false), None);
assert_eq!(to_esc_str(&shift_pagedown, &none), None); assert_eq!(to_esc_str(&shift_pagedown, &none, false), None);
assert_eq!(to_esc_str(&shift_home, &none), None); assert_eq!(to_esc_str(&shift_home, &none, false), None);
assert_eq!(to_esc_str(&shift_end, &none), None); assert_eq!(to_esc_str(&shift_end, &none, false), None);
let alt_screen = TermMode::ALT_SCREEN; let alt_screen = TermMode::ALT_SCREEN;
assert_eq!( assert_eq!(
to_esc_str(&shift_pageup, &alt_screen), to_esc_str(&shift_pageup, &alt_screen, false),
Some("\x1b[5;2~".to_string()) Some("\x1b[5;2~".to_string())
); );
assert_eq!( assert_eq!(
to_esc_str(&shift_pagedown, &alt_screen), to_esc_str(&shift_pagedown, &alt_screen, false),
Some("\x1b[6;2~".to_string()) Some("\x1b[6;2~".to_string())
); );
assert_eq!( assert_eq!(
to_esc_str(&shift_home, &alt_screen), to_esc_str(&shift_home, &alt_screen, false),
Some("\x1b[1;2H".to_string()) Some("\x1b[1;2H".to_string())
); );
assert_eq!( assert_eq!(
to_esc_str(&shift_end, &alt_screen), to_esc_str(&shift_end, &alt_screen, false),
Some("\x1b[1;2F".to_string()) Some("\x1b[1;2F".to_string())
); );
@ -313,8 +324,14 @@ mod test {
let pagedown = Keystroke::parse("pagedown").unwrap(); let pagedown = Keystroke::parse("pagedown").unwrap();
let any = TermMode::ANY; let any = TermMode::ANY;
assert_eq!(to_esc_str(&pageup, &any), Some("\x1b[5~".to_string())); assert_eq!(
assert_eq!(to_esc_str(&pagedown, &any), Some("\x1b[6~".to_string())); to_esc_str(&pageup, &any, false),
Some("\x1b[5~".to_string())
);
assert_eq!(
to_esc_str(&pagedown, &any, false),
Some("\x1b[6~".to_string())
);
} }
#[test] #[test]
@ -327,7 +344,7 @@ mod test {
function: false, function: false,
key: "🖖🏻".to_string(), //2 char string key: "🖖🏻".to_string(), //2 char string
}; };
assert_eq!(to_esc_str(&ks, &TermMode::NONE), None); assert_eq!(to_esc_str(&ks, &TermMode::NONE, false), None);
} }
#[test] #[test]
@ -340,15 +357,27 @@ mod test {
let left = Keystroke::parse("left").unwrap(); let left = Keystroke::parse("left").unwrap();
let right = Keystroke::parse("right").unwrap(); let right = Keystroke::parse("right").unwrap();
assert_eq!(to_esc_str(&up, &none), Some("\x1b[A".to_string())); assert_eq!(to_esc_str(&up, &none, false), Some("\x1b[A".to_string()));
assert_eq!(to_esc_str(&down, &none), Some("\x1b[B".to_string())); assert_eq!(to_esc_str(&down, &none, false), Some("\x1b[B".to_string()));
assert_eq!(to_esc_str(&right, &none), Some("\x1b[C".to_string())); assert_eq!(to_esc_str(&right, &none, false), Some("\x1b[C".to_string()));
assert_eq!(to_esc_str(&left, &none), Some("\x1b[D".to_string())); assert_eq!(to_esc_str(&left, &none, false), Some("\x1b[D".to_string()));
assert_eq!(to_esc_str(&up, &app_cursor), Some("\x1bOA".to_string())); assert_eq!(
assert_eq!(to_esc_str(&down, &app_cursor), Some("\x1bOB".to_string())); to_esc_str(&up, &app_cursor, false),
assert_eq!(to_esc_str(&right, &app_cursor), Some("\x1bOC".to_string())); Some("\x1bOA".to_string())
assert_eq!(to_esc_str(&left, &app_cursor), Some("\x1bOD".to_string())); );
assert_eq!(
to_esc_str(&down, &app_cursor, false),
Some("\x1bOB".to_string())
);
assert_eq!(
to_esc_str(&right, &app_cursor, false),
Some("\x1bOC".to_string())
);
assert_eq!(
to_esc_str(&left, &app_cursor, false),
Some("\x1bOD".to_string())
);
} }
#[test] #[test]
@ -361,11 +390,13 @@ mod test {
assert_eq!( assert_eq!(
to_esc_str( to_esc_str(
&Keystroke::parse(&format!("ctrl-{}", lower)).unwrap(), &Keystroke::parse(&format!("ctrl-{}", lower)).unwrap(),
&mode &mode,
false
), ),
to_esc_str( to_esc_str(
&Keystroke::parse(&format!("ctrl-shift-{}", upper)).unwrap(), &Keystroke::parse(&format!("ctrl-shift-{}", upper)).unwrap(),
&mode &mode,
false
), ),
"On letter: {}/{}", "On letter: {}/{}",
lower, lower,

4
crates/terminal/src/terminal.rs
View file

@ -677,8 +677,8 @@ impl Terminal {
self.write_to_pty(input); self.write_to_pty(input);
} }
pub fn try_keystroke(&mut self, keystroke: &Keystroke) -> bool { pub fn try_keystroke(&mut self, keystroke: &Keystroke, alt_is_meta: bool) -> bool {
let esc = to_esc_str(keystroke, &self.last_content.mode); let esc = to_esc_str(keystroke, &self.last_content.mode, alt_is_meta);
if let Some(esc) = esc { if let Some(esc) = esc {
self.input(esc); self.input(esc);
true true

10
crates/terminal/src/terminal_element.rs
View file

@ -775,7 +775,15 @@ impl Element for TerminalElement {
self.terminal self.terminal
.upgrade(cx.app) .upgrade(cx.app)
.map(|model_handle| { .map(|model_handle| {
model_handle.update(cx.app, |term, _| term.try_keystroke(keystroke)) model_handle.update(cx.app, |term, cx| {
term.try_keystroke(
keystroke,
cx.global::<Settings>()
.terminal_overrides
.option_as_meta
.unwrap_or(false),
)
})
}) })
.unwrap_or(false) .unwrap_or(false)
} }

20
crates/terminal/src/terminal_view.rs
View file

@ -155,8 +155,14 @@ impl TerminalView {
{ {
cx.show_character_palette(); cx.show_character_palette();
} else { } else {
self.terminal.update(cx, |term, _| { self.terminal.update(cx, |term, cx| {
term.try_keystroke(&Keystroke::parse("ctrl-cmd-space").unwrap()) term.try_keystroke(
&Keystroke::parse("ctrl-cmd-space").unwrap(),
cx.global::<Settings>()
.terminal_overrides
.option_as_meta
.unwrap_or(false),
)
}); });
} }
} }
@ -280,7 +286,7 @@ impl TerminalView {
fn up(&mut self, _: &Up, cx: &mut ViewContext<Self>) { fn up(&mut self, _: &Up, cx: &mut ViewContext<Self>) {
self.clear_bel(cx); self.clear_bel(cx);
self.terminal.update(cx, |term, _| { self.terminal.update(cx, |term, _| {
term.try_keystroke(&Keystroke::parse("up").unwrap()) term.try_keystroke(&Keystroke::parse("up").unwrap(), false)
}); });
} }
@ -288,7 +294,7 @@ impl TerminalView {
fn down(&mut self, _: &Down, cx: &mut ViewContext<Self>) { fn down(&mut self, _: &Down, cx: &mut ViewContext<Self>) {
self.clear_bel(cx); self.clear_bel(cx);
self.terminal.update(cx, |term, _| { self.terminal.update(cx, |term, _| {
term.try_keystroke(&Keystroke::parse("down").unwrap()) term.try_keystroke(&Keystroke::parse("down").unwrap(), false)
}); });
} }
@ -296,7 +302,7 @@ impl TerminalView {
fn ctrl_c(&mut self, _: &CtrlC, cx: &mut ViewContext<Self>) { fn ctrl_c(&mut self, _: &CtrlC, cx: &mut ViewContext<Self>) {
self.clear_bel(cx); self.clear_bel(cx);
self.terminal.update(cx, |term, _| { self.terminal.update(cx, |term, _| {
term.try_keystroke(&Keystroke::parse("ctrl-c").unwrap()) term.try_keystroke(&Keystroke::parse("ctrl-c").unwrap(), false)
}); });
} }
@ -304,7 +310,7 @@ impl TerminalView {
fn escape(&mut self, _: &Escape, cx: &mut ViewContext<Self>) { fn escape(&mut self, _: &Escape, cx: &mut ViewContext<Self>) {
self.clear_bel(cx); self.clear_bel(cx);
self.terminal.update(cx, |term, _| { self.terminal.update(cx, |term, _| {
term.try_keystroke(&Keystroke::parse("escape").unwrap()) term.try_keystroke(&Keystroke::parse("escape").unwrap(), false)
}); });
} }
@ -312,7 +318,7 @@ impl TerminalView {
fn enter(&mut self, _: &Enter, cx: &mut ViewContext<Self>) { fn enter(&mut self, _: &Enter, cx: &mut ViewContext<Self>) {
self.clear_bel(cx); self.clear_bel(cx);
self.terminal.update(cx, |term, _| { self.terminal.update(cx, |term, _| {
term.try_keystroke(&Keystroke::parse("enter").unwrap()) term.try_keystroke(&Keystroke::parse("enter").unwrap(), false)
}); });
} }
} }