fix: crash on macOS

Cargo.toml

@@ -13,21 +13,22 @@ members = ["neovide-derive"]
 [features]
 default = []
 embed-fonts = []
+profiling = ["dep:tracy-client-sys"]
+gpu_profiling = ["profiling"]
 
 [dependencies]
-copypasta = "0.8.1"
 async-trait = "0.1.53"
 backtrace = "0.3.67"
 cfg-if = "1.0.0"
 clap = { version = "4.0.8", features = ["cargo", "derive", "env"] }
+copypasta = "0.8.1"
 csscolorparser = "0.6.2"
 derive-new = "0.5.9"
 dirs = "4.0.0"
 euclid = "0.22.7"
 flexi_logger = { version = "0.22.3", default-features = false }
 futures = "0.3.21"
 gl = "0.14.0"
-glutin = { git = "https://github.com/neovide/glutin", branch = "new-keyboard-all", features = ["serde"] }
 image = { version = "0.24.1", default-features = false, features = ["ico"] }
 itertools = "0.10.5"
 lazy_static = "1.4.0"
@@ -41,42 +42,53 @@ rand = "0.8.5"
 rmpv = "1.0.0"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.79"
+simple_moving_average = "0.1.2"
 swash = "0.1.4"
 time = "0.3.9"
 tokio = { version = "1.25.0", features = ["full"] }
 tokio-util = { version = "0.7.4", features = ["compat"] }
+tracy-client-sys = { version = "0.19.0", optional = true }
 unicode-segmentation = "1.9.0"
 which = "4.2.5"
-winit = { git = "https://github.com/neovide/winit", branch = "new-keyboard-all" }
+winit = { git = "https://github.com/neovide/winit", branch = "new-keyboard-v3", features = ["serde"]}
 xdg = "2.4.1"
+wgpu = "0.14.2"
+skia-safe = "0.60.0"
+pollster = "0.3.0"
+bytemuck = { version = "1.12", features = [ "derive" ] }
+wr_glyph_rasterizer = { git = "https://github.com/servo/webrender", version = "0.1.0", ref="6e043ad24b6305e34960511dade7f526e48fff99"}
+webrender_api = { git = "https://github.com/servo/webrender", version = "0.62.0", ref="6e043ad24b6305e34960511dade7f526e48fff99" }
+rayon = "1.7.0"
+num_cpus = "1.15.0"
+enum-map = "2.5.0"
+hotwatch = "0.4.6"
 
 [dev-dependencies]
 mockall = "0.11.0"
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.9", features = ["winuser"] }
 
-[target.'cfg(windows)'.build-dependencies]
-winres = "0.1.12"
-
-[target.'cfg(linux)'.dependencies.skia-safe]
-features = ["gl", "egl"]
-version = "0.52.0"
-
-[target.'cfg(not(linux))'.dependencies.skia-safe]
-features = ["gl"]
-version = "0.52.0"
-
 [target.'cfg(target_os = "macos")'.dependencies]
 cocoa = "0.24.0"
 objc = "0.2.7"
 shlex = "1.1.0"
 
+[target.'cfg(not(windows))'.dependencies]
+
+[target.'cfg(windows)'.build-dependencies]
+winres = "0.1.12"
+
 [profile.release]
 lto = true
 incremental = true
 strip = true
 
+[profile.profiling]
+inherits = "release"
+strip = false
+debug = true
+
 [package.metadata.bundle]
 name = "Neovide"
 identifier = "com.neovide.neovide"

src/bridge/events.rs

@@ -4,9 +4,9 @@ use std::{
     fmt::{self, Debug},
 };
 
+use csscolorparser::Color;
 use log::debug;
 use rmpv::Value;
-use skia_safe::Color4f;
 
 use crate::editor::{Colors, CursorMode, CursorShape, Style, UnderlineStyle};
 
@@ -276,17 +276,12 @@ pub enum RedrawEvent {
     },
 }
 
-fn unpack_color(packed_color: u64) -> Color4f {
+fn unpack_color(packed_color: u64) -> Color {
     let packed_color = packed_color as u32;
-    let r = ((packed_color & 0x00ff_0000) >> 16) as f32;
-    let g = ((packed_color & 0xff00) >> 8) as f32;
-    let b = (packed_color & 0xff) as f32;
-    Color4f {
-        r: r / 255.0,
-        g: g / 255.0,
-        b: b / 255.0,
-        a: 1.0,
-    }
+    let r = ((packed_color & 0x00ff_0000) >> 16) as u8;
+    let g = ((packed_color & 0xff00) >> 8) as u8;
+    let b = (packed_color & 0xff) as u8;
+    Color::from_rgba8(r, g, b, 255)
 }
 
 fn extract_values<const REQ: usize>(values: Vec<Value>) -> Result<[Value; REQ]> {

src/dimensions.rs

@@ -4,11 +4,13 @@ use std::{
     str::FromStr,
 };
 
-use glutin::dpi::PhysicalSize;
 use serde::{Deserialize, Serialize};
+use winit::dpi::PhysicalSize;
 
 use crate::settings;
 
+use euclid::default::Size2D;
+
 // Maybe this should be independent from serialization?
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
 pub struct Dimensions {
@@ -83,6 +85,22 @@ impl From<Dimensions> for PhysicalSize<u32> {
     }
 }
 
+macro_rules! impl_from_dimensions_to_size2d {
+    ($type:ty) => {
+        impl From<Dimensions> for Size2D<$type> {
+            fn from(dimensions: Dimensions) -> Size2D<$type> {
+                Size2D::new(dimensions.width as $type, dimensions.height as $type)
+            }
+        }
+    };
+}
+
+impl_from_dimensions_to_size2d!(u64);
+impl_from_dimensions_to_size2d!(u32);
+impl_from_dimensions_to_size2d!(i32);
+impl_from_dimensions_to_size2d!(f32);
+impl_from_dimensions_to_size2d!(f64);
+
 impl Mul for Dimensions {
     type Output = Self;
 

src/editor/cursor.rs

@@ -1,6 +1,6 @@
 use std::{collections::HashMap, sync::Arc};
 
-use skia_safe::Color4f;
+use csscolorparser::Color;
 
 use crate::editor::style::{Colors, Style};
 
@@ -66,18 +66,18 @@ impl Cursor {
         }
     }
 
-    pub fn foreground(&self, default_colors: &Colors) -> Color4f {
+    pub fn foreground(&self, default_colors: &Colors) -> Color {
         self.style
             .as_ref()
-            .and_then(|s| s.colors.foreground)
-            .unwrap_or_else(|| default_colors.background.unwrap())
+            .and_then(|s| s.colors.foreground.clone())
+            .unwrap_or_else(|| default_colors.background.clone().unwrap())
     }
 
-    pub fn background(&self, default_colors: &Colors) -> Color4f {
+    pub fn background(&self, default_colors: &Colors) -> Color {
         self.style
             .as_ref()
-            .and_then(|s| s.colors.background)
-            .unwrap_or_else(|| default_colors.foreground.unwrap())
+            .and_then(|s| s.colors.background.clone())
+            .unwrap_or_else(|| default_colors.foreground.clone().unwrap())
     }
 
     pub fn alpha(&self) -> u8 {
@@ -118,15 +118,15 @@ mod tests {
     use super::*;
 
     const COLORS: Colors = Colors {
-        foreground: Some(Color4f::new(0.1, 0.1, 0.1, 0.1)),
-        background: Some(Color4f::new(0.2, 0.1, 0.1, 0.1)),
-        special: Some(Color4f::new(0.3, 0.1, 0.1, 0.1)),
+        foreground: Some(Color::new(0.1, 0.1, 0.1, 0.1)),
+        background: Some(Color::new(0.2, 0.1, 0.1, 0.1)),
+        special: Some(Color::new(0.3, 0.1, 0.1, 0.1)),
     };
 
     const DEFAULT_COLORS: Colors = Colors {
-        foreground: Some(Color4f::new(0.1, 0.2, 0.1, 0.1)),
-        background: Some(Color4f::new(0.2, 0.2, 0.1, 0.1)),
-        special: Some(Color4f::new(0.3, 0.2, 0.1, 0.1)),
+        foreground: Some(Color::new(0.1, 0.2, 0.1, 0.1)),
+        background: Some(Color::new(0.2, 0.2, 0.1, 0.1)),
+        special: Some(Color::new(0.3, 0.2, 0.1, 0.1)),
     };
 
     const NONE_COLORS: Colors = Colors {