Reimplement graphics using winit and tiny-skia

Author: fenhl

Cargo.lock

@@ -1,76 +1,43 @@
-[profile.release]
-lto = true
-strip = true
-
 [package]
 name = "sil"
 version = "2.0.0"
 authors = ["Fenhl <fenhl@fenhl.net>"]
 edition = "2021"
 
+[profile.release]
+lto = true
+strip = true
+
 [build-dependencies]
 git2 = "0.15"
 thiserror = "1"
 
 [dependencies]
-async-trait = "0.1"
+async-proto = { version = "0.15", features = ["tokio-tungstenite"] }
+chrono = { version = "0.4", features = ["serde"] }
+chrono-tz = { version = "0.6", features = ["serde"] }
+clap = { version = "4", features = ["derive"] }
 enum-iterator = "1"
+fontdue = "0.9"
 futures = "0.3"
-image = "0.23" # transitive ggez dependency
+gefolge-websocket = { git = "https://github.com/dasgefolge/gefolge-websocket", branch = "main" }
+if_chain = "1"
 itertools = "0.10"
-serde_json = "1"
+png = "0.17"
+rand = { version = "0.8", default-features = false, features = ["small_rng"] }
+raw-window-handle = "0.6.0"
+reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "json"] }
+serde = { version = "1", features = ["derive"] }
+serde_json = { package = "serde_json_path_to_error", version = "0.1" }
+softbuffer = "0.4"
+text = { git = "https://github.com/fenhl/text", branch = "main" }
 thiserror = "1"
+tiny-skia = "0.11"
+tokio = { version = "1", features = ["fs", "macros", "process", "rt-multi-thread", "sync", "time"] }
+tokio-tungstenite = { version = "0.17", features = ["rustls-tls-webpki-roots"] }
+wheel = { git = "https://github.com/fenhl/wheel", branch = "main", features = ["chrono"] }
+winit = "0.30"
 xdg-basedir = "1"
 
-[dependencies.async-proto]
-version = "0.15"
-features = ["tokio-tungstenite"]
-
-[dependencies.chrono]
-version = "0.4"
-features = ["serde"]
-
-[dependencies.chrono-tz]
-version = "0.6"
-features = ["serde"]
-
-[dependencies.clap]
-version = "3"
-features = ["derive"]
-
-[dependencies.gefolge-websocket]
-git = "https://github.com/dasgefolge/gefolge-websocket"
-branch = "main"
-
-[dependencies.ggez]
-version = "0.7"
-default-features = false
-
-[dependencies.rand]
-version = "0.8"
-default-features = false
-features = ["small_rng"]
-
-[dependencies.reqwest]
-version = "0.11"
-default-features = false
-features = ["rustls-tls", "json"]
-
-[dependencies.serde]
-version = "1"
-features = ["derive"]
-
-[dependencies.tokio]
-version = "1"
-features = ["fs", "macros", "process", "rt-multi-thread", "sync", "time"]
-
-[dependencies.tokio-tungstenite]
-version = "0.17"
-features = ["rustls-tls-webpki-roots"]
-
-[dependencies.wheel]
-git = "https://github.com/fenhl/wheel"
-branch = "main"
-
 [target.'cfg(windows)'.dependencies]
 directories = "4"

Cargo.toml

@@ -23,16 +23,20 @@ use {
     },
     gefolge_websocket::event::Event,
     rand::prelude::*,
+    tiny_skia::Pixmap,
     tokio::{
         fs::{
             self,
             File,
         },
         io::AsyncReadExt as _,
-        sync::mpsc,
         time::sleep,
     },
-    crate::Error,
+    winit::event_loop::EventLoopProxy,
+    crate::{
+        Error,
+        UserEvent,
+    },
 };
 
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Sequence)]
@@ -50,7 +54,7 @@ impl Mode {
             Self::BinaryTime => {
                 let timezone = current_event?.timezone;
                 let now = Utc::now().with_timezone(&timezone);
-                let tomorrow = now.date().succ();
+                let tomorrow = now.date_naive().succ_opt().expect("date overflow");
                 if tomorrow.month() == 1 && tomorrow.day() == 1 {
                     Some((Priority::Normal, State::BinaryTime(timezone)))
                 } else {
@@ -74,8 +78,8 @@ impl Mode {
                 if now.month() == 1 && now.day() == 1 && now.hour() == 1 {
                     Some(Priority::Programm)
                 } else {
-                    let tomorrow = now.date().succ();
-                    (tomorrow.month() == 1 && tomorrow.day() == 1).then(|| if tomorrow.and_hms(0, 0, 0) - now < Duration::hours(1).into() {
+                    let tomorrow = now.date_naive().succ_opt().expect("date overflow");
+                    (tomorrow.month() == 1 && tomorrow.day() == 1).then(|| if timezone.from_local_datetime(&tomorrow.and_hms_opt(0, 0, 0).expect("tomorrow has no midnight")).single().expect("failed to determine tomorrow at midnight") - now < Duration::hours(1).into() {
                         Priority::Programm
                     } else {
                         Priority::Normal
@@ -93,6 +97,7 @@ enum Priority {
     Programm,
 }
 
+#[allow(unused)] //TODO
 #[derive(Debug, Clone)]
 pub(crate) enum State {
     BinaryTime(Tz),
@@ -101,61 +106,44 @@ pub(crate) enum State {
     HexagesimalTime(Tz),
     Logo {
         msg: &'static str,
-        img: Option<Vec<u8>>,
     },
     NewYear(Tz),
 }
 
-impl State {
-    fn set(&mut self, new_state: &State) {
-        if let (State::Logo { img: Some(img), .. }, State::Logo { img: None, msg }) = (&self, new_state) {
-            *self = State::Logo { img: Some(img.clone()), msg: *msg };
-        } else {
-            *self = new_state.clone();
-        }
+async fn load_images_inner(state_tx: EventLoopProxy<UserEvent>) -> Result<(), Error> {
+    let dirs = stream::iter(xdg_basedir::get_cache_home().into_iter());
+    let files = dirs.filter_map(|cfg_dir| async move { File::open(cfg_dir.join("fidera/gefolge.png")).await.ok() });
+    pin_mut!(files);
+    if let Some(mut file) = files.next().await {
+        let mut buf = Vec::default();
+        file.read_to_end(&mut buf).await?;
+        tokio::task::block_in_place(|| Ok::<_, Error>(state_tx.send_event(UserEvent::Logo(Pixmap::decode_png(&buf)?))?))?;
+    } else {
+        let cache_dir = xdg_basedir::get_cache_home()?.join("fidera");
+        fs::create_dir_all(&cache_dir).await?;
+        let buf = reqwest::get("https://gefolge.org/static/gefolge.png").await?
+            .error_for_status()?
+            .bytes().await?
+            .to_vec();
+        fs::write(cache_dir.join("gefolge.png"), &buf).await?;
+        tokio::task::block_in_place(|| Ok::<_, Error>(state_tx.send_event(UserEvent::Logo(Pixmap::decode_png(&buf)?))?))?;
     }
+    Ok(())
+}
 
-    fn set_message(&mut self, new_msg: &'static str) {
-        match self {
-            State::Logo { msg, .. } => *msg = new_msg,
-            _ => *self = State::Logo { msg: new_msg, img: None },
-        }
+pub(crate) async fn load_images(state_tx: EventLoopProxy<UserEvent>) {
+    if let Err(e) = load_images_inner(state_tx).await {
+        eprintln!("error loading images: {e} (debug: {e:?})"); //TODO send error to event loop?
     }
 }
 
-async fn maintain_inner(mut rng: impl Rng, current_event: Option<Event>, states_tx: mpsc::Sender<State>) -> Result<Never, Error> {
-    let mut state = State::Logo {
-        msg: "loading Gefolge logo",
-        img: None,
-    };
-    states_tx.send(state.clone()).await?;
-    if let State::Logo { ref mut img, .. } = state {
-        let dirs = stream::iter(xdg_basedir::get_cache_home().into_iter());
-        let files = dirs.filter_map(|cfg_dir| async move { File::open(cfg_dir.join("fidera/gefolge.png")).await.ok() });
-        pin_mut!(files);
-        if let Some(mut file) = files.next().await {
-            let mut buf = Vec::default();
-            file.read_to_end(&mut buf).await?;
-            *img = Some(buf);
-        } else {
-            let cache_dir = xdg_basedir::get_cache_home()?.join("fidera");
-            fs::create_dir_all(&cache_dir).await?;
-            let buf = reqwest::get("https://gefolge.org/static/gefolge.png").await?
-                .error_for_status()?
-                .bytes().await?
-                .to_vec();
-            fs::write(cache_dir.join("gefolge.png"), &buf).await?;
-            *img = Some(buf);
-        }
-        states_tx.send(state.clone()).await?;
-    }
+async fn maintain_inner(mut rng: impl Rng + Send, current_event: Option<Event>, states_tx: EventLoopProxy<UserEvent>) -> Result<Never, Error> {
+    tokio::task::block_in_place(|| states_tx.send_event(UserEvent::State(State::Logo { msg: "loading Gefolge logo" })))?;
     if rng.gen_bool(0.1) {
-        state.set_message("reticulating splines");
-        states_tx.send(state.clone()).await?;
+        tokio::task::block_in_place(|| states_tx.send_event(UserEvent::State(State::Logo { msg: "reticulating splines" })))?;
         sleep(StdDuration::from_secs_f64(rng.gen_range(0.5..1.5))).await;
     }
-    state.set_message("determining first mode");
-    states_tx.send(state.clone()).await?;
+    tokio::task::block_in_place(|| states_tx.send_event(UserEvent::State(State::Logo { msg: "determining first mode" })))?;
     let mut seen_modes = HashSet::new();
     loop { //TODO keep listening to WebSocket
         let mut available_modes = all::<Mode>().filter_map(|mode| Some((mode, mode.state(current_event.as_ref())?))).collect::<Vec<_>>();
@@ -168,18 +156,17 @@ async fn maintain_inner(mut rng: impl Rng, current_event: Option<Event>, states_
         }
         if let Some((mode, (_, new_state))) = available_modes.choose(&mut rng) {
             seen_modes.insert(*mode);
-            state.set(new_state); //TODO reload image if necessary
+            tokio::task::block_in_place(|| states_tx.send_event(UserEvent::State(new_state.clone())))?;
         } else {
-            state.set_message("no modes available");
+            tokio::task::block_in_place(|| states_tx.send_event(UserEvent::State(State::Logo { msg: "no modes available" })))?;
         };
-        states_tx.send(state.clone()).await?;
         sleep(StdDuration::from_secs(10)).await;
     }
 }
 
-pub(crate) async fn maintain(rng: impl Rng, current_event: Option<Event>, states_tx: mpsc::Sender<State>) {
+pub(crate) async fn maintain(rng: impl Rng + Send, current_event: Option<Event>, states_tx: EventLoopProxy<UserEvent>) {
     match maintain_inner(rng, current_event, states_tx.clone()).await {
         Ok(never) => match never {},
-        Err(e) => { let _ = states_tx.send(State::Error(Arc::new(e))).await; }
+        Err(e) => { let _ = tokio::task::block_in_place(|| states_tx.send_event(UserEvent::State(State::Error(Arc::new(e))))); }
     }
 }