From e4faa16c8a7f2a51303ad3fe9f3891d8f7eabb82 Mon Sep 17 00:00:00 2001
From: Jiayi Zhao <jeff.no.zhao@gmail.com>
Date: Wed, 30 Dec 2020 14:02:10 -0500
Subject: add resize notification support and preliminary mouse support

 - currently scroll is hardmapped to cursor_up and cursor_down
---
 src/run.rs | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

(limited to 'src/run.rs')

diff --git a/src/run.rs b/src/run.rs
index 11ef0e2..19d2486 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -1,13 +1,15 @@
-use crate::commands::{CommandKeybind, JoshutoRunnable};
+use termion::event::{Event, MouseButton, MouseEvent};
+
+use crate::commands::{CommandKeybind, JoshutoRunnable, KeyCommand};
 use crate::config::{JoshutoCommandMapping, JoshutoConfig};
 use crate::context::JoshutoContext;
 use crate::tab::JoshutoTab;
 use crate::ui;
 use crate::ui::views::TuiView;
 use crate::ui::widgets::TuiCommandMenu;
-use crate::util::event::Event;
+use crate::util::event::JoshutoEvent;
+use crate::util::input_process;
 use crate::util::load_child::LoadChild;
-use crate::util::worker;
 
 pub fn run(config_t: JoshutoConfig, keymap_t: JoshutoCommandMapping) -> std::io::Result<()> {
     let mut backend: ui::TuiBackend = ui::TuiBackend::new()?;
@@ -34,21 +36,34 @@ pub fn run(config_t: JoshutoConfig, keymap_t: JoshutoCommandMapping) -> std::io:
             Ok(event) => event,
             Err(_) => return Ok(()), // TODO
         };
-
         match event {
-            Event::IOWorkerProgress(res) => {
-                worker::process_worker_progress(&mut context, res);
-            }
-            Event::IOWorkerResult(res) => {
-                worker::process_finished_worker(&mut context, res);
+            JoshutoEvent::Termion(Event::Mouse(event)) => {
+                let command = match event {
+                    MouseEvent::Press(MouseButton::WheelUp, _, _) => {
+                        Some(KeyCommand::CursorMoveUp(1))
+                    }
+                    MouseEvent::Press(MouseButton::WheelDown, _, _) => {
+                        Some(KeyCommand::CursorMoveDown(1))
+                    }
+                    e => None,
+                };
+                match command {
+                    Some(c) => {
+                        if let Err(e) = c.execute(&mut context, &mut backend) {
+                            context.push_msg(e.to_string());
+                        }
+                    }
+                    None => context.push_msg(format!("Unmapped input: {:?}", event)),
+                }
+                context.flush_event();
             }
-            Event::Input(key) => {
+            JoshutoEvent::Termion(key) => {
                 if !context.message_queue_ref().is_empty() {
                     context.pop_msg();
                 }
                 match keymap_t.as_ref().get(&key) {
                     None => {
-                        context.push_msg(format!("Unknown keycode: {:?}", key));
+                        context.push_msg(format!("Unmapped input: {:?}", key));
                     }
                     Some(CommandKeybind::SimpleKeybind(command)) => {
                         if let Err(e) = command.execute(&mut context, &mut backend) {
@@ -70,6 +85,7 @@ pub fn run(config_t: JoshutoConfig, keymap_t: JoshutoCommandMapping) -> std::io:
                 }
                 context.flush_event();
             }
+            event => input_process::process_noninteractive(event, &mut context),
         }
     }
 
-- 
cgit v1.2.3