From 2f619c5d171d12009315b7324438e6a553579785 Mon Sep 17 00:00:00 2001
From: keith <keith@the-simmons.net>
Date: Sun, 26 Jan 2020 19:55:28 -0800
Subject: [PATCH] linux bug fixes and better error printing on linux (just
 panic with a message)

---
 Cargo.toml                  |  4 +++-
 src/bridge/events.rs        |  2 +-
 src/bridge/handler.rs       | 11 ++++++-----
 src/bridge/mod.rs           |  3 +--
 src/editor/cursor.rs        |  8 +-------
 src/error_handling.rs       | 15 +++++++++++----
 src/redraw_scheduler.rs     |  2 +-
 src/renderer/fps_tracker.rs | 28 ----------------------------
 8 files changed, 24 insertions(+), 49 deletions(-)
 delete mode 100644 src/renderer/fps_tracker.rs

diff --git a/Cargo.toml b/Cargo.toml
index 194525b..01800dd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,6 @@ skulpin = "0.5"
 derive-new = "0.5"
 env_logger = "0.7.1"
 rmpv = "0.4.2"
-msgbox = "0.4.0"
 rust-embed = { version = "5.2.0", features = ["debug-embed"] }
 image = "0.22.3"
 nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", branch = "futures", features = [ "use_tokio" ] }
@@ -23,6 +22,9 @@ async-trait = "0.1.18"
 lazy_static = "1.4.0"
 unicode-segmentation = "1.6.0"
 
+[target.'cfg(not(linux))'.dependencies]
+msgbox = { version = "0.4.0"}
+
 [build-dependencies]
 winres = "0.1.11"
 
diff --git a/src/bridge/events.rs b/src/bridge/events.rs
index 15fd229..757dad9 100644
--- a/src/bridge/events.rs
+++ b/src/bridge/events.rs
@@ -223,7 +223,7 @@ fn parse_mode_info_set(mode_info_set_arguments: Vec<Value>) -> Result<RedrawEven
         let mut cursor_modes = Vec::new();
         for mode_info_value in mode_info_values {
             let info_map = parse_map(&mode_info_value)?;
-            let mut mode_info = CursorMode::new();
+            let mut mode_info = CursorMode::default();
             for (name, value) in info_map {
                 let name = parse_string(&name)?;
                 match name.as_ref() {
diff --git a/src/bridge/handler.rs b/src/bridge/handler.rs
index 968c3de..22c770c 100644
--- a/src/bridge/handler.rs
+++ b/src/bridge/handler.rs
@@ -1,13 +1,11 @@
-use std::sync::{Arc, Mutex};
-
 use rmpv::Value;
 use nvim_rs::{Neovim, Handler, compat::tokio::Compat};
 use async_trait::async_trait;
 use tokio::process::ChildStdin;
-use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender};
+use tokio::sync::mpsc::{unbounded_channel, UnboundedSender};
 
 use crate::error_handling::ResultPanicExplanation;
-use crate::editor::{EDITOR, Editor};
+use crate::editor::EDITOR;
 use super::events::{RedrawEvent, parse_neovim_event};
 
 #[derive(Clone)]
@@ -32,7 +30,10 @@ impl NeovimHandler {
     }
 
     pub fn handle_redraw_event(&self, event: RedrawEvent) {
-        self.sender.send(event);
+        self.sender.send(event)
+            .unwrap_or_explained_panic(
+                "Could not process neovim event.", 
+                "The main thread for Neovide has closed the communication channel preventing a neovim event from being processed.");
     }
 }
 
diff --git a/src/bridge/mod.rs b/src/bridge/mod.rs
index eefc93b..34e8252 100644
--- a/src/bridge/mod.rs
+++ b/src/bridge/mod.rs
@@ -114,8 +114,7 @@ impl Bridge {
     }
 
     pub fn queue_command(&self, command: UiCommand) {
-        let mut sender = self.sender.clone();
-        sender.send(command)
+        self.sender.send(command)
             .unwrap_or_explained_panic(
                 "Could Not Send UI Command", 
                 "Could not send UI command from the window system to the neovim process.");
diff --git a/src/editor/cursor.rs b/src/editor/cursor.rs
index e6bf530..92a87be 100644
--- a/src/editor/cursor.rs
+++ b/src/editor/cursor.rs
@@ -21,19 +21,13 @@ impl CursorShape {
     }
 }
 
-#[derive(new, Debug, Clone, PartialEq)]
+#[derive(Default, Debug, Clone, PartialEq)]
 pub struct CursorMode {
-    #[new(default)]
     pub shape: Option<CursorShape>,
-    #[new(default)]
     pub style_id: Option<u64>,
-    #[new(default)]
     pub cell_percentage: Option<f32>,
-    #[new(default)]
     pub blinkwait: Option<u64>,
-    #[new(default)]
     pub blinkon: Option<u64>,
-    #[new(default)]
     pub blinkoff: Option<u64>,
 }
 
diff --git a/src/error_handling.rs b/src/error_handling.rs
index d5ee1a0..3fef0d5 100644
--- a/src/error_handling.rs
+++ b/src/error_handling.rs
@@ -1,5 +1,14 @@
 use msgbox::IconType;
 
+fn show_error(title: &str, explanation: &str) -> ! {
+    if cfg!(target_os = "linux") {
+        panic!("{}: {}", title, explanation);
+    } else {
+        msgbox::create(title, explanation, IconType::Error);
+        panic!(explanation.to_string());
+    }
+}
+
 pub trait ResultPanicExplanation<T, E: ToString> {
     fn unwrap_or_explained_panic(self, title: &str, explanation: &str) -> T;
 }
@@ -9,8 +18,7 @@ impl<T, E: ToString> ResultPanicExplanation<T, E> for Result<T, E> {
         match self {
             Err(error) => {
                 let explanation = format!("{}: {}", explanation, error.to_string());
-                msgbox::create(title, &explanation, IconType::Error);
-                panic!(explanation);
+                show_error(title, &explanation);
             },
             Ok(content) => content
         }
@@ -25,8 +33,7 @@ impl<T> OptionPanicExplanation<T> for Option<T> {
     fn unwrap_or_explained_panic(self, title: &str, explanation: &str) -> T {
         match self {
             None => {
-                msgbox::create(title, &explanation, IconType::Error);
-                panic!(explanation.to_string());
+                show_error(title, explanation);
             },
             Some(content) => content
         }
diff --git a/src/redraw_scheduler.rs b/src/redraw_scheduler.rs
index eff5e36..5a24d8e 100644
--- a/src/redraw_scheduler.rs
+++ b/src/redraw_scheduler.rs
@@ -46,7 +46,7 @@ pub fn redraw_loop() {
                 }
             }
 
-            if let Some(time_to_sleep) = Duration::from_secs_f32(1.0 / 60.0).checked_sub(Instant::now() - frame_start) {
+            if let Some(time_to_sleep) = Duration::from_secs_f32(1.0 / 60.0).checked_sub(frame_start.elapsed()) {
                 thread::sleep(time_to_sleep)
             }
         }
diff --git a/src/renderer/fps_tracker.rs b/src/renderer/fps_tracker.rs
deleted file mode 100644
index 48f624e..0000000
--- a/src/renderer/fps_tracker.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use std::time::Instant;
-
-pub struct FpsTracker {
-    last_record_time: Instant,
-    frame_count: usize,
-    pub fps: usize
-}
-
-impl FpsTracker {
-    pub fn new() -> FpsTracker {
-        FpsTracker {
-            fps: 0,
-            last_record_time: Instant::now(),
-            frame_count: 0
-        }
-    }
-
-    pub fn record_frame(&mut self) {
-        self.frame_count = self.frame_count + 1;
-        let now = Instant::now();
-        let time_since = (now - self.last_record_time).as_secs_f32();
-        if time_since > 1.0 {
-            self.fps = self.frame_count;
-            self.last_record_time = now;
-            self.frame_count = 0;
-        }
-    }
-}