summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/commands/help.rs4
-rw-r--r--src/commands/numbered_command.rs4
-rw-r--r--src/commands/show_workers.rs14
-rw-r--r--src/context/app_context.rs1
-rw-r--r--src/context/commandline_context.rs1
-rw-r--r--src/context/message_queue.rs19
-rw-r--r--src/context/preview_context.rs1
-rw-r--r--src/event/mod.rs4
-rw-r--r--src/event/process_event.rs (renamed from src/util/input.rs)0
-rw-r--r--src/run.rs10
-rw-r--r--src/ui/views/tui_textfield.rs4
-rw-r--r--src/ui/widgets/tui_prompt.rs4
-rw-r--r--src/util/mod.rs1
13 files changed, 30 insertions, 37 deletions
diff --git a/src/commands/help.rs b/src/commands/help.rs
index 4f63e4e..b373105 100644
--- a/src/commands/help.rs
+++ b/src/commands/help.rs
@@ -6,11 +6,11 @@ use crate::config::AppKeyMapping;
use crate::context::AppContext;
use crate::error::JoshutoResult;
use crate::event::AppEvent;
+use crate::event::process_event;
use crate::key_command::{Command, CommandKeybind};
use crate::ui::widgets;
use crate::ui::widgets::TuiHelp;
use crate::ui::TuiBackend;
-use crate::util::input;
pub fn help_loop(
context: &mut AppContext,
@@ -76,7 +76,7 @@ pub fn help_loop(
}
context.flush_event();
}
- _ => input::process_noninteractive(event, context),
+ _ => process_event::process_noninteractive(event, context),
}
}
diff --git a/src/commands/numbered_command.rs b/src/commands/numbered_command.rs
index 16e3991..dddaf66 100644
--- a/src/commands/numbered_command.rs
+++ b/src/commands/numbered_command.rs
@@ -5,10 +5,10 @@ use crate::config::AppKeyMapping;
use crate::context::AppContext;
use crate::error::{JoshutoError, JoshutoErrorKind, JoshutoResult};
use crate::event::AppEvent;
+use crate::event::process_event;
use crate::key_command::{CommandKeybind, NumberedExecute};
use crate::ui::views::TuiView;
use crate::ui::TuiBackend;
-use crate::util::input;
pub fn numbered_command(
first_char: char,
@@ -66,7 +66,7 @@ pub fn numbered_command(
}
context.flush_event();
}
- event => input::process_noninteractive(event, context),
+ event => process_event::process_noninteractive(event, context),
}
}
}
diff --git a/src/commands/show_workers.rs b/src/commands/show_workers.rs
index cc6c65c..2e55d7a 100644
--- a/src/commands/show_workers.rs
+++ b/src/commands/show_workers.rs
@@ -4,9 +4,9 @@ use crate::config::AppKeyMapping;
use crate::context::AppContext;
use crate::error::JoshutoResult;
use crate::event::AppEvent;
+use crate::event::process_event;
use crate::ui::views::TuiWorkerView;
use crate::ui::TuiBackend;
-use crate::util::input;
pub fn show_workers(
context: &mut AppContext,
@@ -20,15 +20,13 @@ pub fn show_workers(
if let Ok(event) = context.poll_event() {
match event {
- AppEvent::Termion(event) => {
- #[allow(clippy::single_match)]
- match event {
- Event::Key(Key::Esc) => break,
- _ => {}
- }
+ AppEvent::Termion(Event::Key(Key::Esc)) => {
+ break;
+ }
+ AppEvent::Termion(_) => {
context.flush_event();
}
- event => input::process_noninteractive(event, context),
+ event => process_event::process_noninteractive(event, context),
};
}
}
diff --git a/src/context/app_context.rs b/src/context/app_context.rs
index b2b70e1..364b5b1 100644
--- a/src/context/app_context.rs
+++ b/src/context/app_context.rs
@@ -282,7 +282,6 @@ impl AppContext {
pub fn commandline_context_ref(&self) -> &CommandLineContext {
&self.commandline_context
}
-
pub fn commandline_context_mut(&mut self) -> &mut CommandLineContext {
&mut self.commandline_context
}
diff --git a/src/context/commandline_context.rs b/src/context/commandline_context.rs
index 6a6142b..5169029 100644
--- a/src/context/commandline_context.rs
+++ b/src/context/commandline_context.rs
@@ -20,7 +20,6 @@ impl CommandLineContext {
pub fn history_ref(&self) -> &history::History {
&self.history
}
-
pub fn history_mut(&mut self) -> &mut history::History {
&mut self.history
}
diff --git a/src/context/message_queue.rs b/src/context/message_queue.rs
index f90ad53..0208b96 100644
--- a/src/context/message_queue.rs
+++ b/src/context/message_queue.rs
@@ -23,30 +23,27 @@ impl MessageQueue {
Self::default()
}
- pub fn push_success(&mut self, msg: String) {
- let message = Message::new(msg, Style::default().fg(Color::Green));
- self.push_msg(message);
- }
-
pub fn push_info(&mut self, msg: String) {
let message = Message::new(msg, Style::default().fg(Color::Yellow));
self.push_msg(message);
}
-
+ pub fn push_success(&mut self, msg: String) {
+ let message = Message::new(msg, Style::default().fg(Color::Green));
+ self.push_msg(message);
+ }
pub fn push_error(&mut self, msg: String) {
let message = Message::new(msg, Style::default().fg(Color::Red));
self.push_msg(message);
}
- fn push_msg(&mut self, msg: Message) {
- self.contents.push_back(msg);
- }
-
pub fn pop_front(&mut self) -> Option<Message> {
self.contents.pop_front()
}
-
pub fn current_message(&self) -> Option<&Message> {
self.contents.front()
}
+
+ fn push_msg(&mut self, msg: Message) {
+ self.contents.push_back(msg);
+ }
}
diff --git a/src/context/preview_context.rs b/src/context/preview_context.rs
index f952629..05adc5e 100644
--- a/src/context/preview_context.rs
+++ b/src/context/preview_context.rs
@@ -17,7 +17,6 @@ impl PreviewContext {
pub fn get_preview_ref(&self, p: &path::Path) -> Option<&Option<FilePreview>> {
self.previews.get(p)
}
-
pub fn get_preview_mut(&mut self, p: &path::Path) -> Option<&mut Option<FilePreview>> {
self.previews.get_mut(p)
}
diff --git a/src/event/mod.rs b/src/event/mod.rs
index 79fb031..2d68d61 100644
--- a/src/event/mod.rs
+++ b/src/event/mod.rs
@@ -1,3 +1,5 @@
-mod app_event;
+pub mod app_event;
+pub mod process_event;
pub use self::app_event::*;
+pub use self::process_event::*;
diff --git a/src/util/input.rs b/src/event/process_event.rs
index 7e89225..7e89225 100644
--- a/src/util/input.rs
+++ b/src/event/process_event.rs
diff --git a/src/run.rs b/src/run.rs
index ea1974a..3040a06 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -3,13 +3,13 @@ use crate::commands::quit::QuitAction;
use crate::config::AppKeyMapping;
use crate::context::AppContext;
use crate::event::AppEvent;
+use crate::event::process_event;
use crate::key_command::{AppExecute, CommandKeybind};
use crate::preview::preview_default;
use crate::tab::JoshutoTab;
use crate::ui;
use crate::ui::views;
use crate::ui::views::TuiView;
-use crate::util::input;
use crate::util::to_string::ToString;
use termion::event::{Event, Key};
@@ -56,7 +56,7 @@ pub fn run(
// handle the event
match event {
AppEvent::Termion(Event::Mouse(event)) => {
- input::process_mouse(event, context, backend, &keymap_t);
+ process_event::process_mouse(event, context, backend, &keymap_t);
preview_default::load_preview(context);
}
AppEvent::Termion(key) => {
@@ -67,7 +67,7 @@ pub fn run(
// in the event where mouse input is not supported
// but we still want to register scroll
Event::Unsupported(s) => {
- input::process_unsupported(context, backend, &keymap_t, s);
+ process_event::process_unsupported(context, backend, &keymap_t, s);
}
Event::Key(Key::Char(c)) if c.is_numeric() && c != '0' => {
if let Err(e) =
@@ -88,7 +88,7 @@ pub fn run(
}
}
Some(CommandKeybind::CompositeKeybind(m)) => {
- let cmd = input::get_input_while_composite(backend, context, m);
+ let cmd = process_event::get_input_while_composite(backend, context, m);
if let Some(command) = cmd {
if let Err(e) = command.execute(context, backend, &keymap_t) {
@@ -101,7 +101,7 @@ pub fn run(
preview_default::load_preview(context);
context.flush_event();
}
- event => input::process_noninteractive(event, context),
+ event => process_event::process_noninteractive(event, context),
}
// update the file system supervisor that watches for changes in the FS
diff --git a/src/ui/views/tui_textfield.rs b/src/ui/views/tui_textfield.rs
index 997e664..b79e4a5 100644
--- a/src/ui/views/tui_textfield.rs
+++ b/src/ui/views/tui_textfield.rs
@@ -13,11 +13,11 @@ use unicode_width::UnicodeWidthStr;
use crate::context::AppContext;
use crate::event::AppEvent;
+use crate::event::process_event;
use crate::key_command::{complete_command, Command, InteractiveExecute};
use crate::ui::views::TuiView;
use crate::ui::widgets::{TuiMenu, TuiMultilineText};
use crate::ui::TuiBackend;
-use crate::util::input;
struct CompletionTracker {
pub index: usize,
@@ -277,7 +277,7 @@ impl<'a> TuiTextField<'a> {
AppEvent::Termion(_) => {
context.flush_event();
}
- event => input::process_noninteractive(event, context),
+ event => process_event::process_noninteractive(event, context),
};
}
}
diff --git a/src/ui/widgets/tui_prompt.rs b/src/ui/widgets/tui_prompt.rs
index bc1b210..4bbb2f5 100644
--- a/src/ui/widgets/tui_prompt.rs
+++ b/src/ui/widgets/tui_prompt.rs
@@ -6,9 +6,9 @@ use tui::widgets::{Clear, Paragraph, Wrap};
use crate::context::AppContext;
use crate::event::AppEvent;
+use crate::event::process_event;
use crate::ui::views::TuiView;
use crate::ui::TuiBackend;
-use crate::util::input;
pub struct TuiPrompt<'a> {
prompt: &'a str,
@@ -62,7 +62,7 @@ impl<'a> TuiPrompt<'a> {
AppEvent::Termion(_) => {
context.flush_event();
}
- event => input::process_noninteractive(event, context),
+ event => process_event::process_noninteractive(event, context),
};
}
}
diff --git a/src/util/mod.rs b/src/util/mod.rs
index 07d0874..7e43d3a 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -2,7 +2,6 @@
pub mod devicons;
pub mod format;
-pub mod input;
pub mod keyparse;
pub mod name_resolution;
pub mod process;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-14 10:49:49 +0000