cleanup

kamiyaa · kamiyaa · commit 88a828e7e360 · 2026-01-28T20:27:15.000-05:00
diff --git a/src/bin/client/commands/open_file.rs b/src/bin/client/commands/open_file.rs
@@ -3,7 +3,7 @@ use dizi::request::client::ClientRequest;
 
 use crate::config::option::WidgetType;
 use crate::context::AppContext;
-use crate::util::request::send_client_request;
+use crate::utils::request::send_client_request;
 
 use super::change_directory;
 
diff --git a/src/bin/client/commands/quit.rs b/src/bin/client/commands/quit.rs
@@ -2,7 +2,7 @@ use dizi::error::DiziResult;
 use dizi::request::client::ClientRequest;
 
 use crate::context::{AppContext, QuitType};
-use crate::util::request::send_client_request;
+use crate::utils::request::send_client_request;
 
 pub fn close(context: &mut AppContext) -> DiziResult {
     context.quit = QuitType::Normal;
diff --git a/src/bin/client/commands/search.rs b/src/bin/client/commands/search.rs
@@ -1,7 +1,7 @@
 use dizi::error::DiziResult;
 
 use crate::context::AppContext;
-use crate::util::search::SearchPattern;
+use crate::utils::search::SearchPattern;
 
 use super::cursor_move;
 use super::search_glob;
diff --git a/src/bin/client/commands/search_glob.rs b/src/bin/client/commands/search_glob.rs
@@ -4,7 +4,7 @@ use dizi::error::DiziResult;
 
 use crate::context::AppContext;
 use crate::tab::JoshutoTab;
-use crate::util::search::SearchPattern;
+use crate::utils::search::SearchPattern;
 
 use super::cursor_move;
 
diff --git a/src/bin/client/commands/search_skim.rs b/src/bin/client/commands/search_skim.rs
@@ -11,7 +11,7 @@ use crate::commands::cursor_move;
 use crate::config::option::WidgetType;
 use crate::context::AppContext;
 use crate::ui::AppBackend;
-use crate::util::search::SearchPattern;
+use crate::utils::search::SearchPattern;
 
 #[derive(Clone, Debug)]
 pub struct DiziSkimItem {
diff --git a/src/bin/client/commands/search_string.rs b/src/bin/client/commands/search_string.rs
@@ -2,7 +2,7 @@ use dizi::error::DiziResult;
 
 use crate::context::AppContext;
 use crate::tab::JoshutoTab;
-use crate::util::search::SearchPattern;
+use crate::utils::search::SearchPattern;
 
 use super::cursor_move;
 
diff --git a/src/bin/client/config/keymap/keymapping.rs b/src/bin/client/config/keymap/keymapping.rs
@@ -13,7 +13,7 @@ use dizi::request::client::ClientRequest;
 use crate::config::{parse_toml_to_config, TomlConfigFile};
 use crate::key_command::{AppCommand, Command, CommandKeybind};
 use crate::traits::ToString;
-use crate::util::keyparse::str_to_event;
+use crate::utils::keyparse::str_to_event;
 
 use super::default_keymap::DEFAULT_KEYMAP;
 
diff --git a/src/bin/client/context/app_context.rs b/src/bin/client/context/app_context.rs
@@ -10,7 +10,7 @@ use crate::config;
 use crate::config::option::WidgetType;
 use crate::context::{CommandLineContext, MessageQueue, ServerState, TabContext};
 use crate::event::{AppEvent, AppEventListener};
-use crate::util::search::SearchPattern;
+use crate::utils::search::SearchPattern;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum QuitType {
diff --git a/src/bin/client/key_command/impl_appexecute.rs b/src/bin/client/key_command/impl_appexecute.rs
@@ -6,7 +6,7 @@ use crate::config::option::WidgetType;
 use crate::config::AppKeyMapping;
 use crate::context::AppContext;
 use crate::ui::AppBackend;
-use crate::util::request::send_client_request;
+use crate::utils::request::send_client_request;
 use crate::{commands::*, ui::widgets::TuiPrompt};
 
 use super::{AppExecute, Command};
diff --git a/src/bin/client/main.rs b/src/bin/client/main.rs
@@ -10,7 +10,7 @@ mod run;
 mod tab;
 mod traits;
 mod ui;
-mod util;
+mod utils;
 
 use std::os::unix::net::UnixStream;
 use std::path::{Path, PathBuf};
@@ -187,7 +187,7 @@ fn run_app(args: CommandArgs) -> DiziResult {
                 )?;
                 context.tab_context_mut().push_tab(tab);
 
-                let mut backend: ui::AppBackend = ui::AppBackend::new()?;
+                let mut backend: ui::AppBackend = ui::AppBackend::new(false)?;
                 run::run_ui(&mut backend, &mut context, keymap)?;
             }
         }
diff --git a/src/bin/client/run/run_control.rs b/src/bin/client/run/run_control.rs
@@ -2,7 +2,7 @@ use dizi::error::DiziResult;
 use dizi::request::client::ClientRequest;
 
 use crate::context::AppContext;
-use crate::util::request::send_client_request;
+use crate::utils::request::send_client_request;
 use crate::CommandArgs;
 
 pub fn run_control(context: &mut AppContext, args: &CommandArgs) -> DiziResult {
diff --git a/src/bin/client/run/run_query.rs b/src/bin/client/run/run_query.rs
@@ -7,7 +7,7 @@ use dizi::response::server::ServerBroadcastEvent;
 
 use crate::context::AppContext;
 use crate::event::AppEvent;
-use crate::util::request::send_client_request;
+use crate::utils::request::send_client_request;
 
 pub fn run_query(context: &mut AppContext, query: String) -> DiziResult {
     // server listener
diff --git a/src/bin/client/run/run_query_all.rs b/src/bin/client/run/run_query_all.rs
@@ -7,7 +7,7 @@ use dizi::response::server::ServerBroadcastEvent;
 
 use crate::context::AppContext;
 use crate::event::AppEvent;
-use crate::util::request::send_client_request;
+use crate::utils::request::send_client_request;
 
 pub fn run_query_all(context: &mut AppContext) -> DiziResult {
     // server listener
diff --git a/src/bin/client/run/run_ui.rs b/src/bin/client/run/run_ui.rs
@@ -17,7 +17,7 @@ use crate::traits::ToString;
 use crate::ui::views;
 use crate::ui::views::TuiView;
 use crate::ui::AppBackend;
-use crate::util::request::send_client_request;
+use crate::utils::request::send_client_request;
 
 pub fn run_ui(
     backend: &mut AppBackend,
diff --git a/src/bin/client/ui/backend.rs b/src/bin/client/ui/backend.rs
@@ -1,60 +1,68 @@
-use std::io::stdout;
-use std::io::Write;
+use std::io::{self, stdout, Write};
 
 use ratatui::backend::TermionBackend;
+use ratatui::termion::input::MouseTerminal;
 use ratatui::termion::raw::{IntoRawMode, RawTerminal};
 use ratatui::termion::screen::AlternateScreen;
-
+use ratatui::termion::screen::IntoAlternateScreen;
 use ratatui::widgets::Widget;
 
-#[cfg(feature = "mouse")]
-use ratatui::termion::input::MouseTerminal;
+use crate::utils::format::clear_screen;
 
-trait New {
-    fn new() -> std::io::Result<Self>
-    where
-        Self: Sized;
+pub enum Screen {
+    WithMouse(MouseTerminal<AlternateScreen<RawTerminal<std::io::Stdout>>>),
+    WithoutMouse(AlternateScreen<RawTerminal<std::io::Stdout>>),
 }
 
-#[cfg(feature = "mouse")]
-type Screen = MouseTerminal<AlternateScreen<RawTerminal<std::io::Stdout>>>;
-#[cfg(feature = "mouse")]
-impl New for Screen {
-    fn new() -> std::io::Result<Self> {
-        let stdout = std::io::stdout().into_raw_mode()?;
-        let alt_screen = MouseTerminal::from(AlternateScreen::from(stdout));
-        return Ok(alt_screen);
+impl Screen {
+    // Returns alternate screen
+    fn new(mouse_support: bool) -> io::Result<Self> {
+        let stdout = io::stdout().into_raw_mode()?;
+        if mouse_support {
+            Ok(Self::WithMouse(MouseTerminal::from(
+                stdout.into_alternate_screen().unwrap(),
+            )))
+        } else {
+            Ok(Self::WithoutMouse(stdout.into_alternate_screen().unwrap()))
+        }
     }
 }
-#[cfg(not(feature = "mouse"))]
-type Screen = AlternateScreen<RawTerminal<std::io::Stdout>>;
-#[cfg(not(feature = "mouse"))]
-impl New for Screen {
-    fn new() -> std::io::Result<Self> {
-        use ratatui::termion::screen::IntoAlternateScreen;
 
-        let stdout = std::io::stdout().into_raw_mode()?;
-        let alt_screen = AlternateScreen::from(stdout.into_alternate_screen().unwrap());
-        Ok(alt_screen)
+impl Write for Screen {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        match self {
+            Screen::WithMouse(t) => t.write(buf),
+            Screen::WithoutMouse(t) => t.write(buf),
+        }
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        match self {
+            Screen::WithMouse(t) => t.flush(),
+            Screen::WithoutMouse(t) => t.flush(),
+        }
     }
 }
 
-pub type AppTerminal = ratatui::Terminal<TermionBackend<Screen>>;
+// pub type TuiBackend = TermionBackend<Screen>;
+pub type TuiTerminal = ratatui::Terminal<TermionBackend<Screen>>;
 
 pub struct AppBackend {
-    pub terminal: Option<AppTerminal>,
+    pub terminal: Option<TuiTerminal>,
+    pub mouse_support: bool,
 }
 
 impl AppBackend {
-    pub fn new() -> std::io::Result<Self> {
-        let mut alt_screen = Screen::new()?;
+    pub fn new(mouse_support: bool) -> io::Result<Self> {
+        let alt_screen = Screen::new(mouse_support)?;
         // clears the screen of artifacts
-        write!(alt_screen, "{}", ratatui::termion::clear::All)?;
+        clear_screen();
 
         let backend = TermionBackend::new(alt_screen);
         let mut terminal = ratatui::Terminal::new(backend)?;
         terminal.hide_cursor()?;
         Ok(Self {
+            mouse_support,
             terminal: Some(terminal),
         })
     }
@@ -69,21 +77,23 @@ impl AppBackend {
         });
     }
 
-    pub fn terminal_ref(&self) -> &AppTerminal {
+    pub fn terminal_ref(&self) -> &TuiTerminal {
         self.terminal.as_ref().unwrap()
     }
 
-    pub fn terminal_mut(&mut self) -> &mut AppTerminal {
+    pub fn terminal_mut(&mut self) -> &mut TuiTerminal {
         self.terminal.as_mut().unwrap()
     }
 
+    // For when we need to launch a terminal application
     pub fn terminal_drop(&mut self) {
         let _ = self.terminal.take();
         let _ = stdout().flush();
     }
 
-    pub fn terminal_restore(&mut self) -> std::io::Result<()> {
-        let mut new_backend = AppBackend::new()?;
+    // For when we need to restore joshuto
+    pub fn terminal_restore(&mut self) -> io::Result<()> {
+        let mut new_backend = Self::new(self.mouse_support)?;
         std::mem::swap(&mut self.terminal, &mut new_backend.terminal);
         Ok(())
     }
diff --git a/src/bin/client/ui/widgets/tui_dirlist_detailed.rs b/src/bin/client/ui/widgets/tui_dirlist_detailed.rs
@@ -9,9 +9,9 @@ use unicode_width::UnicodeWidthStr;
 
 use crate::config::option::DisplayOption;
 use crate::fs::{FileType, JoshutoDirEntry, JoshutoDirList, LinkType};
-use crate::util::format;
-use crate::util::string::UnicodeTruncate;
-use crate::util::style;
+use crate::utils::format;
+use crate::utils::string::UnicodeTruncate;
+use crate::utils::style;
 
 const MIN_LEFT_LABEL_WIDTH: i32 = 15;
 
diff --git a/src/bin/client/ui/widgets/tui_playlist.rs b/src/bin/client/ui/widgets/tui_playlist.rs
@@ -10,8 +10,8 @@ use unicode_width::UnicodeWidthStr;
 
 use dizi::player::PlayerState;
 
-use crate::util::string::UnicodeTruncate;
-use crate::util::style;
+use crate::utils::string::UnicodeTruncate;
+use crate::utils::style;
 
 const MIN_LEFT_LABEL_WIDTH: i32 = 15;
 
diff --git a/src/bin/client/utils/format.rs b/src/bin/client/utils/format.rs
@@ -17,3 +17,7 @@ pub fn file_size_to_string(file_size: u64) -> String {
         format!("{:>4.2} {}", file_size, FILE_UNITS[index])
     }
 }
+
+pub fn clear_screen() {
+    println!("{}", ratatui::termion::clear::All);
+}
diff --git a/src/bin/client/utils/keyparse.rs b/src/bin/client/utils/keyparse.rs
diff --git a/src/bin/client/utils/mod.rs b/src/bin/client/utils/mod.rs
diff --git a/src/bin/client/utils/request.rs b/src/bin/client/utils/request.rs
diff --git a/src/bin/client/utils/search.rs b/src/bin/client/utils/search.rs
diff --git a/src/bin/client/utils/string.rs b/src/bin/client/utils/string.rs
diff --git a/src/bin/client/utils/style.rs b/src/bin/client/utils/style.rs
@@ -1,7 +1,7 @@
 use ratatui::style::Style;
 
 use crate::fs::{FileType, JoshutoDirEntry, LinkType};
-use crate::util::unix;
+use crate::utils::unix;
 
 use crate::THEME_T;
 
diff --git a/src/bin/client/utils/unix.rs b/src/bin/client/utils/unix.rs
