From aa22859f253f1b5fc74136c16b43f7818ddc089a Mon Sep 17 00:00:00 2001
From: Jaby Blubb <fenir50@web.de>
Date: Sun, 9 Jul 2023 16:49:53 +0200
Subject: [PATCH] Some cleanup

---
 src/Tools/psxreadmap/src/lib.rs  | 26 +++++++++++++-------------
 src/Tools/psxreadmap/src/main.rs |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Tools/psxreadmap/src/lib.rs b/src/Tools/psxreadmap/src/lib.rs
index 1d948188..4da0477e 100644
--- a/src/Tools/psxreadmap/src/lib.rs
+++ b/src/Tools/psxreadmap/src/lib.rs
@@ -52,17 +52,17 @@ impl MenuSelection {
 }
 
 pub struct ConsoleUI {
-    rx:              EventReceiver,
-    terminal:        Terminal,
-    frame:           Rect,
-    sub_frames:      Vec<Rect>,
-    stat_sub_frames: Vec<Rect>,
-    menu_selection:  MenuSelection,
+    rx:             EventReceiver,
+    terminal:       Terminal,
+    cur_size:       Rect,
+    main_chunks:    Vec<Rect>,
+    stats_chunks:   Vec<Rect>,
+    menu_selection: MenuSelection,
 }
 
 impl ConsoleUI {
     pub fn new(rx: EventReceiver, terminal: Terminal) -> ConsoleUI {
-        ConsoleUI{rx, terminal, frame: Rect::default(), sub_frames: Vec::default(), stat_sub_frames: Vec::default(), menu_selection: MenuSelection::Stats}
+        ConsoleUI{rx, terminal, cur_size: Rect::default(), main_chunks: Vec::default(), stats_chunks: Vec::default(), menu_selection: MenuSelection::Stats}
     }
 
     pub fn update(&mut self) -> Result<UIState, Error> {
@@ -90,7 +90,7 @@ impl ConsoleUI {
                 }
             },
             Event::Tick        => {
-                if self.terminal.size().expect("Getting size of terminal") != self.frame {
+                if self.terminal.size().expect("Getting size of terminal") != self.cur_size {
                     Ok(UIState::Render)
                 } 
 
@@ -104,16 +104,16 @@ impl ConsoleUI {
 
     pub fn render(&mut self) -> Result<(), Error> {
         self.terminal.draw(|frame| {
-            Self::update_sub_frames(&mut self.sub_frames, &mut self.stat_sub_frames, &mut self.frame, frame.size());
+            Self::update_sub_frames(&mut self.main_chunks, &mut self.stats_chunks, &mut self.cur_size, frame.size());
 
-            frame.render_widget(Self::create_titel(),                    self.sub_frames[0]);
-            frame.render_widget(Self::create_menu(&self.menu_selection), self.sub_frames[1]);
+            frame.render_widget(Self::create_titel(),                    self.main_chunks[0]);
+            frame.render_widget(Self::create_menu(&self.menu_selection), self.main_chunks[1]);
             match self.menu_selection {
                 MenuSelection::Stats => {
-                    Self::render_stats(frame, &self.stat_sub_frames);
+                    Self::render_stats(frame, &self.stats_chunks);
                 },
                 MenuSelection::Quit  => {
-                    frame.render_widget(Self::create_exit_message(), self.sub_frames[2]);
+                    frame.render_widget(Self::create_exit_message(), self.main_chunks[2]);
                 }
             }
         })?;
diff --git a/src/Tools/psxreadmap/src/main.rs b/src/Tools/psxreadmap/src/main.rs
index 4414e92f..2117ea29 100644
--- a/src/Tools/psxreadmap/src/main.rs
+++ b/src/Tools/psxreadmap/src/main.rs
@@ -26,7 +26,7 @@ pub fn main() {
     }
 }
 
-fn run_main(_cmd: CommandLine) -> Result<(), Error> {
+fn run_main(cmd: CommandLine) -> Result<(), Error> {
     let _sections   = load_memory_map(Some(cmd.input))?;
     let     rx         = start_event_loop();
     let     terminal   = setup_console()?;