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

ViEditor: add passthrough mode (disables vi features)

Browse source
This commit is contained in:
Jeremy Soller 2023-10-20 09:46:21 -06:00
parent 6d59885200
commit c6e4f9d04c
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/edit/vi.rs
View file

@ -9,6 +9,7 @@ use crate::{
#[derive(Clone, Copy, Debug, Eq, PartialEq)] #[derive(Clone, Copy, Debug, Eq, PartialEq)]
enum Mode { enum Mode {
Passthrough,
Normal, Normal,
Insert, Insert,
Command, Command,
@ -50,6 +51,15 @@ impl<'a> ViEditor<'a> {
pub fn foreground_color(&self) -> Color { pub fn foreground_color(&self) -> Color {
self.editor.foreground_color() self.editor.foreground_color()
} }
/// Set passthrough mode (true will turn off vi features)
pub fn set_passthrough(&mut self, passthrough: bool) {
if passthrough {
self.mode = Mode::Passthrough;
} else {
self.mode = Mode::Normal;
}
}
} }
impl<'a> Edit for ViEditor<'a> { impl<'a> Edit for ViEditor<'a> {
@ -97,6 +107,7 @@ impl<'a> Edit for ViEditor<'a> {
let old_mode = self.mode; let old_mode = self.mode;
match self.mode { match self.mode {
Mode::Passthrough => self.editor.action(font_system, action),
Mode::Normal => match action { Mode::Normal => match action {
Action::Insert(c) => match c { Action::Insert(c) => match c {
// Enter insert mode after cursor // Enter insert mode after cursor
@ -369,6 +380,7 @@ impl<'a> Edit for ViEditor<'a> {
cursor_glyph_opt(&self.cursor()) cursor_glyph_opt(&self.cursor())
{ {
let block_cursor = match self.mode { let block_cursor = match self.mode {
Mode::Passthrough => false,
Mode::Normal => true, Mode::Normal => true,
Mode::Insert => false, Mode::Insert => false,
_ => true, /*TODO: determine block cursor in other modes*/ _ => true, /*TODO: determine block cursor in other modes*/