mirror of
https://codeberg.org/unspeaker/perch.git
synced 2025-12-06 17:46:42 +01:00
factor input handling into modes
This commit is contained in:
parent
648c37e9d4
commit
48f651fc0f
5 changed files with 115 additions and 74 deletions
93
src/keys.rs
93
src/keys.rs
|
|
@ -20,30 +20,29 @@ macro_rules! press {
|
|||
};
|
||||
}
|
||||
|
||||
mod edit; pub use self::edit::*;
|
||||
mod save; pub use self::save::*;
|
||||
mod quit; pub use self::quit::*;
|
||||
|
||||
impl Handle<TuiIn> for Taggart {
|
||||
fn handle (&mut self, input: &TuiIn) -> Perhaps<bool> {
|
||||
let x_min = self.offset;
|
||||
let x_max = self.offset + self.display.h().saturating_sub(1);
|
||||
let min = self.offset;
|
||||
let max = self.offset + self.display.h().saturating_sub(1);
|
||||
let event = &*input.event();
|
||||
match &self.mode {
|
||||
Some(Mode::Edit { .. }) => match event {
|
||||
press!(Char(c)) => self.edit_insert(*c),
|
||||
press!(Shift-Char(c)) => self.edit_insert(c.to_uppercase().next().unwrap()),
|
||||
press!(Backspace) => self.edit_backspace(),
|
||||
press!(Delete) => self.edit_delete(),
|
||||
press!(Enter) => self.edit_confirm(),
|
||||
press!(Esc) => self.edit_cancel(),
|
||||
_ => {}
|
||||
},
|
||||
Some(Mode::Edit { .. }) => self.mode_edit(event),
|
||||
Some(Mode::Save { .. }) => self.mode_save(event),
|
||||
Some(Mode::Quit { .. }) => self.mode_quit(event),
|
||||
None => match event {
|
||||
press!(Char('q')) => { input.done() },
|
||||
press!(Char('q')) => { self.quit_begin(&input) },
|
||||
press!(Char('w')) => { self.save_begin() },
|
||||
press!(Enter) => { self.edit_begin() },
|
||||
press!(Up) => { self.cursor = self.cursor.saturating_sub(1); },
|
||||
press!(Down) => { self.cursor = self.cursor + 1; },
|
||||
press!(PageUp) => { self.cursor = self.cursor.saturating_sub(PAGE_SIZE); },
|
||||
press!(PageDown) => { self.cursor += PAGE_SIZE; },
|
||||
press!(Left) => { self.column = self.column.saturating_sub(1); },
|
||||
press!(Right) => { self.column = self.column + 1; },
|
||||
press!(Enter) => { self.edit_begin() },
|
||||
press!(Char(' ')) => { open(self.entries[self.cursor].path.as_ref())?; }
|
||||
press!(Char(']')) => { self.columns.0[self.column].width += 1; }
|
||||
press!(Char('[')) => { self.columns.0[self.column].width =
|
||||
|
|
@ -52,11 +51,18 @@ impl Handle<TuiIn> for Taggart {
|
|||
}
|
||||
_ => todo!("{:?}", self.mode)
|
||||
}
|
||||
if self.cursor < x_min {
|
||||
self.clamp(min, max);
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
|
||||
impl Taggart {
|
||||
fn clamp (&mut self, min: usize, max: usize) {
|
||||
if self.cursor < min {
|
||||
self.offset = self.cursor;
|
||||
}
|
||||
if self.cursor > x_max {
|
||||
self.offset += self.cursor - x_max;
|
||||
if self.cursor > max {
|
||||
self.offset += self.cursor - max;
|
||||
}
|
||||
if self.offset > self.entries.len().saturating_sub(self.display.h()) {
|
||||
self.offset = self.entries.len().saturating_sub(self.display.h())
|
||||
|
|
@ -67,60 +73,5 @@ impl Handle<TuiIn> for Taggart {
|
|||
if self.column + 1 > self.columns.0.len() {
|
||||
self.column = self.columns.0.len().saturating_sub(1)
|
||||
}
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
|
||||
impl Taggart {
|
||||
pub fn edit_begin (&mut self) {
|
||||
if let Some(column) = self.columns.0.get(self.column)
|
||||
&& column.setter.is_some()
|
||||
{
|
||||
let value = (column.getter)(&self.entries[self.cursor]);
|
||||
let value = format!("{}", value.unwrap_or_default());
|
||||
self.mode = Some(Mode::Edit {
|
||||
index: value.len(),
|
||||
value: value.into(),
|
||||
});
|
||||
}
|
||||
}
|
||||
pub fn edit_cancel (&mut self) {
|
||||
self.mode = None;
|
||||
}
|
||||
pub fn edit_confirm (&mut self) {
|
||||
let value = if let Some(Mode::Edit { value, .. }) = &self.mode {
|
||||
Some(value.clone())
|
||||
} else {
|
||||
None
|
||||
};
|
||||
if let Some(value) = value
|
||||
&& let Some(column) = self.columns.0.get(self.column)
|
||||
&& let Some(setter) = &column.setter
|
||||
&& self.entries.get_mut(self.cursor).is_some()
|
||||
{
|
||||
setter(self, self.cursor, value.as_ref());
|
||||
self.mode = None;
|
||||
}
|
||||
}
|
||||
pub fn edit_insert (&mut self, c: char) {
|
||||
if let Some(Mode::Edit { value, index }) = &self.mode {
|
||||
self.mode = Some(Mode::Edit {
|
||||
index: *index + 1,
|
||||
value: format!("{value}{c}").into()
|
||||
});
|
||||
}
|
||||
}
|
||||
pub fn edit_backspace (&mut self) {
|
||||
if let Some(Mode::Edit { value, index }) = &self.mode {
|
||||
let mut chars = value.chars();
|
||||
chars.next_back();
|
||||
self.mode = Some(Mode::Edit {
|
||||
index: index.saturating_sub(1),
|
||||
value: chars.as_str().into()
|
||||
});
|
||||
}
|
||||
}
|
||||
pub fn edit_delete (&mut self) {
|
||||
todo!()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue