From 05d68ab3c13d2073818c19f6b8c8e720cd9d0208 Mon Sep 17 00:00:00 2001
From: Iris Pupo <pupoi@tutanota.com>
Date: Tue, 8 Nov 2022 17:40:50 -0500
Subject: [PATCH 01/77] enabled wasmtime built in caching

---
 src/backend/wasmtime.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/backend/wasmtime.rs b/src/backend/wasmtime.rs
index 6551565..7df636a 100644
--- a/src/backend/wasmtime.rs
+++ b/src/backend/wasmtime.rs
@@ -13,12 +13,14 @@ type Linker = wasmtime::Linker<ScriptAbiImpl>;
 pub struct WasmtimeBackend {
     engine: wasmtime::Engine,
 }
+
 impl WasmtimeBackend {
     pub fn new() -> anyhow::Result<Self> {
         let mut config = wasmtime::Config::new();
         config.wasm_simd(true);
         config.wasm_bulk_memory(true);
         config.cranelift_opt_level(wasmtime::OptLevel::Speed);
+        config.cache_config_load_default()?;
 
         let engine = wasmtime::Engine::new(&config)?;
 
@@ -26,7 +28,9 @@ impl WasmtimeBackend {
     }
 }
 
+
 impl Backend for WasmtimeBackend {
+
     fn load_module(&self, module: &[u8]) -> anyhow::Result<Arc<dyn Instance>> {
         let module = wasmtime::Module::new(&self.engine, module)?;
         let abi = ScriptAbiImpl::default();

From 14540db59c3ece3b88d182cac57ce48203150fa5 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Wed, 16 Nov 2022 21:08:17 -0700
Subject: [PATCH 02/77] Add panel_send_message and PanelAbi

---
 src/backend/mod.rs      | 31 ++++++++++++++++++++++++++++++-
 src/backend/wasmtime.rs | 17 +++++++++++++----
 src/lib.rs              | 16 +++++++++++-----
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index b815501..aa2c1d1 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -8,6 +8,8 @@
 //! implemented, but in the future, [wasm3](https://github.com/wasm3/wasm3)
 //! will also be provided.
 
+use std::collections::VecDeque;
+
 use super::*;
 
 pub mod wasmtime;
@@ -22,7 +24,7 @@ pub fn make_default_backend() -> anyhow::Result<Box<dyn Backend>> {
 
 /// A WebAssembly runtime backend.
 pub trait Backend {
-    fn load_module(&self, abi: ScriptAbi, module: &[u8]) -> anyhow::Result<Arc<dyn Instance>>;
+    fn load_module(&self, abi: Arc<ScriptAbi>, module: &[u8]) -> anyhow::Result<Arc<dyn Instance>>;
 }
 
 /// An instance of a WebAssembly module.
@@ -69,6 +71,7 @@ pub struct ScriptAbi {
     loaded_fonts: RwLock<Vec<Arc<text::Font>>>,
     text_layouts: RwLock<Slab<text::TextLayout>>,
     message_store: RwLock<Slab<Vec<u8>>>,
+    panels: RwLock<Slab<PanelAbi>>,
 }
 
 impl ScriptAbi {
@@ -79,6 +82,13 @@ impl ScriptAbi {
         }
     }
 
+    /// Allocates a new ID and host-side storage for a panel.
+    pub fn create_panel(&self) -> PanelId {
+        let abi = PanelAbi::default();
+        let id = self.panels.write().insert(abi);
+        PanelId(id)
+    }
+
     pub fn start_draw(&self) {
         let mut lock = self.draw_cmds.lock();
         lock.clear();
@@ -157,4 +167,23 @@ impl ScriptAbi {
         let src = store.get(id as usize).unwrap();
         dst.copy_from_slice(src);
     }
+
+    pub fn panel_send_message(&self, id: u32, message: Vec<u8>) {
+        if let Some(panel) = self.panels.read().get(id as usize) {
+            panel.outgoing_messages.write().push_back(message);
+        }
+    }
+
+    pub fn recv_panel_messages(&self, id: PanelId) -> Vec<Vec<u8>> {
+        if let Some(panel) = self.panels.read().get(id.0) {
+            panel.outgoing_messages.write().drain(..).collect()
+        } else {
+            Vec::new()
+        }
+    }
+}
+
+#[derive(Default)]
+pub struct PanelAbi {
+    outgoing_messages: RwLock<VecDeque<Vec<u8>>>,
 }
diff --git a/src/backend/wasmtime.rs b/src/backend/wasmtime.rs
index 1024aaa..73b3133 100644
--- a/src/backend/wasmtime.rs
+++ b/src/backend/wasmtime.rs
@@ -9,9 +9,9 @@ use crate::DrawCommand;
 use canary_script::{Color, CursorEventKind, Rect, Vec2};
 use parking_lot::Mutex;
 
-type Caller<'a> = wasmtime::Caller<'a, ScriptAbi>;
-type Store = wasmtime::Store<ScriptAbi>;
-type Linker = wasmtime::Linker<ScriptAbi>;
+type Caller<'a> = wasmtime::Caller<'a, Arc<ScriptAbi>>;
+type Store = wasmtime::Store<Arc<ScriptAbi>>;
+type Linker = wasmtime::Linker<Arc<ScriptAbi>>;
 
 pub struct WasmtimeBackend {
     engine: wasmtime::Engine,
@@ -30,7 +30,7 @@ impl WasmtimeBackend {
 }
 
 impl Backend for WasmtimeBackend {
-    fn load_module(&self, abi: ScriptAbi, module: &[u8]) -> anyhow::Result<Arc<dyn Instance>> {
+    fn load_module(&self, abi: Arc<ScriptAbi>, module: &[u8]) -> anyhow::Result<Arc<dyn Instance>> {
         let module = wasmtime::Module::new(&self.engine, module)?;
         let mut store = wasmtime::Store::new(&self.engine, abi);
         let mut linker = Linker::new(&self.engine);
@@ -147,6 +147,15 @@ impl WasmtimeInstance {
             },
         )?;
 
+        linker.func_wrap(
+            module,
+            "panel_send_message",
+            |mut caller: Caller<'_>, id: u32, ptr: u32, len: u32| {
+                let message = Self::get_memory_slice_bytes(&mut caller, ptr as usize, len as usize);
+                caller.data().panel_send_message(id, message.to_vec())
+            },
+        )?;
+
         Ok(())
     }
 
diff --git a/src/lib.rs b/src/lib.rs
index f356234..02cea3f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -29,11 +29,12 @@ impl Runtime {
 
     pub fn load_module(&self, module: &[u8]) -> anyhow::Result<Script> {
         let abi = ScriptAbi::new(self.font_store.to_owned());
-        let instance = self.backend.load_module(abi, module)?;
+        let abi = Arc::new(abi);
+        let instance = self.backend.load_module(abi.to_owned(), module)?;
 
         Ok(Script {
             instance,
-            next_panel: 0,
+            abi,
         })
     }
 }
@@ -41,16 +42,16 @@ impl Runtime {
 /// A loaded instance of a Canary script.
 pub struct Script {
     instance: Arc<dyn Instance>,
-    next_panel: usize,
+    abi: Arc<ScriptAbi>,
 }
 
 impl Script {
     pub fn create_panel(&mut self, protocol: &str, msg: Vec<u8>) -> anyhow::Result<Panel> {
-        let id = PanelId(self.next_panel);
-        self.next_panel += 1;
+        let id = self.abi.create_panel();
         let userdata = self.instance.bind_panel(id, protocol, msg);
         Ok(Panel {
             instance: self.instance.clone(),
+            abi: self.abi.clone(),
             id,
             userdata,
         })
@@ -60,6 +61,7 @@ impl Script {
 /// A Canary panel.
 pub struct Panel {
     instance: Arc<dyn Instance>,
+    abi: Arc<ScriptAbi>,
     id: PanelId,
     userdata: u32,
 }
@@ -84,6 +86,10 @@ impl Panel {
     pub fn on_message(&self, msg: Vec<u8>) {
         self.instance.on_message(self.userdata, msg);
     }
+
+    pub fn recv_messages(&self) -> Vec<Vec<u8>> {
+        self.abi.recv_panel_messages(self.id)
+    }
 }
 
 /// Proportion constant between pixels (at 96dpi) to millimeters (Canary's unit measurement).

From 0cc55b80a8243eaa24f42bea5acea0532f67a66e Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Wed, 16 Nov 2022 21:10:14 -0700
Subject: [PATCH 03/77] Add panel_send_message script API

---
 crates/script/src/api/mod.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crates/script/src/api/mod.rs b/crates/script/src/api/mod.rs
index 56484e1..0df721e 100644
--- a/crates/script/src/api/mod.rs
+++ b/crates/script/src/api/mod.rs
@@ -94,6 +94,10 @@ impl Panel {
 
         self.draw_indexed(&vertices, &indices);
     }
+
+    pub fn send_message(&self, message: &[u8]) {
+        unsafe { panel_send_message(self.0, message.as_ptr() as u32, message.len() as u32) }
+    }
 }
 
 #[repr(transparent)]
@@ -443,4 +447,6 @@ extern "C" {
 
     fn message_get_len(id: u32) -> u32;
     fn message_get_data(id: u32, ptr: u32);
+
+    fn panel_send_message(id: u32, message_ptr: u32, message_len: u32);
 }

From 32cf5e33590319751d63b83f9a7b70b67cf9f5e1 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Wed, 16 Nov 2022 21:11:34 -0700
Subject: [PATCH 04/77] SAO UI music player sends Prev/Play/Next events on
 button presses

---
 scripts/sao-ui/src/music_player.rs | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/scripts/sao-ui/src/music_player.rs b/scripts/sao-ui/src/music_player.rs
index 9eab50e..82222c3 100644
--- a/scripts/sao-ui/src/music_player.rs
+++ b/scripts/sao-ui/src/music_player.rs
@@ -1,7 +1,7 @@
 use api::*;
 use canary_script::*;
 
-use canary_music_player::{AlbumInfo, PlaybackStatus, ProgressChanged, TrackInfo};
+use canary_music_player::{AlbumInfo, PlaybackStatus, ProgressChanged, TrackInfo, OutMsg};
 
 use crate::widgets::prelude::*;
 use button::{RoundButton, RoundButtonStyle};
@@ -57,7 +57,7 @@ impl PanelImpl for MusicPlayerPanel {
         use InMsg::*;
         match (self.widget.as_mut(), msg) {
             (Some(_), Disconnected) => self.widget = None,
-            (None, Connected) => self.widget = Some(MusicPlayerWidget::new()),
+            (None, Connected) => self.widget = Some(MusicPlayerWidget::new(self.panel)),
             (Some(widget), AlbumChanged(info)) => widget.update_album(info),
             (Some(widget), TrackChanged(info)) => widget.update_track(info),
             (Some(widget), PlaybackStatusChanged(status)) => widget.update_playback_status(status),
@@ -106,6 +106,7 @@ impl Default for MusicPlayerStyle {
 }
 
 pub struct MusicPlayerWidget {
+    panel: Panel,
     artist: Offset<Label>,
     album: Offset<Label>,
     track: Offset<Label>,
@@ -146,6 +147,18 @@ impl Container for MusicPlayerWidget {
             self.position
                 .set_text(&Self::format_time(self.position_secs));
         }
+
+        if self.previous.was_clicked() {
+            self.send_message(&OutMsg::Previous);
+        }
+
+        if self.play.was_clicked() {
+            self.send_message(&OutMsg::PlayPause);
+        }
+
+        if self.next.was_clicked() {
+            self.send_message(&OutMsg::Next);
+        }
     }
 
     fn draw(&mut self, ctx: &DrawContext) {
@@ -168,7 +181,7 @@ impl Container for MusicPlayerWidget {
 }
 
 impl MusicPlayerWidget {
-    pub fn new() -> Self {
+    pub fn new(panel: Panel) -> Self {
         let style = MusicPlayerStyle::default();
         let display_font = Font::new(crate::DISPLAY_FONT);
         let content_font = Font::new(crate::CONTENT_FONT);
@@ -244,6 +257,7 @@ impl MusicPlayerWidget {
         let next = RoundButton::new(secondary_button, Some(next_text));
 
         Self {
+            panel,
             artist: make_body_label("Artist"),
             album: make_body_label("Album"),
             track: make_body_label("Track"),
@@ -262,6 +276,11 @@ impl MusicPlayerWidget {
         }
     }
 
+    pub fn send_message(&self, msg: &OutMsg) {
+        let msg = serde_json::to_vec(msg).unwrap();
+        self.panel.send_message(&msg);
+    }
+
     pub fn format_time(secs: f32) -> String {
         let duration = secs.floor() as usize;
         let seconds = duration % 60;

From 7d751f27c94ac5c0bb62119d4ac46a84872e69b2 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Wed, 16 Nov 2022 22:02:03 -0700
Subject: [PATCH 05/77] Add RecvMessage to Magpie protocol

---
 apps/magpie/src/protocol.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/magpie/src/protocol.rs b/apps/magpie/src/protocol.rs
index 6d83b6f..7bc145f 100644
--- a/apps/magpie/src/protocol.rs
+++ b/apps/magpie/src/protocol.rs
@@ -43,10 +43,19 @@ pub enum MagpieServerMsg {
     SendMessage(SendMessage),
 }
 
+/// A message sent from a script's panel to a client.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct RecvMessage {
+    pub id: PanelId,
+    pub msg: Vec<u8>,
+}
+
 /// A message sent from the Magpie server to a client.
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(tag = "kind")]
-pub enum MagpieClientMsg {}
+pub enum MagpieClientMsg {
+    RecvMessage(RecvMessage),
+}
 
 /// A [Messenger] specialized for Magpie clients.
 pub type ClientMessenger<T> = Messenger<T, MagpieClientMsg, MagpieServerMsg>;

From 808d62421cd35ae4cbab3583c02d5b7c8df1371a Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Wed, 16 Nov 2022 22:17:17 -0700
Subject: [PATCH 06/77] Implement window-to-IPC messaging

---
 apps/magpie/src/service/ipc.rs | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/apps/magpie/src/service/ipc.rs b/apps/magpie/src/service/ipc.rs
index 869e297..2fbbda2 100644
--- a/apps/magpie/src/service/ipc.rs
+++ b/apps/magpie/src/service/ipc.rs
@@ -14,18 +14,29 @@ use mio_signals::{Signal, Signals};
 use parking_lot::RwLock;
 use slab::Slab;
 
-use crate::protocol::{CreatePanel, MagpieServerMsg, SendMessage, ServerMessenger};
+use crate::protocol::*;
 use crate::service::window::{WindowMessage, WindowMessageSender};
 
 const SOCK_NAME: &str = "magpie.sock";
 
-pub enum IpcMessage {}
+#[derive(Debug)]
+pub enum IpcMessage {
+    PanelMessage { window: usize, message: Vec<u8> },
+}
 
+#[derive(Clone)]
 pub struct IpcMessageSender {
-    waker: Waker,
+    waker: Arc<Waker>,
     sender: Sender<IpcMessage>,
 }
 
+impl IpcMessageSender {
+    pub fn send(&self, msg: IpcMessage) {
+        let _ = self.sender.send(msg);
+        let _ = self.waker.wake();
+    }
+}
+
 /// Wraps [mio::net::UnixListener] with automatic file deletion on drop.
 pub struct Listener {
     pub uds: UnixListener,
@@ -57,6 +68,7 @@ impl DerefMut for Listener {
 
 pub struct IpcData {
     poll: Poll,
+    window_to_client_panel: HashMap<usize, (usize, PanelId)>,
     next_window_id: usize,
 }
 
@@ -173,12 +185,13 @@ impl Ipc {
         let (sender, message_recv) = channel();
 
         let sender = IpcMessageSender {
-            waker: Waker::new(registry, message_recv_token)?,
+            waker: Arc::new(Waker::new(registry, message_recv_token)?),
             sender,
         };
 
         let data = IpcData {
             poll,
+            window_to_client_panel: HashMap::new(),
             next_window_id: 0,
         };
 

From efae627263468390f22bc6b237895ac625f4ac69 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Wed, 16 Nov 2022 22:20:30 -0700
Subject: [PATCH 07/77] Forward script messages from window to IPC

---
 apps/magpie/src/service/window.rs | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/apps/magpie/src/service/window.rs b/apps/magpie/src/service/window.rs
index 3834224..01cea07 100644
--- a/apps/magpie/src/service/window.rs
+++ b/apps/magpie/src/service/window.rs
@@ -35,6 +35,8 @@ pub enum WindowMessage {
 pub type WindowMessageSender = EventLoopProxy<WindowMessage>;
 
 pub struct Window {
+    pub ipc_sender: IpcMessageSender,
+    pub ipc_id: usize,
     pub graphics: Graphics,
     pub panel: Panel,
     pub last_update: Instant,
@@ -44,6 +46,8 @@ pub struct Window {
 
 impl Window {
     pub fn new(
+        ipc_sender: IpcMessageSender,
+        ipc_id: usize,
         panel: Panel,
         event_loop: &EventLoopWindowTarget<WindowMessage>,
     ) -> Result<Self, DisplayCreationError> {
@@ -53,6 +57,8 @@ impl Window {
         let graphics = Graphics::new(display);
         let last_update = Instant::now();
         Ok(Self {
+            ipc_sender,
+            ipc_id,
             graphics,
             panel,
             last_update,
@@ -69,24 +75,38 @@ impl Window {
         self.graphics.display.gl_window().window().request_redraw();
     }
 
+    /// Receives all messages from the script and forwards them to IPC.
+    pub fn recv_messages(&mut self) {
+        for message in self.panel.recv_messages() {
+            self.ipc_sender.send(IpcMessage::PanelMessage {
+                window: self.ipc_id,
+                message,
+            });
+        }
+    }
+
     pub fn update(&mut self) {
         let now = Instant::now();
         let dt = now.duration_since(self.last_update).as_secs_f32();
         self.panel.update(dt);
         self.last_update = now;
+        self.recv_messages();
     }
 
     pub fn draw(&mut self) {
         let commands = self.panel.draw();
         self.graphics.draw(&commands);
+        self.recv_messages();
     }
 
     pub fn send_message(&mut self, msg: Vec<u8>) {
         self.panel.on_message(msg);
+        self.recv_messages();
     }
 
     pub fn resize(&mut self, new_size: Vec2) {
         self.panel.on_resize(new_size);
+        self.recv_messages();
     }
 
     pub fn on_event(&mut self, event: WindowEvent) {
@@ -107,6 +127,7 @@ impl Window {
                 };
 
                 self.panel.on_cursor_event(event, self.cursor_pos);
+                self.recv_messages();
             }
             WindowEvent::MouseInput {
                 state,
@@ -125,6 +146,7 @@ impl Window {
                 };
 
                 self.panel.on_cursor_event(event, self.cursor_pos);
+                self.recv_messages();
             }
             _ => {}
         }
@@ -164,12 +186,16 @@ impl WindowStore {
         message: WindowMessage,
     ) -> anyhow::Result<bool> {
         match message {
-            WindowMessage::OpenWindow { id, protocol, script } => {
+            WindowMessage::OpenWindow {
+                id,
+                protocol,
+                script,
+            } => {
                 println!("Opening window {} with script {:?}", id, script);
                 let module = std::fs::read(script)?;
                 let mut script = self.runtime.load_module(&module)?;
                 let panel = script.create_panel(&protocol, vec![])?;
-                let window = Window::new(panel, &event_loop)?;
+                let window = Window::new(self.ipc_sender.to_owned(), id, panel, &event_loop)?;
                 let window_id = window.get_id();
                 self.windows.insert(window_id, window);
                 self.ipc_to_window.insert(id, window_id);

From cf95b52f7e8d46702c75fc41e942de71414a68ca Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Wed, 16 Nov 2022 22:29:02 -0700
Subject: [PATCH 08/77] Print error instead of panicking on unrecognized IPC
 even ttoken

---
 apps/magpie/src/service/ipc.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/magpie/src/service/ipc.rs b/apps/magpie/src/service/ipc.rs
index 2fbbda2..257a70c 100644
--- a/apps/magpie/src/service/ipc.rs
+++ b/apps/magpie/src/service/ipc.rs
@@ -257,7 +257,7 @@ impl Ipc {
                     self.clients.remove(event.token().0);
                 }
             } else {
-                panic!("Unrecognized event token: {:?}", event);
+                eprintln!("Unrecognized event token: {:?}", event);
             }
         }
 

From e1ebfab2471d9a9904e19dffc23613cba36adfb8 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Wed, 16 Nov 2022 22:52:02 -0700
Subject: [PATCH 09/77] Close Messenger connection on reset

---
 apps/magpie/src/protocol.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/magpie/src/protocol.rs b/apps/magpie/src/protocol.rs
index 7bc145f..84f3e5b 100644
--- a/apps/magpie/src/protocol.rs
+++ b/apps/magpie/src/protocol.rs
@@ -109,6 +109,10 @@ impl<T: Read + Write, I: DeserializeOwned, O: Serialize> Messenger<T, I, O> {
                     self.closed = true;
                     break;
                 }
+                Err(ref err) if err.kind() == std::io::ErrorKind::ConnectionReset => {
+                    self.closed = true;
+                    break;
+                }
                 Ok(n) => {
                     self.received_buf.write(&buf[..n])?;
                 }

From f81f55485bb54a86d90fe69c89d771806881af6c Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Wed, 16 Nov 2022 23:04:42 -0700
Subject: [PATCH 10/77] Forward script messages from IPC to client

---
 apps/magpie/src/service/ipc.rs | 49 +++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/apps/magpie/src/service/ipc.rs b/apps/magpie/src/service/ipc.rs
index 257a70c..e8b5cea 100644
--- a/apps/magpie/src/service/ipc.rs
+++ b/apps/magpie/src/service/ipc.rs
@@ -91,7 +91,8 @@ pub struct Client {
 impl Drop for Client {
     fn drop(&mut self) {
         println!("Client #{} disconnected", self.token.0);
-        let data = self.data.write();
+
+        let mut data = self.data.write();
         let _ = data
             .poll
             .registry()
@@ -100,13 +101,16 @@ impl Drop for Client {
         for (_id, window) in self.id_to_window.drain() {
             let msg = WindowMessage::CloseWindow { id: window };
             let _ = self.window_sender.send_event(msg);
+            data.window_to_client_panel.remove(&window);
         }
     }
 }
 
 impl Client {
     pub fn on_readable(&mut self) -> std::io::Result<bool> {
-        self.messenger.flush_recv()?;
+        if let Err(err) = self.messenger.flush_recv() {
+            eprintln!("flush_recv() error: {:?}", err);
+        }
 
         while let Some(msg) = self.messenger.recv() {
             println!("Client #{}: {:?}", self.token.0, msg);
@@ -116,7 +120,11 @@ impl Client {
                     protocol,
                     script,
                 }) => {
-                    let window = self.data.write().new_window_id();
+                    let mut data = self.data.write();
+
+                    let window = data.new_window_id();
+                    data.window_to_client_panel
+                        .insert(window, (self.token.0, id));
 
                     if let Some(old_id) = self.id_to_window.insert(id, window) {
                         let msg = WindowMessage::CloseWindow { id: old_id };
@@ -147,7 +155,6 @@ pub struct Ipc {
     pub data: Arc<RwLock<IpcData>>,
     pub window_sender: WindowMessageSender,
     pub message_recv: Receiver<IpcMessage>,
-    pub events: Events,
     pub quit: bool,
     pub listener: Listener,
     pub signals: Signals,
@@ -171,7 +178,6 @@ impl Ipc {
 
         let mut signals = Signals::new(Signal::Interrupt | Signal::Quit)?;
 
-        let events = Events::with_capacity(128);
         let poll = Poll::new()?;
         let listener_token = Token(usize::MAX);
         let signals_token = Token(listener_token.0 - 1);
@@ -199,7 +205,6 @@ impl Ipc {
             data: Arc::new(RwLock::new(data)),
             window_sender,
             message_recv,
-            events,
             quit: false,
             listener,
             signals,
@@ -212,10 +217,29 @@ impl Ipc {
         Ok((ipc, sender))
     }
 
-    pub fn poll(&mut self, timeout: Option<Duration>) -> std::io::Result<()> {
-        self.data.write().poll.poll(&mut self.events, timeout)?;
+    pub fn on_message(&mut self, msg: IpcMessage) -> std::io::Result<()> {
+        match msg {
+            IpcMessage::PanelMessage { window, message } => {
+                let data = self.data.read();
+                let (client, panel) = *data.window_to_client_panel.get(&window).unwrap();
+                let client = self.clients.get_mut(client).unwrap();
+                let reply = RecvMessage {
+                    id: panel,
+                    msg: message,
+                };
+                client
+                    .messenger
+                    .send(&MagpieClientMsg::RecvMessage(reply))?;
+            }
+        }
 
-        for event in self.events.iter() {
+        Ok(())
+    }
+
+    pub fn poll(&mut self, events: &mut Events, timeout: Option<Duration>) -> std::io::Result<()> {
+        self.data.write().poll.poll(events, timeout)?;
+
+        for event in events.iter() {
             if event.token() == self.listener_token {
                 loop {
                     match self.listener.accept() {
@@ -251,6 +275,10 @@ impl Ipc {
                     let _ = self.window_sender.send_event(WindowMessage::Quit);
                     self.quit = true;
                 }
+            } else if event.token() == self.message_recv_token {
+                while let Ok(received) = self.message_recv.try_recv() {
+                    self.on_message(received)?;
+                }
             } else if let Some(client) = self.clients.get_mut(event.token().0) {
                 let disconnected = client.on_readable()?;
                 if disconnected {
@@ -265,9 +293,10 @@ impl Ipc {
     }
 
     pub fn run(mut self) {
+        let mut events = Events::with_capacity(128);
         while !self.quit {
             let wait = Duration::from_millis(100);
-            match self.poll(Some(wait)) {
+            match self.poll(&mut events, Some(wait)) {
                 Ok(_) => {}
                 Err(e) => {
                     eprintln!("IPC poll error: {:?}", e);

From d020caa477fd63aa900566d52890e4f549415f8b Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Thu, 17 Nov 2022 14:46:48 -0700
Subject: [PATCH 11/77] Make Messenger transport private

---
 apps/magpie/src/protocol.rs    |  7 ++++++-
 apps/magpie/src/service/ipc.rs | 34 +++++++++++++++-------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/apps/magpie/src/protocol.rs b/apps/magpie/src/protocol.rs
index 84f3e5b..4aed53c 100644
--- a/apps/magpie/src/protocol.rs
+++ b/apps/magpie/src/protocol.rs
@@ -65,7 +65,7 @@ pub type ServerMessenger<T> = Messenger<T, MagpieServerMsg, MagpieClientMsg>;
 
 /// Bidirectional, transport-agnostic Magpie IO wrapper struct.
 pub struct Messenger<T, I, O> {
-    pub transport: T,
+    transport: T,
     expected_len: Option<usize>,
     received_buf: VecDeque<u8>,
     received_queue: VecDeque<I>,
@@ -156,4 +156,9 @@ impl<T: Read + Write, I: DeserializeOwned, O: Serialize> Messenger<T, I, O> {
     pub fn recv(&mut self) -> Option<I> {
         self.received_queue.pop_back()
     }
+
+    /// Destroys this messenger and returns the inner transport.
+    pub fn into_transport(self) -> T {
+        self.transport
+    }
 }
diff --git a/apps/magpie/src/service/ipc.rs b/apps/magpie/src/service/ipc.rs
index e8b5cea..a59bd3c 100644
--- a/apps/magpie/src/service/ipc.rs
+++ b/apps/magpie/src/service/ipc.rs
@@ -88,24 +88,6 @@ pub struct Client {
     id_to_window: HashMap<u32, usize>,
 }
 
-impl Drop for Client {
-    fn drop(&mut self) {
-        println!("Client #{} disconnected", self.token.0);
-
-        let mut data = self.data.write();
-        let _ = data
-            .poll
-            .registry()
-            .deregister(&mut self.messenger.transport);
-
-        for (_id, window) in self.id_to_window.drain() {
-            let msg = WindowMessage::CloseWindow { id: window };
-            let _ = self.window_sender.send_event(msg);
-            data.window_to_client_panel.remove(&window);
-        }
-    }
-}
-
 impl Client {
     pub fn on_readable(&mut self) -> std::io::Result<bool> {
         if let Err(err) = self.messenger.flush_recv() {
@@ -149,6 +131,20 @@ impl Client {
 
         Ok(self.messenger.is_closed())
     }
+
+    pub fn disconnect(mut self) {
+        println!("Client #{} disconnected", self.token.0);
+
+        let mut transport = self.messenger.into_transport();
+        let mut data = self.data.write();
+        let _ = data.poll.registry().deregister(&mut transport);
+
+        for (_id, window) in self.id_to_window.drain() {
+            let msg = WindowMessage::CloseWindow { id: window };
+            let _ = self.window_sender.send_event(msg);
+            data.window_to_client_panel.remove(&window);
+        }
+    }
 }
 
 pub struct Ipc {
@@ -282,7 +278,7 @@ impl Ipc {
             } else if let Some(client) = self.clients.get_mut(event.token().0) {
                 let disconnected = client.on_readable()?;
                 if disconnected {
-                    self.clients.remove(event.token().0);
+                    self.clients.remove(event.token().0).disconnect();
                 }
             } else {
                 eprintln!("Unrecognized event token: {:?}", event);

From a809af7c64acb578fff35863c7b0602b93e03038 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Thu, 17 Nov 2022 15:03:12 -0700
Subject: [PATCH 12/77] Replace dedicated MagpieClient with methods on
 ClientMessenger

---
 apps/magpie/src/client.rs     | 44 -----------------------------------
 apps/magpie/src/lib.rs        |  1 -
 apps/magpie/src/protocol.rs   | 12 ++++++++++
 apps/music-player/src/main.rs | 41 ++++++++++++++++++++------------
 4 files changed, 38 insertions(+), 60 deletions(-)
 delete mode 100644 apps/magpie/src/client.rs

diff --git a/apps/magpie/src/client.rs b/apps/magpie/src/client.rs
deleted file mode 100644
index 5714552..0000000
--- a/apps/magpie/src/client.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2022 Marceline Cramer
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-use serde::Serialize;
-
-use std::os::unix::net::UnixStream;
-use std::path::Path;
-
-use crate::protocol::{ClientMessenger, MagpieServerMsg, PanelId, SendMessage, MAGPIE_SOCK};
-
-/// A client to a Magpie server.
-pub struct MagpieClient {
-    pub messenger: ClientMessenger<UnixStream>,
-}
-
-impl MagpieClient {
-    pub fn new() -> std::io::Result<Self> {
-        let sock_dir = std::env::var("XDG_RUNTIME_DIR").expect("XDG_RUNTIME_DIR not set");
-        let sock_dir = Path::new(&sock_dir);
-        let sock_path = sock_dir.join(MAGPIE_SOCK);
-        let socket = UnixStream::connect(sock_path)?;
-        Ok(Self {
-            messenger: ClientMessenger::new(socket),
-        })
-    }
-
-    pub fn send(&mut self, msg: &MagpieServerMsg) {
-        if let Err(err) = self.messenger.send(msg) {
-            eprintln!("Message send error: {:?}", err);
-        }
-    }
-
-    pub fn send_json_message<T: Serialize>(&mut self, id: PanelId, msg: &T) {
-        let msg = serde_json::to_string(msg).unwrap();
-        eprintln!("Sending message: {}", msg);
-
-        let msg = SendMessage {
-            id,
-            msg: msg.into_bytes(),
-        };
-
-        self.send(&MagpieServerMsg::SendMessage(msg));
-    }
-}
diff --git a/apps/magpie/src/lib.rs b/apps/magpie/src/lib.rs
index c126da0..c17fe70 100644
--- a/apps/magpie/src/lib.rs
+++ b/apps/magpie/src/lib.rs
@@ -1,7 +1,6 @@
 // Copyright (c) 2022 Marceline Cramer
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-pub mod client;
 pub mod protocol;
 
 #[cfg(feature = "service")]
diff --git a/apps/magpie/src/protocol.rs b/apps/magpie/src/protocol.rs
index 4aed53c..650fb80 100644
--- a/apps/magpie/src/protocol.rs
+++ b/apps/magpie/src/protocol.rs
@@ -60,6 +60,18 @@ pub enum MagpieClientMsg {
 /// A [Messenger] specialized for Magpie clients.
 pub type ClientMessenger<T> = Messenger<T, MagpieClientMsg, MagpieServerMsg>;
 
+impl<T: Read + Write> ClientMessenger<T> {
+    pub fn send_panel_json<O: Serialize>(&mut self, id: PanelId, msg: &O) {
+        let msg = serde_json::to_string(msg).unwrap();
+        eprintln!("Sending message: {:?}", msg);
+
+        let _ = self.send(&MagpieServerMsg::SendMessage(SendMessage {
+            id,
+            msg: msg.into_bytes(),
+        }));
+    }
+}
+
 /// A [Messenger] specialized for Magpie servers.
 pub type ServerMessenger<T> = Messenger<T, MagpieServerMsg, MagpieClientMsg>;
 
diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 5f07f12..c6f17b0 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -1,12 +1,14 @@
 // Copyright (c) 2022 Marceline Cramer
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-use canary_music_player::*;
-use canary_magpie::client::MagpieClient;
-use canary_magpie::protocol::{CreatePanel, MagpieServerMsg};
+use std::{os::unix::net::UnixStream, path::Path};
+
+use canary_magpie::protocol::{ClientMessenger, CreatePanel, MagpieServerMsg, MAGPIE_SOCK};
 use canary_music_player::*;
 use mpris::PlayerFinder;
 
+pub type MagpieClient<'a> = ClientMessenger<&'a UnixStream>;
+
 pub struct MetadataTracker {
     pub album: AlbumInfo,
     pub track: TrackInfo,
@@ -42,9 +44,9 @@ impl From<&mpris::Metadata> for MetadataTracker {
 impl MetadataTracker {
     pub fn new(magpie: &mut MagpieClient, metadata: &mpris::Metadata) -> Self {
         let new: Self = metadata.into();
-        magpie.send_json_message(0, &InMsg::AlbumChanged(new.album.clone()));
-        magpie.send_json_message(0, &InMsg::TrackChanged(new.track.clone()));
-        magpie.send_json_message(
+        magpie.send_panel_json(0, &InMsg::AlbumChanged(new.album.clone()));
+        magpie.send_panel_json(0, &InMsg::TrackChanged(new.track.clone()));
+        magpie.send_panel_json(
             0,
             &InMsg::ProgressChanged(ProgressChanged {
                 position: 0.0,
@@ -58,12 +60,12 @@ impl MetadataTracker {
         let new: Self = metadata.into();
 
         if self.album != new.album {
-            messenger.send_json_message(0, &InMsg::AlbumChanged(new.album.clone()));
+            messenger.send_panel_json(0, &InMsg::AlbumChanged(new.album.clone()));
         }
 
         if self.track != new.track {
-            messenger.send_json_message(0, &InMsg::TrackChanged(new.track.clone()));
-            messenger.send_json_message(
+            messenger.send_panel_json(0, &InMsg::TrackChanged(new.track.clone()));
+            messenger.send_panel_json(
                 0,
                 &InMsg::ProgressChanged(ProgressChanged {
                     position: 0.0,
@@ -85,12 +87,21 @@ fn main() {
 
     let player_finder = PlayerFinder::new().expect("Could not connect to D-Bus");
 
-    let mut magpie = MagpieClient::new().unwrap();
+    let sock_dir = std::env::var("XDG_RUNTIME_DIR").expect("XDG_RUNTIME_DIR not set");
+    let sock_dir = Path::new(&sock_dir);
+    let sock_path = sock_dir.join(MAGPIE_SOCK);
+    let socket = UnixStream::connect(sock_path).unwrap();
+    let mut magpie = MagpieClient::new(&socket);
     let protocol = "tebibyte-media.desktop.music-player-controller".to_string();
     let script = std::path::PathBuf::from(&module_path);
-    let msg = CreatePanel { id: 0, protocol, script };
+    let msg = CreatePanel {
+        id: 0,
+        protocol,
+        script,
+    };
+
     let msg = MagpieServerMsg::CreatePanel(msg);
-    magpie.messenger.send(&msg).unwrap();
+    magpie.send(&msg).unwrap();
 
     let mut first_loop = true;
     let mut connected = false;
@@ -106,7 +117,7 @@ fn main() {
         if connected {
             println!("Disconnected from MPRIS");
             let msg = InMsg::Disconnected;
-            magpie.send_json_message(0, &msg);
+            magpie.send_panel_json(0, &msg);
             connected = false;
         }
 
@@ -126,7 +137,7 @@ fn main() {
             player.bus_name()
         );
         connected = true;
-        magpie.send_json_message(0, &InMsg::Connected);
+        magpie.send_panel_json(0, &InMsg::Connected);
 
         let metadata = player.get_metadata().unwrap();
         let mut metadata_tracker = MetadataTracker::new(&mut magpie, &metadata);
@@ -180,7 +191,7 @@ fn main() {
             };
 
             if let Some(msg) = in_msg {
-                magpie.send_json_message(0, &msg);
+                magpie.send_panel_json(0, &msg);
             }
         }
     }

From 2aadd0d57ae72b1d1cd84dd3b5d8df3ed6d2e382 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 12:43:10 -0700
Subject: [PATCH 13/77] Make Color alpha functions const

---
 crates/script/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/script/src/lib.rs b/crates/script/src/lib.rs
index c2ada0e..58c0266 100644
--- a/crates/script/src/lib.rs
+++ b/crates/script/src/lib.rs
@@ -173,13 +173,13 @@ impl Color {
         )
     }
 
-    pub fn alpha_multiply(&self, mul: u8) -> Self {
+    pub const fn alpha_multiply(&self, mul: u8) -> Self {
         let a = self.0 as u8 as u16;
         let multiplied = ((a * (mul as u16)) >> 8) as u8;
         self.with_alpha(multiplied)
     }
 
-    pub fn with_alpha(&self, alpha: u8) -> Self {
+    pub const fn with_alpha(&self, alpha: u8) -> Self {
         Self(self.0 & 0xffffff00 | alpha as u32)
     }
 

From f33100cfa8cede12cc3542f751ea01093259e89a Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 12:43:23 -0700
Subject: [PATCH 14/77] Add SAO UI style module

---
 scripts/sao-ui/src/lib.rs   |  1 +
 scripts/sao-ui/src/style.rs | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 scripts/sao-ui/src/style.rs

diff --git a/scripts/sao-ui/src/lib.rs b/scripts/sao-ui/src/lib.rs
index b558d3f..3293e8e 100644
--- a/scripts/sao-ui/src/lib.rs
+++ b/scripts/sao-ui/src/lib.rs
@@ -7,6 +7,7 @@ static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 pub mod anim;
 pub mod main_menu;
 pub mod music_player;
+pub mod style;
 pub mod widgets;
 
 use api::*;
diff --git a/scripts/sao-ui/src/style.rs b/scripts/sao-ui/src/style.rs
new file mode 100644
index 0000000..9318ae9
--- /dev/null
+++ b/scripts/sao-ui/src/style.rs
@@ -0,0 +1,28 @@
+use canary_script::Color;
+
+/// A reusable set of colors. Used by default widget styles.
+pub struct Palette {
+    pub base: Color,
+    pub surface: Color,
+    pub overlay: Color,
+    pub text: Color,
+}
+
+/// Sword Art Online color palette.
+pub const SAO_PALETTE: Palette = Palette {
+    base: Color::WHITE.with_alpha(0xc0),
+    surface: Color::WHITE,
+    overlay: Color::WHITE,
+    text: Color::BLACK,
+};
+
+/// Rose Pine color palette.
+pub const ROSE_PINE_PALETTE: Palette = Palette {
+    base: Color(0x191724ff),
+    surface: Color(0x1f1d2eff),
+    overlay: Color(0x26233aff),
+    text: Color(0xe0def4ff),
+};
+
+/// The global palette.
+pub const PALETTE: Palette = ROSE_PINE_PALETTE;

From 218e2fde741a520548ee3c5a3a56ab188b2d61a8 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 13:07:37 -0700
Subject: [PATCH 15/77] Add wip-dialog protocol to display
 ConfirmationDialogPanel

---
 scripts/sao-ui/src/lib.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/scripts/sao-ui/src/lib.rs b/scripts/sao-ui/src/lib.rs
index 3293e8e..948c2e9 100644
--- a/scripts/sao-ui/src/lib.rs
+++ b/scripts/sao-ui/src/lib.rs
@@ -24,6 +24,7 @@ fn bind_panel_impl(panel: Panel, protocol: Message, msg: Message) -> Box<dyn Pan
 
     match protocol.as_str() {
         "tebibyte-media.desktop.music-player-controller" => MusicPlayerPanel::bind(panel, msg),
+        "wip-dialog" => ConfirmationDialogPanel::bind(panel, msg),
         _ => MainMenuPanel::bind(panel, msg),
     }
 }
@@ -51,15 +52,23 @@ impl PanelImpl for ConfirmationDialogPanel {
         self.dialog.on_cursor_event(kind, at.into());
     }
 
-    fn on_resize(&mut self, _size: Vec2) {}
+    fn on_resize(&mut self, size: Vec2) {
+        self.dialog.resize(size);
+    }
 
     fn on_message(&mut self, _msg: Message) {}
 }
 
 impl ConfirmationDialogPanel {
     pub fn bind(panel: Panel, msg: Message) -> Box<dyn PanelImpl> {
-        let msg = msg.to_vec();
-        let info: DialogInfo = serde_json::from_slice(&msg).unwrap();
+        // let msg = msg.to_vec();
+        // let info: DialogInfo = serde_json::from_slice(&msg).unwrap();
+
+        let info = DialogInfo {
+            title: "Hello world!".to_string(),
+            content: "Testing, testing...".to_string(),
+            responses: vec![DialogResponse::Yes, DialogResponse::No],
+        };
 
         use widgets::dialog::*;
         let style = DialogStyle::default();

From 2f5d25a3f4fa46c002d580edb66fcf050aee4643 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 13:08:01 -0700
Subject: [PATCH 16/77] Add Metrics and Theme consts

---
 scripts/sao-ui/src/style.rs | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/scripts/sao-ui/src/style.rs b/scripts/sao-ui/src/style.rs
index 9318ae9..f6deea5 100644
--- a/scripts/sao-ui/src/style.rs
+++ b/scripts/sao-ui/src/style.rs
@@ -1,4 +1,4 @@
-use canary_script::Color;
+use canary_script::{api::Font, Color};
 
 /// A reusable set of colors. Used by default widget styles.
 pub struct Palette {
@@ -10,7 +10,7 @@ pub struct Palette {
 
 /// Sword Art Online color palette.
 pub const SAO_PALETTE: Palette = Palette {
-    base: Color::WHITE.with_alpha(0xc0),
+    base: Color::WHITE.with_alpha(0xa0),
     surface: Color::WHITE,
     overlay: Color::WHITE,
     text: Color::BLACK,
@@ -24,5 +24,21 @@ pub const ROSE_PINE_PALETTE: Palette = Palette {
     text: Color(0xe0def4ff),
 };
 
-/// The global palette.
-pub const PALETTE: Palette = ROSE_PINE_PALETTE;
+/// Common measurements for widget shapes.
+pub struct Metrics {
+    pub surface_rounding: f32,
+}
+
+/// Common default parameters for widget styles.
+pub struct Theme {
+    pub palette: Palette,
+    pub metrics: Metrics,
+}
+
+/// The global theme.
+pub const THEME: Theme = Theme {
+    palette: ROSE_PINE_PALETTE,
+    metrics: Metrics {
+        surface_rounding: 5.0,
+    },
+};

From 948dfa77c4b6b43090b09b4cb69118d299d852e7 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 13:08:17 -0700
Subject: [PATCH 17/77] Add style and THEME to widget prelude

---
 scripts/sao-ui/src/widgets/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/sao-ui/src/widgets/mod.rs b/scripts/sao-ui/src/widgets/mod.rs
index a9968df..fee8899 100644
--- a/scripts/sao-ui/src/widgets/mod.rs
+++ b/scripts/sao-ui/src/widgets/mod.rs
@@ -75,6 +75,7 @@ impl<T: Container> Widget for T {
 pub mod prelude {
     pub use super::*;
     pub use crate::anim::Animation;
+    pub use crate::style::{self, THEME};
     pub use canary_script::{*, api::*};
     pub use keyframe::functions::*;
 }

From 1ac70e653b0bffb1516beb435e282591b0ddb420 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 13:08:28 -0700
Subject: [PATCH 18/77] Use THEME in dialog style defaults

---
 scripts/sao-ui/src/widgets/dialog.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/sao-ui/src/widgets/dialog.rs b/scripts/sao-ui/src/widgets/dialog.rs
index f8dea23..6f7aabb 100644
--- a/scripts/sao-ui/src/widgets/dialog.rs
+++ b/scripts/sao-ui/src/widgets/dialog.rs
@@ -40,7 +40,7 @@ pub struct DialogStyle {
 impl Default for DialogStyle {
     fn default() -> Self {
         Self {
-            rounding: 5.0,
+            rounding: THEME.metrics.surface_rounding,
             header: Default::default(),
             body: Default::default(),
             footer: Default::default(),
@@ -61,10 +61,10 @@ pub struct DialogHeaderStyle {
 impl Default for DialogHeaderStyle {
     fn default() -> Self {
         Self {
-            color: Color::WHITE,
+            color: THEME.palette.surface,
             height: 20.0,
             text_font: Font::new(crate::DISPLAY_FONT),
-            text_color: Color::BLACK,
+            text_color: THEME.palette.text,
             text_scale_factor: 0.65,
             text_baseline: 0.25,
         }
@@ -82,9 +82,9 @@ pub struct DialogBodyStyle {
 impl Default for DialogBodyStyle {
     fn default() -> Self {
         Self {
-            color: Color::WHITE.with_alpha(0xb0),
+            color: THEME.palette.base,
             text_font: Font::new(crate::CONTENT_FONT),
-            text_color: Color::BLACK,
+            text_color: THEME.palette.text,
             text_size: 5.0,
         }
     }
@@ -103,7 +103,7 @@ impl Default for DialogFooterStyle {
         Self {
             icon_font: Font::new(crate::ICON_FONT),
             button_radius: 7.5,
-            color: Color::WHITE,
+            color: THEME.palette.surface,
             height: 15.0,
         }
     }

From 6db0c72f4d752d11e74fe56506e5d5415b2615d9 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 13:15:22 -0700
Subject: [PATCH 19/77] Add terminal colors to style

---
 scripts/sao-ui/src/style.rs | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/scripts/sao-ui/src/style.rs b/scripts/sao-ui/src/style.rs
index f6deea5..7a410ca 100644
--- a/scripts/sao-ui/src/style.rs
+++ b/scripts/sao-ui/src/style.rs
@@ -6,6 +6,14 @@ pub struct Palette {
     pub surface: Color,
     pub overlay: Color,
     pub text: Color,
+    pub black: Color,
+    pub red: Color,
+    pub green: Color,
+    pub yellow: Color,
+    pub blue: Color,
+    pub magenta: Color,
+    pub cyan: Color,
+    pub white: Color,
 }
 
 /// Sword Art Online color palette.
@@ -14,6 +22,14 @@ pub const SAO_PALETTE: Palette = Palette {
     surface: Color::WHITE,
     overlay: Color::WHITE,
     text: Color::BLACK,
+    black: Color::BLACK,
+    red: Color::RED,
+    green: Color::GREEN,
+    yellow: Color::YELLOW,
+    blue: Color::BLUE,
+    magenta: Color::MAGENTA,
+    cyan: Color::CYAN,
+    white: Color::WHITE,
 };
 
 /// Rose Pine color palette.
@@ -22,6 +38,14 @@ pub const ROSE_PINE_PALETTE: Palette = Palette {
     surface: Color(0x1f1d2eff),
     overlay: Color(0x26233aff),
     text: Color(0xe0def4ff),
+    black: Color(0x6e6a86ff),
+    red: Color(0xeb6f92ff),
+    green: Color(0x7fb59fff),
+    yellow: Color(0xf6c177ff),
+    blue: Color(0x31748fff),
+    magenta: Color(0xc4a7e7ff),
+    cyan: Color(0x9ccfd8ff),
+    white: Color(0xe0def4ff),
 };
 
 /// Common measurements for widget shapes.

From 85e1fbd6b6bbb771551232fb1daf2a606a200ab2 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 13:15:34 -0700
Subject: [PATCH 20/77] Use terminal colors for dialog buttons

---
 scripts/sao-ui/src/widgets/dialog.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/sao-ui/src/widgets/dialog.rs b/scripts/sao-ui/src/widgets/dialog.rs
index 6f7aabb..f954984 100644
--- a/scripts/sao-ui/src/widgets/dialog.rs
+++ b/scripts/sao-ui/src/widgets/dialog.rs
@@ -23,8 +23,8 @@ impl DialogResponse {
 
     pub fn get_color(&self) -> Color {
         match self {
-            DialogResponse::Yes => Color::BLUE,
-            DialogResponse::No => Color::RED,
+            DialogResponse::Yes => THEME.palette.blue,
+            DialogResponse::No => THEME.palette.red,
         }
     }
 }
@@ -95,6 +95,7 @@ pub struct DialogFooterStyle {
     pub icon_font: Font,
     pub button_radius: f32,
     pub color: Color,
+    pub button_fg: Color,
     pub height: f32,
 }
 
@@ -104,6 +105,7 @@ impl Default for DialogFooterStyle {
             icon_font: Font::new(crate::ICON_FONT),
             button_radius: 7.5,
             color: THEME.palette.surface,
+            button_fg: THEME.palette.white,
             height: 15.0,
         }
     }
@@ -136,7 +138,7 @@ impl Dialog {
                 thickness: radius * 0.05,
                 body_color: color,
                 ring_color: color,
-                icon_color: Color::WHITE,
+                icon_color: style.footer.button_fg,
             };
 
             let text = LabelText {

From a477c3c385bedaf7eea6fe248e69f7f20641d807 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 13:33:21 -0700
Subject: [PATCH 21/77] Add panel background color edit in sandbox

---
 apps/sandbox/src/main.rs | 154 +++++++++++++++++++++------------------
 1 file changed, 85 insertions(+), 69 deletions(-)

diff --git a/apps/sandbox/src/main.rs b/apps/sandbox/src/main.rs
index 9ec1f57..5b54f7b 100644
--- a/apps/sandbox/src/main.rs
+++ b/apps/sandbox/src/main.rs
@@ -33,6 +33,7 @@ struct App {
     last_update: Instant,
     protocol_buf: String,
     bind_message_buf: String,
+    panel_bg: egui::Color32,
 }
 
 impl App {
@@ -49,6 +50,7 @@ impl App {
             last_update: Instant::now(),
             protocol_buf: String::new(),
             bind_message_buf: String::new(),
+            panel_bg: egui::Color32::TRANSPARENT,
         }
     }
 }
@@ -58,6 +60,8 @@ impl eframe::App for App {
         ctx.request_repaint();
 
         egui::SidePanel::left("left_panel").show(ctx, |ui| {
+            ui.heading("New Panel");
+
             ui.label("Protocol name:");
             ui.text_edit_singleline(&mut self.protocol_buf);
 
@@ -81,6 +85,14 @@ impl eframe::App for App {
 
                 self.panels.push(panel);
             }
+
+            ui.separator();
+            ui.heading("Global Settings");
+
+            ui.horizontal(|ui| {
+                ui.label("Panel background color: ");
+                ui.color_edit_button_srgba(&mut self.panel_bg);
+            });
         });
 
         let dt = self.last_update.elapsed().as_secs_f32();
@@ -88,7 +100,7 @@ impl eframe::App for App {
 
         for panel in self.panels.iter_mut() {
             panel.panel.update(dt);
-            panel.show(ctx);
+            panel.show(self.panel_bg, ctx);
         }
     }
 }
@@ -102,83 +114,87 @@ pub struct PanelWindow {
 }
 
 impl PanelWindow {
-    pub fn show(&mut self, ctx: &egui::Context) {
+    pub fn show(&mut self, bg: egui::Color32, ctx: &egui::Context) {
+        let frame = egui::Frame::window(&ctx.style()).fill(bg);
         let window_id = egui::Id::new(format!("panel_{}", self.index));
-        egui::Window::new("Panel").id(window_id).show(ctx, |ui| {
-            egui::menu::bar(ui, |ui| {
-                ui.checkbox(&mut self.show_msg, "Show Message Editor");
-            });
+        egui::Window::new("Panel")
+            .frame(frame)
+            .id(window_id)
+            .show(ctx, |ui| {
+                egui::menu::bar(ui, |ui| {
+                    ui.checkbox(&mut self.show_msg, "Show Message Editor");
+                });
 
-            let sense = egui::Sense {
-                click: true,
-                drag: true,
-                focusable: true,
-            };
-
-            let desired_size = ui.available_size();
-            let response = ui.allocate_response(desired_size, sense);
-            let rect = response.rect;
-
-            if rect.size() != self.current_size {
-                let size = rect.size();
-                self.current_size = size;
-
-                let size = canary::Vec2::new(size.x, size.y);
-                self.panel.on_resize(size * PX_PER_MM);
-            }
-
-            if let Some(hover_pos) = response.hover_pos() {
-                let local = (hover_pos - rect.left_top()) * PX_PER_MM;
-                let pos = canary::Vec2::new(local.x, local.y);
-
-                let kind = if response.drag_started() {
-                    CursorEventKind::Select
-                } else if response.drag_released() {
-                    CursorEventKind::Deselect
-                } else if response.dragged() {
-                    CursorEventKind::Drag
-                } else {
-                    CursorEventKind::Hover
+                let sense = egui::Sense {
+                    click: true,
+                    drag: true,
+                    focusable: true,
                 };
 
-                self.panel.on_cursor_event(kind, pos);
-            }
+                let desired_size = ui.available_size();
+                let response = ui.allocate_response(desired_size, sense);
+                let rect = response.rect;
 
-            let texture = egui::TextureId::Managed(0);
-            let uv = egui::pos2(0.0, 0.0);
-            let mut mesh = egui::Mesh::with_texture(texture);
+                if rect.size() != self.current_size {
+                    let size = rect.size();
+                    self.current_size = size;
 
-            let commands = self.panel.draw();
-            for command in commands.into_iter() {
-                let voff = mesh.vertices.len() as u32;
-
-                match command {
-                    canary::DrawCommand::Mesh { vertices, indices } => {
-                        for v in vertices.iter() {
-                            use egui::epaint::Vertex;
-                            let pos = v.position / PX_PER_MM;
-                            let pos = egui::pos2(pos.x, pos.y);
-                            let pos = pos + rect.left_top().to_vec2();
-                            let (r, g, b, a) = v.color.to_rgba_unmultiplied();
-                            let color = egui::Color32::from_rgba_unmultiplied(r, g, b, a);
-                            let v = Vertex { pos, uv, color };
-                            mesh.vertices.push(v);
-                        }
-
-                        for i in indices.iter() {
-                            mesh.indices.push(i + voff);
-                        }
-                    }
-                    _ => unimplemented!(),
+                    let size = canary::Vec2::new(size.x, size.y);
+                    self.panel.on_resize(size * PX_PER_MM);
                 }
-            }
 
-            let painter = ui.painter_at(rect);
-            let shape = egui::Shape::mesh(mesh);
-            painter.add(shape);
+                if let Some(hover_pos) = response.hover_pos() {
+                    let local = (hover_pos - rect.left_top()) * PX_PER_MM;
+                    let pos = canary::Vec2::new(local.x, local.y);
 
-            response
-        });
+                    let kind = if response.drag_started() {
+                        CursorEventKind::Select
+                    } else if response.drag_released() {
+                        CursorEventKind::Deselect
+                    } else if response.dragged() {
+                        CursorEventKind::Drag
+                    } else {
+                        CursorEventKind::Hover
+                    };
+
+                    self.panel.on_cursor_event(kind, pos);
+                }
+
+                let texture = egui::TextureId::Managed(0);
+                let uv = egui::pos2(0.0, 0.0);
+                let mut mesh = egui::Mesh::with_texture(texture);
+
+                let commands = self.panel.draw();
+                for command in commands.into_iter() {
+                    let voff = mesh.vertices.len() as u32;
+
+                    match command {
+                        canary::DrawCommand::Mesh { vertices, indices } => {
+                            for v in vertices.iter() {
+                                use egui::epaint::Vertex;
+                                let pos = v.position / PX_PER_MM;
+                                let pos = egui::pos2(pos.x, pos.y);
+                                let pos = pos + rect.left_top().to_vec2();
+                                let (r, g, b, a) = v.color.to_rgba_unmultiplied();
+                                let color = egui::Color32::from_rgba_unmultiplied(r, g, b, a);
+                                let v = Vertex { pos, uv, color };
+                                mesh.vertices.push(v);
+                            }
+
+                            for i in indices.iter() {
+                                mesh.indices.push(i + voff);
+                            }
+                        }
+                        _ => unimplemented!(),
+                    }
+                }
+
+                let painter = ui.painter_at(rect);
+                let shape = egui::Shape::mesh(mesh);
+                painter.add(shape);
+
+                response
+            });
 
         let msg_edit_id = egui::Id::new(format!("msg_edit_{}", self.index));
         egui::Window::new("Message Editor")

From 3f7ebeaf7e5cfe9c9be37be036fae7f4a0eb7f79 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 13:42:06 -0700
Subject: [PATCH 22/77] Use theme in main menu

---
 scripts/sao-ui/src/main_menu.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/sao-ui/src/main_menu.rs b/scripts/sao-ui/src/main_menu.rs
index 87bbbb0..8ae2206 100644
--- a/scripts/sao-ui/src/main_menu.rs
+++ b/scripts/sao-ui/src/main_menu.rs
@@ -64,9 +64,9 @@ impl Default for MainMenu {
             radius: 7.5,
             spacing: 1.5,
             thickness: 0.4,
-            body_color: Color::WHITE,
-            ring_color: Color::WHITE,
-            icon_color: Color::BLACK,
+            body_color: THEME.palette.surface,
+            ring_color: THEME.palette.surface,
+            icon_color: THEME.palette.text,
         };
 
         let mut buttons = Vec::new();
@@ -150,6 +150,7 @@ pub struct PlayerInfo {
     width: f32,
     height: f32,
     rounding: f32,
+    color: Color,
 }
 
 impl PlayerInfo {
@@ -158,6 +159,7 @@ impl PlayerInfo {
             width: 70.0,
             height: 120.0,
             rounding: 5.0,
+            color: THEME.palette.surface,
         }
     }
 }
@@ -170,7 +172,7 @@ impl RectBounds for PlayerInfo {
 
 impl Widget for PlayerInfo {
     fn draw(&mut self, ctx: &DrawContext) {
-        ctx.draw_rounded_rect(self.get_bounds(), self.rounding, Color::WHITE);
+        ctx.draw_rounded_rect(self.get_bounds(), self.rounding, self.color);
     }
 }
 

From ce7d641795b10b643007bb8ccc760e13c851c479 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 13:42:18 -0700
Subject: [PATCH 23/77] Use theme in TabMenu

---
 scripts/sao-ui/src/widgets/menu.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/sao-ui/src/widgets/menu.rs b/scripts/sao-ui/src/widgets/menu.rs
index 5c0a022..36f0ba7 100644
--- a/scripts/sao-ui/src/widgets/menu.rs
+++ b/scripts/sao-ui/src/widgets/menu.rs
@@ -224,6 +224,7 @@ pub struct TabMenu {
 impl TabMenu {
     const HEAD_RADIUS: f32 = 5.0;
     const HEAD_HEIGHT: f32 = 15.0;
+    const HEAD_COLOR: Color = THEME.palette.surface;
     const TAB_WIDTH: f32 = 15.0;
     const TAB_HEIGHT: f32 = 25.0;
     const TAB_NUM: usize = 6;
@@ -235,9 +236,9 @@ impl TabMenu {
         radius: Self::HEAD_HEIGHT * 0.25,
         spacing: Self::HEAD_HEIGHT * 0.1,
         thickness: Self::HEAD_HEIGHT * 0.05,
-        body_color: Color::WHITE,
-        ring_color: Color::BLACK,
-        icon_color: Color::BLACK,
+        body_color: Self::HEAD_COLOR,
+        ring_color: THEME.palette.black,
+        icon_color: THEME.palette.black,
     };
 
     const HEAD_BUTTON_MARGIN: f32 = Self::HEAD_HEIGHT / 2.0;
@@ -348,20 +349,18 @@ impl Container for TabMenu {
     }
 
     fn draw(&mut self, ctx: &DrawContext) {
-        let head_color = Color::WHITE;
-
         ctx.draw_partially_rounded_rect(
             CornerFlags::BOTTOM_RIGHT,
             self.separator_rect,
             Self::INNER_RADIUS,
-            head_color,
+            Self::HEAD_COLOR,
         );
 
         ctx.draw_partially_rounded_rect(
             CornerFlags::TOP,
             self.head_rect,
             Self::HEAD_RADIUS,
-            head_color,
+            Self::HEAD_COLOR,
         );
     }
 }

From 59a673128ccdae9fb175770115881346fc82b43c Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 14:00:16 -0700
Subject: [PATCH 24/77] Add base_hover and base_active colors

---
 scripts/sao-ui/src/style.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/sao-ui/src/style.rs b/scripts/sao-ui/src/style.rs
index 7a410ca..01d6f56 100644
--- a/scripts/sao-ui/src/style.rs
+++ b/scripts/sao-ui/src/style.rs
@@ -1,8 +1,10 @@
-use canary_script::{api::Font, Color};
+use canary_script::Color;
 
 /// A reusable set of colors. Used by default widget styles.
 pub struct Palette {
     pub base: Color,
+    pub base_hover: Color,
+    pub base_active: Color,
     pub surface: Color,
     pub overlay: Color,
     pub text: Color,
@@ -19,6 +21,8 @@ pub struct Palette {
 /// Sword Art Online color palette.
 pub const SAO_PALETTE: Palette = Palette {
     base: Color::WHITE.with_alpha(0xa0),
+    base_hover: Color::WHITE.with_alpha(0xd0),
+    base_active: Color::YELLOW,
     surface: Color::WHITE,
     overlay: Color::WHITE,
     text: Color::BLACK,
@@ -35,6 +39,8 @@ pub const SAO_PALETTE: Palette = Palette {
 /// Rose Pine color palette.
 pub const ROSE_PINE_PALETTE: Palette = Palette {
     base: Color(0x191724ff),
+    base_hover: Color(0x21202eff), // Rose Pine Highlight Low
+    base_active: Color(0x403d52ff), // Rose Pine Highlight Med
     surface: Color(0x1f1d2eff),
     overlay: Color(0x26233aff),
     text: Color(0xe0def4ff),

From e8c908832799f4143a73bafe122379157944047f Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 14:01:20 -0700
Subject: [PATCH 25/77] Use THEME in RectButtonStyle

---
 scripts/sao-ui/src/widgets/button.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/scripts/sao-ui/src/widgets/button.rs b/scripts/sao-ui/src/widgets/button.rs
index d2b8859..846eae5 100644
--- a/scripts/sao-ui/src/widgets/button.rs
+++ b/scripts/sao-ui/src/widgets/button.rs
@@ -118,6 +118,8 @@ pub struct RectButtonStyle {
     pub inactive_color: Color,
     pub hover_color: Color,
     pub selected_color: Color,
+    pub icon_color: Color,
+    pub label_color: Color,
 }
 
 impl Default for RectButtonStyle {
@@ -129,9 +131,11 @@ impl Default for RectButtonStyle {
             label_baseline: 0.25,
             icon_scale_factor: 0.8,
             icon_margin_factor: 1.1,
-            inactive_color: Color::WHITE.with_alpha(0x40),
-            hover_color: Color::WHITE.with_alpha(0xb0),
-            selected_color: Color::YELLOW,
+            inactive_color: THEME.palette.base,
+            hover_color: THEME.palette.base_hover,
+            selected_color: THEME.palette.base_active,
+            icon_color: THEME.palette.black,
+            label_color: THEME.palette.text,
         }
     }
 }
@@ -168,7 +172,7 @@ impl RectButton {
             label_left += margin;
             alignment = HorizontalAlignment::Left;
             let scale = rect.height() * style.icon_scale_factor;
-            let color = Color::BLACK;
+            let color = style.icon_color;
             let cx = rect.tl.x + margin / 2.0;
             let cy = rect.tl.y + rect.height() / 2.0;
             let center = Vec2::new(cx, cy);
@@ -182,7 +186,7 @@ impl RectButton {
             let right = rect.br.x;
             let baseline = rect.tl.y;
             let baseline = (rect.height() * (1.0 - style.label_baseline)) + baseline;
-            let color = Color::BLACK;
+            let color = style.label_color;
 
             Label::new(text, alignment, scale, color, left, right, baseline)
         });

From bc8032aaaffadaad04b8a93b9fbb2758c1c469c7 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 14:01:31 -0700
Subject: [PATCH 26/77] Use THEME in ScrollBarStyle

---
 scripts/sao-ui/src/widgets/scroll.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/sao-ui/src/widgets/scroll.rs b/scripts/sao-ui/src/widgets/scroll.rs
index 130cbc5..0925313 100644
--- a/scripts/sao-ui/src/widgets/scroll.rs
+++ b/scripts/sao-ui/src/widgets/scroll.rs
@@ -21,11 +21,11 @@ impl Default for ScrollBarStyle {
             margin: Vec2::splat(2.0),
             body_radius: 1.0,
             body_width: 3.0,
-            body_idle_color: Color(0x7f7f7fff),
-            body_hover_color: Color(0xb0b0b0ff),
-            body_selected_color: Color::WHITE,
+            body_idle_color: THEME.palette.base,
+            body_hover_color: THEME.palette.base_hover,
+            body_selected_color: THEME.palette.base_active,
             rail_width: 1.0,
-            rail_color: Color(0xa0a0a07f),
+            rail_color: THEME.palette.base,
         }
     }
 }

From ef6a81e1420df977765b4a8ba2ad88dcfb2d86ed Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 14:13:50 -0700
Subject: [PATCH 27/77] Add Rose Pine Moon color palette

---
 scripts/sao-ui/src/style.rs | 40 +++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/scripts/sao-ui/src/style.rs b/scripts/sao-ui/src/style.rs
index 01d6f56..b111dad 100644
--- a/scripts/sao-ui/src/style.rs
+++ b/scripts/sao-ui/src/style.rs
@@ -39,19 +39,37 @@ pub const SAO_PALETTE: Palette = Palette {
 /// Rose Pine color palette.
 pub const ROSE_PINE_PALETTE: Palette = Palette {
     base: Color(0x191724ff),
-    base_hover: Color(0x21202eff), // Rose Pine Highlight Low
-    base_active: Color(0x403d52ff), // Rose Pine Highlight Med
+    base_hover: Color(0x21202eff), // Highlight Low
+    base_active: Color(0x403d52ff), // Highlight Med
     surface: Color(0x1f1d2eff),
     overlay: Color(0x26233aff),
     text: Color(0xe0def4ff),
-    black: Color(0x6e6a86ff),
-    red: Color(0xeb6f92ff),
-    green: Color(0x7fb59fff),
-    yellow: Color(0xf6c177ff),
-    blue: Color(0x31748fff),
-    magenta: Color(0xc4a7e7ff),
-    cyan: Color(0x9ccfd8ff),
-    white: Color(0xe0def4ff),
+    black: Color(0x6e6a86ff), // Muted
+    red: Color(0xeb6f92ff), // Love
+    green: Color(0x7fb59fff), // ??? (not in Rose Pine?)
+    yellow: Color(0xf6c177ff), // Gold
+    blue: Color(0x31748fff), // Pine
+    magenta: Color(0xc4a7e7ff), // Iris
+    cyan: Color(0x9ccfd8ff), // Foam
+    white: Color(0xe0def4ff), // Text
+};
+
+/// Rose Pine Moon color palette.
+pub const ROSE_PINE_MOON_PALETTE: Palette = Palette {
+    base: Color(0x232136ff),
+    base_hover: Color(0x2a283eff), // Highlight Low
+    base_active: Color(0x44415aff), // Highlight Med
+    surface: Color(0x2a273fff),
+    overlay: Color(0x393552),
+    text: Color(0xe0def4ff),
+    black: Color(0x6e6a86ff), // Muted
+    red: Color(0xeb6f92ff), // Love
+    green: Color(0x7fb59fff), // ??? (not in Rose Pine?)
+    yellow: Color(0xf6c177ff), // Gold
+    blue: Color(0x3e8fb0ff), // Pine
+    magenta: Color(0xc4a7e7ff), // Iris
+    cyan: Color(0x9ccfd8ff), // Foam
+    white: Color(0xe0def4ff), // Text
 };
 
 /// Common measurements for widget shapes.
@@ -67,7 +85,7 @@ pub struct Theme {
 
 /// The global theme.
 pub const THEME: Theme = Theme {
-    palette: ROSE_PINE_PALETTE,
+    palette: ROSE_PINE_MOON_PALETTE,
     metrics: Metrics {
         surface_rounding: 5.0,
     },

From 25532f4f9e87623e399418a6acf6737f08e6eafd Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 14:30:26 -0700
Subject: [PATCH 28/77] Use theme in MusicPlayerWidget

---
 scripts/sao-ui/src/music_player.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/sao-ui/src/music_player.rs b/scripts/sao-ui/src/music_player.rs
index 9eab50e..f0e190c 100644
--- a/scripts/sao-ui/src/music_player.rs
+++ b/scripts/sao-ui/src/music_player.rs
@@ -179,7 +179,8 @@ impl MusicPlayerWidget {
                 text: content.to_string(),
             };
 
-            let label = Label::new_centered(text, 10.0, Color::BLACK);
+            let color = style.body.text_color;
+            let label = Label::new_centered(text, 10.0, color);
             Offset::new(label, Vec2::ZERO)
         };
 
@@ -196,7 +197,7 @@ impl MusicPlayerWidget {
                 text,
                 HorizontalAlignment::Center,
                 scale,
-                Color::BLACK,
+                THEME.palette.text,
                 0.0,
                 0.0,
                 baseline,
@@ -225,18 +226,18 @@ impl MusicPlayerWidget {
             radius: style.footer.height * 0.3,
             spacing: style.footer.height * 0.1,
             thickness: style.footer.height * 0.025,
-            body_color: Color(0xf1b841ff),
-            ring_color: Color(0xf1b841ff),
-            icon_color: Color::BLACK,
+            body_color: THEME.palette.yellow,
+            ring_color: THEME.palette.yellow,
+            icon_color: THEME.palette.black,
         };
 
         let secondary_button = RoundButtonStyle {
             radius: style.footer.height * 0.25,
             spacing: style.footer.height * 0.05,
             thickness: style.footer.height * 0.025,
-            body_color: Color::WHITE,
-            ring_color: Color::BLACK,
-            icon_color: Color::BLACK,
+            body_color: style.footer.color,
+            ring_color: THEME.palette.black,
+            icon_color: THEME.palette.black,
         };
 
         let prev = RoundButton::new(secondary_button.clone(), Some(prev_text));

From e924a170736359b3eeab07853f7bbc7286271807 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 16:48:17 -0700
Subject: [PATCH 29/77] Disable Magpie glium gamma-correction

---
 apps/magpie/src/service/gl.rs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/apps/magpie/src/service/gl.rs b/apps/magpie/src/service/gl.rs
index 689b340..38396ec 100644
--- a/apps/magpie/src/service/gl.rs
+++ b/apps/magpie/src/service/gl.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 use canary::{DrawCommand, Vec2, PX_PER_MM};
-use glium::Surface;
+use glium::{program::ProgramCreationInput, Surface};
 
 #[derive(Copy, Clone)]
 pub struct Vertex {
@@ -59,9 +59,21 @@ pub struct Graphics {
 
 impl Graphics {
     pub fn new(display: glium::Display) -> Self {
-        let program =
-            glium::Program::from_source(&display, VERTEX_SHADER_SRC, FRAGMENT_SHADER_SRC, None)
-                .unwrap();
+        let program = glium::Program::new(
+            &display,
+            ProgramCreationInput::SourceCode {
+                vertex_shader: VERTEX_SHADER_SRC,
+                tessellation_control_shader: None,
+                tessellation_evaluation_shader: None,
+                geometry_shader: None,
+                fragment_shader: FRAGMENT_SHADER_SRC,
+                transform_feedback_varyings: None,
+                outputs_srgb: true, // don't automatically apply gamma correction
+                uses_point_size: false,
+            },
+        )
+        .unwrap();
+
         Self { display, program }
     }
 

From e35ee1be4c662872e747bac57a01c80f2f48eea5 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 17:00:47 -0700
Subject: [PATCH 30/77] Better SAO UI base transparency

---
 scripts/sao-ui/src/style.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/sao-ui/src/style.rs b/scripts/sao-ui/src/style.rs
index b111dad..b0be9df 100644
--- a/scripts/sao-ui/src/style.rs
+++ b/scripts/sao-ui/src/style.rs
@@ -20,8 +20,8 @@ pub struct Palette {
 
 /// Sword Art Online color palette.
 pub const SAO_PALETTE: Palette = Palette {
-    base: Color::WHITE.with_alpha(0xa0),
-    base_hover: Color::WHITE.with_alpha(0xd0),
+    base: Color::WHITE.with_alpha(0xc0),
+    base_hover: Color::WHITE.with_alpha(0xe0),
     base_active: Color::YELLOW,
     surface: Color::WHITE,
     overlay: Color::WHITE,
@@ -38,8 +38,8 @@ pub const SAO_PALETTE: Palette = Palette {
 
 /// Rose Pine color palette.
 pub const ROSE_PINE_PALETTE: Palette = Palette {
-    base: Color(0x191724ff),
-    base_hover: Color(0x21202eff), // Highlight Low
+    base: Color(0x191724c0),
+    base_hover: Color(0x21202ee0), // Highlight Low
     base_active: Color(0x403d52ff), // Highlight Med
     surface: Color(0x1f1d2eff),
     overlay: Color(0x26233aff),
@@ -56,8 +56,8 @@ pub const ROSE_PINE_PALETTE: Palette = Palette {
 
 /// Rose Pine Moon color palette.
 pub const ROSE_PINE_MOON_PALETTE: Palette = Palette {
-    base: Color(0x232136ff),
-    base_hover: Color(0x2a283eff), // Highlight Low
+    base: Color(0x232136c0),
+    base_hover: Color(0x2a283ee0), // Highlight Low
     base_active: Color(0x44415aff), // Highlight Med
     surface: Color(0x2a273fff),
     overlay: Color(0x393552),

From 4b126ed2cf7bb364afff4ac7d8915f21d9a2ac7d Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 18 Nov 2022 17:15:29 -0700
Subject: [PATCH 31/77] Magpie window transparency + remove window decorations

---
 apps/magpie/src/service/gl.rs     |  2 +-
 apps/magpie/src/service/window.rs | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/magpie/src/service/gl.rs b/apps/magpie/src/service/gl.rs
index 38396ec..e46e11e 100644
--- a/apps/magpie/src/service/gl.rs
+++ b/apps/magpie/src/service/gl.rs
@@ -117,7 +117,7 @@ impl Graphics {
         };
 
         let mut target = self.display.draw();
-        target.clear_color(0.0, 0.0, 0.0, 1.0);
+        target.clear_color(0.0, 0.0, 0.0, 0.0);
         target
             .draw(
                 &vertex_buffer,
diff --git a/apps/magpie/src/service/window.rs b/apps/magpie/src/service/window.rs
index 3834224..b028f78 100644
--- a/apps/magpie/src/service/window.rs
+++ b/apps/magpie/src/service/window.rs
@@ -47,7 +47,9 @@ impl Window {
         panel: Panel,
         event_loop: &EventLoopWindowTarget<WindowMessage>,
     ) -> Result<Self, DisplayCreationError> {
-        let wb = glutin::window::WindowBuilder::new();
+        let wb = glutin::window::WindowBuilder::new()
+            .with_transparent(true)
+            .with_decorations(false);
         let cb = glutin::ContextBuilder::new();
         let display = glium::Display::new(wb, cb, &event_loop)?;
         let graphics = Graphics::new(display);
@@ -164,7 +166,11 @@ impl WindowStore {
         message: WindowMessage,
     ) -> anyhow::Result<bool> {
         match message {
-            WindowMessage::OpenWindow { id, protocol, script } => {
+            WindowMessage::OpenWindow {
+                id,
+                protocol,
+                script,
+            } => {
                 println!("Opening window {} with script {:?}", id, script);
                 let module = std::fs::read(script)?;
                 let mut script = self.runtime.load_module(&module)?;

From 046aede0fab9726df8c33ca568abac9b37b34248 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 19 Nov 2022 13:06:36 -0700
Subject: [PATCH 32/77] Add Arctica SAO UI theme

---
 scripts/sao-ui/src/style.rs | 98 ++++++++++++++++++++++++++++---------
 1 file changed, 75 insertions(+), 23 deletions(-)

diff --git a/scripts/sao-ui/src/style.rs b/scripts/sao-ui/src/style.rs
index b0be9df..0030c38 100644
--- a/scripts/sao-ui/src/style.rs
+++ b/scripts/sao-ui/src/style.rs
@@ -18,10 +18,16 @@ pub struct Palette {
     pub white: Color,
 }
 
+/// The common base color alpha shared between all themes.
+pub const BASE_ALPHA: u8 = 0xc0;
+
+/// The common base_hover color alpha shared between all themes.
+pub const BASE_HOVER_ALPHA: u8 = 0xe0;
+
 /// Sword Art Online color palette.
 pub const SAO_PALETTE: Palette = Palette {
-    base: Color::WHITE.with_alpha(0xc0),
-    base_hover: Color::WHITE.with_alpha(0xe0),
+    base: Color::WHITE.with_alpha(BASE_ALPHA),
+    base_hover: Color::WHITE.with_alpha(BASE_HOVER_ALPHA),
     base_active: Color::YELLOW,
     surface: Color::WHITE,
     overlay: Color::WHITE,
@@ -38,38 +44,84 @@ pub const SAO_PALETTE: Palette = Palette {
 
 /// Rose Pine color palette.
 pub const ROSE_PINE_PALETTE: Palette = Palette {
-    base: Color(0x191724c0),
-    base_hover: Color(0x21202ee0), // Highlight Low
-    base_active: Color(0x403d52ff), // Highlight Med
+    base: Color(0x191724ff).with_alpha(BASE_ALPHA),
+    base_hover: Color(0x21202ee0).with_alpha(BASE_HOVER_ALPHA), // Highlight Low
+    base_active: Color(0x403d52ff),                             // Highlight Med
     surface: Color(0x1f1d2eff),
     overlay: Color(0x26233aff),
     text: Color(0xe0def4ff),
-    black: Color(0x6e6a86ff), // Muted
-    red: Color(0xeb6f92ff), // Love
-    green: Color(0x7fb59fff), // ??? (not in Rose Pine?)
-    yellow: Color(0xf6c177ff), // Gold
-    blue: Color(0x31748fff), // Pine
+    black: Color(0x6e6a86ff),   // Muted
+    red: Color(0xeb6f92ff),     // Love
+    green: Color(0x7fb59fff),   // ??? (not in Rose Pine?)
+    yellow: Color(0xf6c177ff),  // Gold
+    blue: Color(0x31748fff),    // Pine
     magenta: Color(0xc4a7e7ff), // Iris
-    cyan: Color(0x9ccfd8ff), // Foam
-    white: Color(0xe0def4ff), // Text
+    cyan: Color(0x9ccfd8ff),    // Foam
+    white: Color(0xe0def4ff),   // Text
 };
 
 /// Rose Pine Moon color palette.
 pub const ROSE_PINE_MOON_PALETTE: Palette = Palette {
-    base: Color(0x232136c0),
-    base_hover: Color(0x2a283ee0), // Highlight Low
-    base_active: Color(0x44415aff), // Highlight Med
+    base: Color(0x232136ff).with_alpha(BASE_ALPHA),
+    base_hover: Color(0x2a283eff).with_alpha(BASE_HOVER_ALPHA), // Highlight Low
+    base_active: Color(0x44415aff),                             // Highlight Med
     surface: Color(0x2a273fff),
     overlay: Color(0x393552),
     text: Color(0xe0def4ff),
-    black: Color(0x6e6a86ff), // Muted
-    red: Color(0xeb6f92ff), // Love
-    green: Color(0x7fb59fff), // ??? (not in Rose Pine?)
-    yellow: Color(0xf6c177ff), // Gold
-    blue: Color(0x3e8fb0ff), // Pine
+    black: Color(0x6e6a86ff),   // Muted
+    red: Color(0xeb6f92ff),     // Love
+    green: Color(0x7fb59fff),   // ??? (not in Rose Pine?)
+    yellow: Color(0xf6c177ff),  // Gold
+    blue: Color(0x3e8fb0ff),    // Pine
     magenta: Color(0xc4a7e7ff), // Iris
-    cyan: Color(0x9ccfd8ff), // Foam
-    white: Color(0xe0def4ff), // Text
+    cyan: Color(0x9ccfd8ff),    // Foam
+    white: Color(0xe0def4ff),   // Text
+};
+
+/// [Arctica](https://github.com/sashakoshka/arctica) indexable color theme.
+pub const ARCTICA: [Color; 24] = [
+    Color(0x242933ff),
+    Color(0x2e3440ff),
+    Color(0x3b4252ff),
+    Color(0x4c566aff),
+    Color(0xeceff4ff),
+    Color(0xd8dee9ff),
+    Color(0xc2c9d6ff),
+    Color(0xaeb7c6ff),
+    Color(0xa8555dff),
+    Color(0xb77763ff),
+    Color(0xcdb179ff),
+    Color(0x8ba277ff),
+    Color(0x769b9bff),
+    Color(0x72a1aeff),
+    Color(0x5e81acff),
+    Color(0x92738cff),
+    Color(0xbf616aff),
+    Color(0xd08770ff),
+    Color(0xebcb8bff),
+    Color(0xa3be8cff),
+    Color(0x8fbcbbff),
+    Color(0x88c0d0ff),
+    Color(0x81a1c1ff),
+    Color(0xb48eadff),
+];
+
+/// [Arctica](https://github.com/sashakoshka/arctica) color palette.
+pub const ARCTICA_PALETTE: Palette = Palette {
+    base: ARCTICA[0].with_alpha(BASE_ALPHA),
+    base_hover: ARCTICA[1].with_alpha(BASE_HOVER_ALPHA),
+    base_active: ARCTICA[13],
+    surface: ARCTICA[2],
+    overlay: ARCTICA[3],
+    text: ARCTICA[5],
+    black: ARCTICA[3],
+    red: ARCTICA[8],
+    green: ARCTICA[11],
+    yellow: ARCTICA[10],
+    blue: ARCTICA[14],
+    magenta: ARCTICA[15],
+    cyan: ARCTICA[13],
+    white: ARCTICA[7],
 };
 
 /// Common measurements for widget shapes.
@@ -85,7 +137,7 @@ pub struct Theme {
 
 /// The global theme.
 pub const THEME: Theme = Theme {
-    palette: ROSE_PINE_MOON_PALETTE,
+    palette: ARCTICA_PALETTE,
     metrics: Metrics {
         surface_rounding: 5.0,
     },

From 59c34d6aca52c60b9f90a8e17c1bae2572dd9b3a Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 19 Nov 2022 13:09:53 -0700
Subject: [PATCH 33/77] Clean up SAO UI color definitions

---
 scripts/sao-ui/src/style.rs | 109 +++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 52 deletions(-)

diff --git a/scripts/sao-ui/src/style.rs b/scripts/sao-ui/src/style.rs
index 0030c38..c56e702 100644
--- a/scripts/sao-ui/src/style.rs
+++ b/scripts/sao-ui/src/style.rs
@@ -24,6 +24,11 @@ pub const BASE_ALPHA: u8 = 0xc0;
 /// The common base_hover color alpha shared between all themes.
 pub const BASE_HOVER_ALPHA: u8 = 0xe0;
 
+/// Converts 0xrrggbb hex to an opaque [Color].
+pub const fn hex(rgb: u32) -> Color {
+    Color((rgb << 8) | 0xff)
+}
+
 /// Sword Art Online color palette.
 pub const SAO_PALETTE: Palette = Palette {
     base: Color::WHITE.with_alpha(BASE_ALPHA),
@@ -44,66 +49,66 @@ pub const SAO_PALETTE: Palette = Palette {
 
 /// Rose Pine color palette.
 pub const ROSE_PINE_PALETTE: Palette = Palette {
-    base: Color(0x191724ff).with_alpha(BASE_ALPHA),
-    base_hover: Color(0x21202ee0).with_alpha(BASE_HOVER_ALPHA), // Highlight Low
-    base_active: Color(0x403d52ff),                             // Highlight Med
-    surface: Color(0x1f1d2eff),
-    overlay: Color(0x26233aff),
-    text: Color(0xe0def4ff),
-    black: Color(0x6e6a86ff),   // Muted
-    red: Color(0xeb6f92ff),     // Love
-    green: Color(0x7fb59fff),   // ??? (not in Rose Pine?)
-    yellow: Color(0xf6c177ff),  // Gold
-    blue: Color(0x31748fff),    // Pine
-    magenta: Color(0xc4a7e7ff), // Iris
-    cyan: Color(0x9ccfd8ff),    // Foam
-    white: Color(0xe0def4ff),   // Text
+    base: hex(0x191724).with_alpha(BASE_ALPHA),
+    base_hover: hex(0x21202ee0).with_alpha(BASE_HOVER_ALPHA), // Highlight Low
+    base_active: hex(0x403d52),                               // Highlight Med
+    surface: hex(0x1f1d2e),
+    overlay: hex(0x26233a),
+    text: hex(0xe0def4),
+    black: hex(0x6e6a86),   // Muted
+    red: hex(0xeb6f92),     // Love
+    green: hex(0x7fb59f),   // ??? (not in Rose Pine?)
+    yellow: hex(0xf6c177),  // Gold
+    blue: hex(0x31748f),    // Pine
+    magenta: hex(0xc4a7e7), // Iris
+    cyan: hex(0x9ccfd8),    // Foam
+    white: hex(0xe0def4),   // Text
 };
 
 /// Rose Pine Moon color palette.
 pub const ROSE_PINE_MOON_PALETTE: Palette = Palette {
-    base: Color(0x232136ff).with_alpha(BASE_ALPHA),
-    base_hover: Color(0x2a283eff).with_alpha(BASE_HOVER_ALPHA), // Highlight Low
-    base_active: Color(0x44415aff),                             // Highlight Med
-    surface: Color(0x2a273fff),
-    overlay: Color(0x393552),
-    text: Color(0xe0def4ff),
-    black: Color(0x6e6a86ff),   // Muted
-    red: Color(0xeb6f92ff),     // Love
-    green: Color(0x7fb59fff),   // ??? (not in Rose Pine?)
-    yellow: Color(0xf6c177ff),  // Gold
-    blue: Color(0x3e8fb0ff),    // Pine
-    magenta: Color(0xc4a7e7ff), // Iris
-    cyan: Color(0x9ccfd8ff),    // Foam
-    white: Color(0xe0def4ff),   // Text
+    base: hex(0x232136).with_alpha(BASE_ALPHA),
+    base_hover: hex(0x2a283e).with_alpha(BASE_HOVER_ALPHA), // Highlight Low
+    base_active: hex(0x44415a),                             // Highlight Med
+    surface: hex(0x2a273f),
+    overlay: hex(0x393552),
+    text: hex(0xe0def4),
+    black: hex(0x6e6a86),   // Muted
+    red: hex(0xeb6f92),     // Love
+    green: hex(0x7fb59f),   // ??? (not in Rose Pine?)
+    yellow: hex(0xf6c177),  // Gold
+    blue: hex(0x3e8fb0),    // Pine
+    magenta: hex(0xc4a7e7), // Iris
+    cyan: hex(0x9ccfd8),    // Foam
+    white: hex(0xe0def4),   // Text
 };
 
 /// [Arctica](https://github.com/sashakoshka/arctica) indexable color theme.
 pub const ARCTICA: [Color; 24] = [
-    Color(0x242933ff),
-    Color(0x2e3440ff),
-    Color(0x3b4252ff),
-    Color(0x4c566aff),
-    Color(0xeceff4ff),
-    Color(0xd8dee9ff),
-    Color(0xc2c9d6ff),
-    Color(0xaeb7c6ff),
-    Color(0xa8555dff),
-    Color(0xb77763ff),
-    Color(0xcdb179ff),
-    Color(0x8ba277ff),
-    Color(0x769b9bff),
-    Color(0x72a1aeff),
-    Color(0x5e81acff),
-    Color(0x92738cff),
-    Color(0xbf616aff),
-    Color(0xd08770ff),
-    Color(0xebcb8bff),
-    Color(0xa3be8cff),
-    Color(0x8fbcbbff),
-    Color(0x88c0d0ff),
-    Color(0x81a1c1ff),
-    Color(0xb48eadff),
+    hex(0x242933),
+    hex(0x2e3440),
+    hex(0x3b4252),
+    hex(0x4c566a),
+    hex(0xeceff4),
+    hex(0xd8dee9),
+    hex(0xc2c9d6),
+    hex(0xaeb7c6),
+    hex(0xa8555d),
+    hex(0xb77763),
+    hex(0xcdb179),
+    hex(0x8ba277),
+    hex(0x769b9b),
+    hex(0x72a1ae),
+    hex(0x5e81ac),
+    hex(0x92738c),
+    hex(0xbf616a),
+    hex(0xd08770),
+    hex(0xebcb8b),
+    hex(0xa3be8c),
+    hex(0x8fbcbb),
+    hex(0x88c0d0),
+    hex(0x81a1c1),
+    hex(0xb48ead),
 ];
 
 /// [Arctica](https://github.com/sashakoshka/arctica) color palette.

From d7323323f8b07a15bf6d291c54ba738b54b7f0d6 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 19 Nov 2022 15:11:09 -0700
Subject: [PATCH 34/77] Add SAO UI Palette widget

---
 scripts/sao-ui/src/main_menu.rs       |  23 +++++-
 scripts/sao-ui/src/style.rs           |  21 +++++
 scripts/sao-ui/src/widgets/mod.rs     |   1 +
 scripts/sao-ui/src/widgets/palette.rs | 106 ++++++++++++++++++++++++++
 4 files changed, 149 insertions(+), 2 deletions(-)
 create mode 100644 scripts/sao-ui/src/widgets/palette.rs

diff --git a/scripts/sao-ui/src/main_menu.rs b/scripts/sao-ui/src/main_menu.rs
index 8ae2206..b921a46 100644
--- a/scripts/sao-ui/src/main_menu.rs
+++ b/scripts/sao-ui/src/main_menu.rs
@@ -7,6 +7,7 @@ use crate::{DrawContext, Rect};
 use button::{RectButton, RoundButton, RoundButtonStyle};
 use dialog::{Dialog, DialogInfo, DialogResponse, DialogStyle};
 use menu::{SlotMenu, SlotMenuEvent, TabMenu};
+use palette::Palette;
 use shell::{Offset, OffsetAlignment, Popup, Reveal};
 use text::LabelText;
 
@@ -47,6 +48,7 @@ pub struct MainMenu {
     pub menu: Offset<SlotMenu<RoundButton>>,
     pub player_info: Reveal<Offset<PlayerInfo>>,
     pub inventory: Reveal<Offset<TabMenu>>,
+    pub palette: Reveal<Offset<Palette>>,
     pub settings: Reveal<Offset<SettingsMenu>>,
 }
 
@@ -102,6 +104,15 @@ impl Default for MainMenu {
         let inventory = Offset::new(inventory, submenu_spacing_right);
         let inventory = Reveal::new(inventory, reveal_slide, reveal_duration);
 
+        let palette = Palette::new(Default::default());
+        let palette = Offset::new_aligned(
+            palette,
+            submenu_spacing_left,
+            OffsetAlignment::End,
+            OffsetAlignment::Center,
+        );
+        let palette = Reveal::new(palette, -reveal_slide, reveal_duration);
+
         let settings = SettingsMenu::new();
         let settings = Offset::new(settings, submenu_spacing_right);
         let settings = Reveal::new(settings, reveal_slide, reveal_duration);
@@ -110,6 +121,7 @@ impl Default for MainMenu {
             menu,
             player_info,
             inventory,
+            palette,
             settings,
         }
     }
@@ -120,6 +132,7 @@ impl Container for MainMenu {
         f(&mut self.menu);
         f(&mut self.player_info);
         f(&mut self.inventory);
+        f(&mut self.palette);
         f(&mut self.settings);
     }
 
@@ -139,8 +152,14 @@ impl Container for MainMenu {
                 self.player_info.hide();
                 self.inventory.hide();
             }
-            SlotMenuEvent::SubmenuOpen(4) => self.settings.show(),
-            SlotMenuEvent::SubmenuClose(4) => self.settings.hide(),
+            SlotMenuEvent::SubmenuOpen(4) => {
+                self.palette.show();
+                self.settings.show();
+            }
+            SlotMenuEvent::SubmenuClose(4) => {
+                self.palette.hide();
+                self.settings.hide();
+            }
             _ => {}
         };
     }
diff --git a/scripts/sao-ui/src/style.rs b/scripts/sao-ui/src/style.rs
index c56e702..afc002f 100644
--- a/scripts/sao-ui/src/style.rs
+++ b/scripts/sao-ui/src/style.rs
@@ -18,6 +18,27 @@ pub struct Palette {
     pub white: Color,
 }
 
+impl Palette {
+    pub fn make_label_pairs(&self) -> Vec<(&'static str, Color)> {
+        vec![
+            ("Base", self.base),
+            ("Base Hover", self.base_hover),
+            ("Base Active", self.base_active),
+            ("Surface", self.surface),
+            ("Overlay", self.overlay),
+            ("Text", self.text),
+            ("Black", self.black),
+            ("Red", self.red),
+            ("Green", self.green),
+            ("Yellow", self.yellow),
+            ("Blue", self.blue),
+            ("Magenta", self.magenta),
+            ("Cyan", self.cyan),
+            ("White", self.white),
+        ]
+    }
+}
+
 /// The common base color alpha shared between all themes.
 pub const BASE_ALPHA: u8 = 0xc0;
 
diff --git a/scripts/sao-ui/src/widgets/mod.rs b/scripts/sao-ui/src/widgets/mod.rs
index fee8899..310bf1a 100644
--- a/scripts/sao-ui/src/widgets/mod.rs
+++ b/scripts/sao-ui/src/widgets/mod.rs
@@ -8,6 +8,7 @@ pub mod button;
 pub mod dialog;
 pub mod flex;
 pub mod menu;
+pub mod palette;
 pub mod scroll;
 pub mod shell;
 pub mod text;
diff --git a/scripts/sao-ui/src/widgets/palette.rs b/scripts/sao-ui/src/widgets/palette.rs
new file mode 100644
index 0000000..d045feb
--- /dev/null
+++ b/scripts/sao-ui/src/widgets/palette.rs
@@ -0,0 +1,106 @@
+use super::prelude::*;
+use shell::Offset;
+use text::{HorizontalAlignment, Label, LabelText};
+
+pub struct PaletteStyle {
+    pub bg: Color,
+    pub text: Color,
+    pub rounding: f32,
+    pub text_size: f32,
+    pub line_spacing: f32,
+    pub color_radius: f32,
+    pub margin: Rect,
+}
+
+impl Default for PaletteStyle {
+    fn default() -> Self {
+        Self {
+            bg: THEME.palette.surface,
+            text: THEME.palette.text,
+            rounding: THEME.metrics.surface_rounding,
+            text_size: 5.0,
+            line_spacing: 8.0,
+            color_radius: 3.0,
+            margin: Rect::from_xy_size(Vec2::splat(10.0), Vec2::ZERO),
+        }
+    }
+}
+
+/// A widget that displays all the colors in the global palette.
+pub struct Palette {
+    body: Rect,
+    style: PaletteStyle,
+    labels: Vec<Offset<Label>>,
+    colors: Vec<(Vec2, Color)>,
+}
+
+impl Palette {
+    pub fn new(style: PaletteStyle) -> Self {
+        let width = 70.0;
+        let pairs = THEME.palette.make_label_pairs();
+        let label_font = Font::new(crate::CONTENT_FONT);
+
+        let mut label_cursor = Vec2::new(0.0, style.line_spacing) + style.margin.tl;
+        let mut color_cursor = Vec2::new(
+            width - style.margin.br.x,
+            style.line_spacing / 2.0 + style.margin.tl.y,
+        );
+        let mut labels = Vec::new();
+        let mut colors = Vec::new();
+
+        for (text, color) in pairs {
+            let text = LabelText {
+                font: label_font,
+                text: text.to_string(),
+            };
+
+            let label = Label::new(
+                text,
+                HorizontalAlignment::Left,
+                style.text_size,
+                style.text,
+                0.0,
+                0.0,
+                0.0,
+            );
+
+            let label = Offset::new(label, label_cursor);
+
+            labels.push(label);
+
+            colors.push((color_cursor, color));
+
+            label_cursor.y += style.line_spacing;
+            color_cursor.y += style.line_spacing;
+        }
+
+        let height = label_cursor.y + style.margin.br.y;
+
+        Self {
+            body: Rect::from_xy_size(Vec2::ZERO, Vec2::new(width, height)),
+            style,
+            labels,
+            colors,
+        }
+    }
+}
+
+impl RectBounds for Palette {
+    fn get_bounds(&self) -> Rect {
+        self.body
+    }
+}
+
+impl Widget for Palette {
+    fn draw(&mut self, ctx: &DrawContext) {
+        ctx.draw_rounded_rect(self.body, self.style.rounding, self.style.bg);
+
+        for label in self.labels.iter_mut() {
+            label.draw(ctx);
+        }
+
+        for (center, color) in self.colors.iter() {
+            ctx.draw_circle(*center, self.style.color_radius, *color);
+        }
+    }
+}

From 55859ab5c0508cece2b252f3124470d3b007da4c Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 19 Nov 2022 21:42:16 -0700
Subject: [PATCH 35/77] Super WIP zbus-based music player

---
 apps/music-player/Cargo.toml   |  5 +-
 apps/music-player/src/main.rs  | 88 +++++++++++++++++++++-------------
 apps/music-player/src/mpris.rs | 25 ++++++++++
 3 files changed, 83 insertions(+), 35 deletions(-)
 create mode 100644 apps/music-player/src/mpris.rs

diff --git a/apps/music-player/Cargo.toml b/apps/music-player/Cargo.toml
index 2aed4fe..36582b5 100644
--- a/apps/music-player/Cargo.toml
+++ b/apps/music-player/Cargo.toml
@@ -11,9 +11,10 @@ required-features = ["bin"]
 
 [dependencies]
 canary-magpie = { path = "../magpie", optional = true }
-mpris = { version = "2.0.0-rc3", optional = true }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
+smol = { version = "1.2", optional = true }
+zbus = { version = "3.5", optional = true }
 
 [features]
-bin = ["dep:canary-magpie", "dep:mpris"]
+bin = ["dep:canary-magpie", "dep:smol", "dep:zbus"]
diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 5f07f12..23ad88e 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -1,46 +1,52 @@
 // Copyright (c) 2022 Marceline Cramer
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-use canary_music_player::*;
 use canary_magpie::client::MagpieClient;
 use canary_magpie::protocol::{CreatePanel, MagpieServerMsg};
 use canary_music_player::*;
-use mpris::PlayerFinder;
 
-pub struct MetadataTracker {
+pub mod mpris;
+
+use mpris::*;
+
+pub struct Metadata {
     pub album: AlbumInfo,
     pub track: TrackInfo,
 }
 
-impl From<&mpris::Metadata> for MetadataTracker {
-    fn from(metadata: &mpris::Metadata) -> Self {
+impl<'a> From<&MetadataMap<'a>> for Metadata {
+    fn from(map: &MetadataMap<'a>) -> Self {
         let album = AlbumInfo {
-            title: metadata.album_name().map(ToString::to_string),
-            artists: metadata
-                .album_artists()
-                .unwrap_or(Vec::new())
-                .iter()
-                .map(ToString::to_string)
-                .collect(),
+            title: map
+                .get("xesam:album")
+                .and_then(|v| TryFrom::try_from(v).ok()),
+            artists: map
+                .get("xesam:albumArtist")
+                .cloned()
+                .and_then(|v| TryFrom::try_from(v).ok())
+                .unwrap_or(Vec::new()),
         };
 
         let track = TrackInfo {
-            title: metadata.title().map(ToString::to_string),
-            artists: metadata
-                .artists()
-                .unwrap_or(Vec::new())
-                .iter()
-                .map(ToString::to_string)
-                .collect(),
-            track_number: metadata.track_number(),
+            title: map
+                .get("xesam:title")
+                .and_then(|v| TryFrom::try_from(v).ok()),
+            artists: map
+                .get("xesam:artist")
+                .cloned()
+                .and_then(|v| TryFrom::try_from(v).ok())
+                .unwrap_or(Vec::new()),
+            track_number: map
+                .get("xesam:trackNumber")
+                .and_then(|v| TryFrom::try_from(v).ok()),
         };
 
         Self { album, track }
     }
 }
 
-impl MetadataTracker {
-    pub fn new(magpie: &mut MagpieClient, metadata: &mpris::Metadata) -> Self {
+/*impl MetadataTracker {
+    pub fn new(magpie: &mut MagpieClient, metadata: &MetadataMap) -> Self {
         let new: Self = metadata.into();
         magpie.send_json_message(0, &InMsg::AlbumChanged(new.album.clone()));
         magpie.send_json_message(0, &InMsg::TrackChanged(new.track.clone()));
@@ -54,7 +60,7 @@ impl MetadataTracker {
         new
     }
 
-    pub fn update(&mut self, messenger: &mut MagpieClient, metadata: &mpris::Metadata) {
+    pub fn update(&mut self, messenger: &mut MagpieClient, metadata: &MetadataMap) {
         let new: Self = metadata.into();
 
         if self.album != new.album {
@@ -74,7 +80,7 @@ impl MetadataTracker {
 
         *self = new;
     }
-}
+}*/
 
 fn main() {
     let args: Vec<String> = std::env::args().collect();
@@ -83,16 +89,32 @@ fn main() {
         .expect("Please pass a path to a Canary script!")
         .to_owned();
 
-    let player_finder = PlayerFinder::new().expect("Could not connect to D-Bus");
-
     let mut magpie = MagpieClient::new().unwrap();
-    let protocol = "tebibyte-media.desktop.music-player-controller".to_string();
-    let script = std::path::PathBuf::from(&module_path);
-    let msg = CreatePanel { id: 0, protocol, script };
-    let msg = MagpieServerMsg::CreatePanel(msg);
-    magpie.messenger.send(&msg).unwrap();
 
-    let mut first_loop = true;
+    let result: Result<(), Box<dyn std::error::Error>> = smol::block_on(async {
+        let dbus = zbus::Connection::session().await?;
+        let player = PlayerProxy::new(&dbus).await?;
+
+        let protocol = "tebibyte-media.desktop.music-player-controller".to_string();
+        let script = std::path::PathBuf::from(&module_path);
+        let msg = CreatePanel {
+            id: 0,
+            protocol,
+            script,
+        };
+        let msg = MagpieServerMsg::CreatePanel(msg);
+        magpie.messenger.send(&msg).unwrap();
+
+        std::future::pending::<()>().await;
+
+        Ok(())
+    });
+
+    if let Err(err) = result {
+        eprintln!("Music player error: {:?}", err);
+    }
+
+    /*let mut first_loop = true;
     let mut connected = false;
 
     loop {
@@ -183,5 +205,5 @@ fn main() {
                 magpie.send_json_message(0, &msg);
             }
         }
-    }
+    }*/
 }
diff --git a/apps/music-player/src/mpris.rs b/apps/music-player/src/mpris.rs
new file mode 100644
index 0000000..0402bcd
--- /dev/null
+++ b/apps/music-player/src/mpris.rs
@@ -0,0 +1,25 @@
+use std::collections::HashMap;
+
+use zbus::zvariant::Value;
+use zbus::{dbus_proxy, Result};
+
+pub type MetadataMap<'a> = HashMap<String, Value<'a>>;
+
+#[dbus_proxy(interface = "org.mpris.MediaPlayer2.Player")]
+trait Player {
+    fn next(&self) -> Result<()>;
+    fn previous(&self) -> Result<()>;
+    fn pause(&self) -> Result<()>;
+    fn play_pause(&self) -> Result<()>;
+    fn stop(&self) -> Result<()>;
+    fn play(&self) -> Result<()>;
+
+    #[dbus_proxy(property)]
+    fn playback_status(&self) -> Result<String>;
+
+    #[dbus_proxy(property)]
+    fn position(&self) -> Result<i64>;
+
+    #[dbus_proxy(property)]
+    fn metadata(&self) -> Result<MetadataMap>;
+}

From a2432f77d2fcc94bdc3c6060647e287a49adbcbd Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 19 Nov 2022 22:16:53 -0700
Subject: [PATCH 36/77] Find active player and listen for playback status
 changes

---
 apps/music-player/src/main.rs  | 10 +++++++++-
 apps/music-player/src/mpris.rs | 26 ++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 23ad88e..6560590 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -8,6 +8,7 @@ use canary_music_player::*;
 pub mod mpris;
 
 use mpris::*;
+use smol::stream::StreamExt;
 
 pub struct Metadata {
     pub album: AlbumInfo,
@@ -93,7 +94,14 @@ fn main() {
 
     let result: Result<(), Box<dyn std::error::Error>> = smol::block_on(async {
         let dbus = zbus::Connection::session().await?;
-        let player = PlayerProxy::new(&dbus).await?;
+        let player = find_player(&dbus).await?.unwrap();
+
+        let mut playback_status = player.receive_playback_status_changed().await;
+        while let Some(status) = playback_status.next().await {
+            println!("Status: {}", status.get().await?);
+        }
+
+        println!("Done looping.");
 
         let protocol = "tebibyte-media.desktop.music-player-controller".to_string();
         let script = std::path::PathBuf::from(&module_path);
diff --git a/apps/music-player/src/mpris.rs b/apps/music-player/src/mpris.rs
index 0402bcd..74e47c2 100644
--- a/apps/music-player/src/mpris.rs
+++ b/apps/music-player/src/mpris.rs
@@ -1,11 +1,15 @@
 use std::collections::HashMap;
 
+use zbus::fdo::DBusProxy;
 use zbus::zvariant::Value;
-use zbus::{dbus_proxy, Result};
+use zbus::{dbus_proxy, Connection, Result};
 
 pub type MetadataMap<'a> = HashMap<String, Value<'a>>;
 
-#[dbus_proxy(interface = "org.mpris.MediaPlayer2.Player")]
+#[dbus_proxy(
+    interface = "org.mpris.MediaPlayer2.Player",
+    default_path = "/org/mpris/MediaPlayer2"
+)]
 trait Player {
     fn next(&self) -> Result<()>;
     fn previous(&self) -> Result<()>;
@@ -23,3 +27,21 @@ trait Player {
     #[dbus_proxy(property)]
     fn metadata(&self) -> Result<MetadataMap>;
 }
+
+pub async fn find_player(connection: &Connection) -> Result<Option<PlayerProxy>> {
+    let dbus = DBusProxy::new(connection).await?;
+    let names = dbus.list_names().await?;
+
+    for name in names {
+        let name = name.as_str().to_string();
+        if name.starts_with("org.mpris.MediaPlayer2") {
+            let player = PlayerProxy::builder(connection)
+                .destination(name)?
+                .build()
+                .await?;
+            return Ok(Some(player));
+        }
+    }
+
+    Ok(None)
+}

From 15f9c7ea992049460ab8aa4691fef1ceff0f2496 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 19 Nov 2022 22:57:33 -0700
Subject: [PATCH 37/77] Listen for multiple property changes

---
 apps/music-player/Cargo.toml  |  3 ++-
 apps/music-player/src/main.rs | 29 +++++++++++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/music-player/Cargo.toml b/apps/music-player/Cargo.toml
index 36582b5..107df85 100644
--- a/apps/music-player/Cargo.toml
+++ b/apps/music-player/Cargo.toml
@@ -11,10 +11,11 @@ required-features = ["bin"]
 
 [dependencies]
 canary-magpie = { path = "../magpie", optional = true }
+futures-util = { version = "0.3", optional = true }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 smol = { version = "1.2", optional = true }
 zbus = { version = "3.5", optional = true }
 
 [features]
-bin = ["dep:canary-magpie", "dep:smol", "dep:zbus"]
+bin = ["dep:canary-magpie", "dep:futures-util", "dep:smol", "dep:zbus"]
diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 6560590..4adce75 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -8,7 +8,6 @@ use canary_music_player::*;
 pub mod mpris;
 
 use mpris::*;
-use smol::stream::StreamExt;
 
 pub struct Metadata {
     pub album: AlbumInfo,
@@ -96,12 +95,30 @@ fn main() {
         let dbus = zbus::Connection::session().await?;
         let player = find_player(&dbus).await?.unwrap();
 
-        let mut playback_status = player.receive_playback_status_changed().await;
-        while let Some(status) = playback_status.next().await {
-            println!("Status: {}", status.get().await?);
-        }
+        use futures_util::StreamExt;
+        let mut playback_status = player.receive_playback_status_changed().await.fuse();
+        let mut metadata = player.receive_metadata_changed().await.fuse();
 
-        println!("Done looping.");
+        loop {
+            futures_util::select! {
+                status = playback_status.next() => {
+                    let status = match status {
+                        Some(v) => v,
+                        None => break,
+                    };
+
+                    println!("Status: {}", status.get().await?);
+                }
+                metadata = metadata.next() => {
+                    let metadata = match metadata {
+                        Some(v) => v,
+                        None => break,
+                    };
+
+                    println!("Metadata: {:#?}", metadata.get().await?);
+                }
+            };
+        }
 
         let protocol = "tebibyte-media.desktop.music-player-controller".to_string();
         let script = std::path::PathBuf::from(&module_path);

From 7e4900c59b386922e56dc88c80dcef307bea3422 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 19 Nov 2022 23:11:17 -0700
Subject: [PATCH 38/77] Parse metadata

---
 apps/music-player/src/main.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 4adce75..9f28d23 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -9,6 +9,7 @@ pub mod mpris;
 
 use mpris::*;
 
+#[derive(Debug)]
 pub struct Metadata {
     pub album: AlbumInfo,
     pub track: TrackInfo,
@@ -115,7 +116,10 @@ fn main() {
                         None => break,
                     };
 
-                    println!("Metadata: {:#?}", metadata.get().await?);
+                    let map = metadata.get().await?.into();
+                    let metadata = Metadata::from(&map);
+
+                    println!("Metadata: {:#?}", metadata);
                 }
             };
         }

From a65164d70b549082e14c8931a5669f2defd6998a Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 19 Nov 2022 23:33:06 -0700
Subject: [PATCH 39/77] Music player lifetime loop

---
 apps/music-player/src/main.rs | 120 +++++++++++++++++++++++-----------
 1 file changed, 83 insertions(+), 37 deletions(-)

diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 9f28d23..479f211 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -83,6 +83,41 @@ impl<'a> From<&MetadataMap<'a>> for Metadata {
     }
 }*/
 
+async fn player_main(
+    player: &PlayerProxy<'_>,
+    magpie: &mut MagpieClient,
+) -> Result<(), Box<dyn std::error::Error>> {
+    use futures_util::StreamExt;
+    let mut playback_status = player.receive_playback_status_changed().await.fuse();
+    let mut metadata = player.receive_metadata_changed().await.fuse();
+
+    loop {
+        futures_util::select! {
+            status = playback_status.next() => {
+                let status = match status {
+                    Some(v) => v,
+                    None => break,
+                };
+
+                println!("Status: {}", status.get().await?);
+            }
+            metadata = metadata.next() => {
+                let metadata = match metadata {
+                    Some(v) => v,
+                    None => break,
+                };
+
+                let map = metadata.get().await?.into();
+                let metadata = Metadata::from(&map);
+
+                println!("Metadata: {:#?}", metadata);
+            }
+        };
+    }
+
+    Ok(())
+}
+
 fn main() {
     let args: Vec<String> = std::env::args().collect();
     let module_path = args
@@ -92,37 +127,8 @@ fn main() {
 
     let mut magpie = MagpieClient::new().unwrap();
 
-    let result: Result<(), Box<dyn std::error::Error>> = smol::block_on(async {
-        let dbus = zbus::Connection::session().await?;
-        let player = find_player(&dbus).await?.unwrap();
-
-        use futures_util::StreamExt;
-        let mut playback_status = player.receive_playback_status_changed().await.fuse();
-        let mut metadata = player.receive_metadata_changed().await.fuse();
-
-        loop {
-            futures_util::select! {
-                status = playback_status.next() => {
-                    let status = match status {
-                        Some(v) => v,
-                        None => break,
-                    };
-
-                    println!("Status: {}", status.get().await?);
-                }
-                metadata = metadata.next() => {
-                    let metadata = match metadata {
-                        Some(v) => v,
-                        None => break,
-                    };
-
-                    let map = metadata.get().await?.into();
-                    let metadata = Metadata::from(&map);
-
-                    println!("Metadata: {:#?}", metadata);
-                }
-            };
-        }
+    smol::block_on(async {
+        let dbus = zbus::Connection::session().await.unwrap();
 
         let protocol = "tebibyte-media.desktop.music-player-controller".to_string();
         let script = std::path::PathBuf::from(&module_path);
@@ -134,15 +140,55 @@ fn main() {
         let msg = MagpieServerMsg::CreatePanel(msg);
         magpie.messenger.send(&msg).unwrap();
 
-        std::future::pending::<()>().await;
+        let mut first_loop = true;
+        let mut connected = false;
 
-        Ok(())
+        loop {
+            if !first_loop {
+                let wait = std::time::Duration::from_secs(1);
+                std::thread::sleep(wait);
+            }
+
+            first_loop = false;
+
+            if connected {
+                println!("Disconnected from MPRIS");
+                let msg = InMsg::Disconnected;
+                magpie.send_json_message(0, &msg);
+                connected = false;
+            }
+
+            println!("Connecting to MPRIS...");
+
+            let player = match find_player(&dbus).await {
+                Ok(Some(player)) => player,
+                Ok(None) => {
+                    eprintln!("Couldn't find player");
+                    continue;
+                }
+                Err(err) => {
+                    eprintln!("D-Bus error while finding player: {:?}", err);
+                    return;
+                }
+            };
+
+            println!(
+                "Connected to \"{}\" ({})",
+                player.path().as_str(),
+                player.destination().as_str()
+            );
+            connected = true;
+            magpie.send_json_message(0, &InMsg::Connected);
+
+            match player_main(&player, &mut magpie).await {
+                Ok(()) => {}
+                Err(err) => {
+                    eprintln!("D-Bus error while connected to player: {:?}", err);
+                }
+            }
+        }
     });
 
-    if let Err(err) = result {
-        eprintln!("Music player error: {:?}", err);
-    }
-
     /*let mut first_loop = true;
     let mut connected = false;
 

From 13a9735bdcf9ad9c6a3226724d245bbe7c309311 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 19 Nov 2022 23:51:34 -0700
Subject: [PATCH 40/77] Update script playback status + metadata

---
 apps/music-player/src/main.rs | 52 ++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 479f211..b4a77f1 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -15,8 +15,8 @@ pub struct Metadata {
     pub track: TrackInfo,
 }
 
-impl<'a> From<&MetadataMap<'a>> for Metadata {
-    fn from(map: &MetadataMap<'a>) -> Self {
+impl<'a> From<MetadataMap<'a>> for Metadata {
+    fn from(map: MetadataMap<'a>) -> Self {
         let album = AlbumInfo {
             title: map
                 .get("xesam:album")
@@ -46,22 +46,15 @@ impl<'a> From<&MetadataMap<'a>> for Metadata {
     }
 }
 
-/*impl MetadataTracker {
-    pub fn new(magpie: &mut MagpieClient, metadata: &MetadataMap) -> Self {
+impl Metadata {
+    pub fn new(magpie: &mut MagpieClient, metadata: MetadataMap) -> Self {
         let new: Self = metadata.into();
         magpie.send_json_message(0, &InMsg::AlbumChanged(new.album.clone()));
         magpie.send_json_message(0, &InMsg::TrackChanged(new.track.clone()));
-        magpie.send_json_message(
-            0,
-            &InMsg::ProgressChanged(ProgressChanged {
-                position: 0.0,
-                length: metadata.length().map(|l| l.as_secs_f32()),
-            }),
-        );
         new
     }
 
-    pub fn update(&mut self, messenger: &mut MagpieClient, metadata: &MetadataMap) {
+    pub fn update(&mut self, messenger: &mut MagpieClient, metadata: MetadataMap) {
         let new: Self = metadata.into();
 
         if self.album != new.album {
@@ -70,18 +63,11 @@ impl<'a> From<&MetadataMap<'a>> for Metadata {
 
         if self.track != new.track {
             messenger.send_json_message(0, &InMsg::TrackChanged(new.track.clone()));
-            messenger.send_json_message(
-                0,
-                &InMsg::ProgressChanged(ProgressChanged {
-                    position: 0.0,
-                    length: metadata.length().map(|l| l.as_secs_f32()),
-                }),
-            );
         }
 
         *self = new;
     }
-}*/
+}
 
 async fn player_main(
     player: &PlayerProxy<'_>,
@@ -89,7 +75,9 @@ async fn player_main(
 ) -> Result<(), Box<dyn std::error::Error>> {
     use futures_util::StreamExt;
     let mut playback_status = player.receive_playback_status_changed().await.fuse();
-    let mut metadata = player.receive_metadata_changed().await.fuse();
+    let mut metadata_tracker = player.receive_metadata_changed().await.fuse();
+
+    let mut metadata = Metadata::new(magpie, player.metadata().await?);
 
     loop {
         futures_util::select! {
@@ -99,18 +87,26 @@ async fn player_main(
                     None => break,
                 };
 
-                println!("Status: {}", status.get().await?);
+                let status = status.get().await?;
+                let status = match status.as_str() {
+                    "Playing" => Some(PlaybackStatus::Playing),
+                    "Paused" =>  Some(PlaybackStatus::Paused),
+                    "Stopped" => Some(PlaybackStatus::Stopped),
+                    _ => None,
+                };
+
+                if let Some(status) = status {
+                    magpie.send_json_message(0, &InMsg::PlaybackStatusChanged(status));
+                }
             }
-            metadata = metadata.next() => {
-                let metadata = match metadata {
+            new_metadata = metadata_tracker.next() => {
+                let new_metadata = match new_metadata {
                     Some(v) => v,
                     None => break,
                 };
 
-                let map = metadata.get().await?.into();
-                let metadata = Metadata::from(&map);
-
-                println!("Metadata: {:#?}", metadata);
+                let new_metadata = new_metadata.get().await?;
+                metadata.update(magpie, new_metadata);
             }
         };
     }

From 9eb2c1c4312adead7c81047aec838d9b1024efda Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 19 Nov 2022 23:56:09 -0700
Subject: [PATCH 41/77] Remove old mpris comments

---
 apps/music-player/src/main.rs | 94 +----------------------------------
 1 file changed, 1 insertion(+), 93 deletions(-)

diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index b4a77f1..dec15f9 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -81,6 +81,7 @@ async fn player_main(
 
     loop {
         futures_util::select! {
+            // TODO also update volume, shuffle status, and loop status
             status = playback_status.next() => {
                 let status = match status {
                     Some(v) => v,
@@ -184,97 +185,4 @@ fn main() {
             }
         }
     });
-
-    /*let mut first_loop = true;
-    let mut connected = false;
-
-    loop {
-        if !first_loop {
-            let wait = std::time::Duration::from_secs(1);
-            std::thread::sleep(wait);
-        }
-
-        first_loop = false;
-
-        if connected {
-            println!("Disconnected from MPRIS");
-            let msg = InMsg::Disconnected;
-            magpie.send_json_message(0, &msg);
-            connected = false;
-        }
-
-        println!("Connecting to MPRIS...");
-
-        let player = match player_finder.find_active() {
-            Ok(player) => player,
-            Err(err) => {
-                eprintln!("Couldn't find player: {:?}", err);
-                continue;
-            }
-        };
-
-        println!(
-            "Connected to \"{}\" ({})",
-            player.identity(),
-            player.bus_name()
-        );
-        connected = true;
-        magpie.send_json_message(0, &InMsg::Connected);
-
-        let metadata = player.get_metadata().unwrap();
-        let mut metadata_tracker = MetadataTracker::new(&mut magpie, &metadata);
-
-        let mut events = match player.events() {
-            Ok(events) => events,
-            Err(err) => {
-                eprintln!("Player events D-Bus error: {:?}", err);
-                continue;
-            }
-        };
-
-        loop {
-            let event = match events.next() {
-                None => break,
-                Some(Ok(e)) => e,
-                Some(Err(err)) => {
-                    eprintln!("D-Bus error while reading player events: {:?}", err);
-                    continue;
-                }
-            };
-
-            use mpris::Event::*;
-            let in_msg = match event {
-                Playing => Some(InMsg::PlaybackStatusChanged(PlaybackStatus::Playing)),
-                Paused => Some(InMsg::PlaybackStatusChanged(PlaybackStatus::Paused)),
-                Stopped => Some(InMsg::PlaybackStatusChanged(PlaybackStatus::Stopped)),
-                LoopingChanged(status) => {
-                    use mpris::LoopStatus::*;
-                    let status = match status {
-                        None => LoopStatus::None,
-                        Track => LoopStatus::Track,
-                        Playlist => LoopStatus::Playlist,
-                    };
-
-                    Some(InMsg::LoopingChanged(status))
-                }
-                ShuffleToggled(shuffle) => Some(InMsg::ShuffleChanged { shuffle }),
-                VolumeChanged(volume) => Some(InMsg::VolumeChanged {
-                    volume: volume as f32,
-                }),
-                PlayerShutDown => None,
-                TrackChanged(ref metadata) => {
-                    metadata_tracker.update(&mut magpie, metadata);
-                    None
-                }
-                _ => {
-                    eprintln!("Unhandled MPRIS message: {:?}", event);
-                    None
-                }
-            };
-
-            if let Some(msg) = in_msg {
-                magpie.send_json_message(0, &msg);
-            }
-        }
-    }*/
 }

From 1fe366ce9f043561c43a3c9ea0b95205a414fa27 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 00:00:21 -0700
Subject: [PATCH 42/77] Move progress length to TrackInfo

---
 apps/music-player/src/lib.rs  | 8 ++++----
 apps/music-player/src/main.rs | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/music-player/src/lib.rs b/apps/music-player/src/lib.rs
index d3ecabb..e7cdd2b 100644
--- a/apps/music-player/src/lib.rs
+++ b/apps/music-player/src/lib.rs
@@ -34,9 +34,6 @@ pub enum LoopStatus {
 pub struct ProgressChanged {
     /// Current position into the track in seconds.
     pub position: f32,
-
-    /// Length of the current track in seconds.
-    pub length: Option<f32>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
@@ -48,7 +45,7 @@ pub struct AlbumInfo {
     pub artists: Vec<String>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct TrackInfo {
     /// The title of the current track.
     pub title: Option<String>,
@@ -58,6 +55,9 @@ pub struct TrackInfo {
 
     /// The optional track number on the disc the album the track appears on.
     pub track_number: Option<i32>,
+
+    /// Length of the track in seconds.
+    pub length: Option<f32>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index dec15f9..212cf68 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -40,6 +40,10 @@ impl<'a> From<MetadataMap<'a>> for Metadata {
             track_number: map
                 .get("xesam:trackNumber")
                 .and_then(|v| TryFrom::try_from(v).ok()),
+            length: map
+                .get("xesam:length")
+                .and_then(|v| i64::try_from(v).ok())
+                .map(|us| us as f32 / 1_000_000.0), // 1,000,000 microseconds in a second
         };
 
         Self { album, track }

From 2df2bd3f8fb11493443d625d04ac20f3fb74ea67 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 00:00:43 -0700
Subject: [PATCH 43/77] Use new length position in SAO UI

---
 scripts/sao-ui/src/music_player.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/sao-ui/src/music_player.rs b/scripts/sao-ui/src/music_player.rs
index f0e190c..d154599 100644
--- a/scripts/sao-ui/src/music_player.rs
+++ b/scripts/sao-ui/src/music_player.rs
@@ -336,17 +336,17 @@ impl MusicPlayerWidget {
                 .map(|s| s.as_str())
                 .unwrap_or("<album here>"),
         );
+
+        if let Some(length) = info.length {
+            self.duration.set_text(&Self::format_time(length));
+        } else {
+            self.duration.set_text("--:--");
+        }
     }
 
     pub fn update_progress(&mut self, progress: ProgressChanged) {
         self.position_secs = progress.position;
         self.position_dirty = true;
-
-        if let Some(length) = progress.length {
-            self.duration.set_text(&Self::format_time(length));
-        } else {
-            self.duration.set_text("--:--");
-        }
     }
 
     pub fn update_playback_status(&mut self, status: PlaybackStatus) {

From 452cb9c70856d449c8ccb7a98b8df09a2afda894 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 00:28:49 -0700
Subject: [PATCH 44/77] Music player reads mpris:length instead of xesam:length

---
 apps/music-player/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 212cf68..9872c00 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -41,7 +41,7 @@ impl<'a> From<MetadataMap<'a>> for Metadata {
                 .get("xesam:trackNumber")
                 .and_then(|v| TryFrom::try_from(v).ok()),
             length: map
-                .get("xesam:length")
+                .get("mpris:length")
                 .and_then(|v| i64::try_from(v).ok())
                 .map(|us| us as f32 / 1_000_000.0), // 1,000,000 microseconds in a second
         };

From d99c64f33e8e2ac351edc46d3bc0125b05031db0 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 00:33:05 -0700
Subject: [PATCH 45/77] Track position

---
 apps/music-player/src/main.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 9872c00..bbdffb8 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -80,6 +80,7 @@ async fn player_main(
     use futures_util::StreamExt;
     let mut playback_status = player.receive_playback_status_changed().await.fuse();
     let mut metadata_tracker = player.receive_metadata_changed().await.fuse();
+    let mut position_tracker = player.receive_position_changed().await.fuse();
 
     let mut metadata = Metadata::new(magpie, player.metadata().await?);
 
@@ -104,6 +105,17 @@ async fn player_main(
                     magpie.send_json_message(0, &InMsg::PlaybackStatusChanged(status));
                 }
             }
+            position = position_tracker.next() => {
+                let position = match position {
+                    Some(v) => v,
+                    None => break,
+                };
+
+                let position = position.get().await?;
+                let position = position as f32 / 1_000_000.0; // Microseconds to seconds
+                let progress = ProgressChanged { position };
+                magpie.send_json_message(0, &InMsg::ProgressChanged(progress));
+            }
             new_metadata = metadata_tracker.next() => {
                 let new_metadata = match new_metadata {
                     Some(v) => v,

From d5b168ebc9d757b1daa93e4b073efeb9368719d3 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 00:37:11 -0700
Subject: [PATCH 46/77] Music player resets position on track change

---
 apps/music-player/src/main.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index bbdffb8..47deb51 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -67,6 +67,8 @@ impl Metadata {
 
         if self.track != new.track {
             messenger.send_json_message(0, &InMsg::TrackChanged(new.track.clone()));
+            let progress = ProgressChanged { position: 0.0 };
+            messenger.send_json_message(0, &InMsg::ProgressChanged(progress));
         }
 
         *self = new;

From 6c2bfc0ea536eff2d626f7212c5c87facf8c442b Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 10:48:49 -0700
Subject: [PATCH 47/77] Split Messenger into MessageQueue

---
 apps/magpie/src/protocol.rs | 95 +++++++++++++++++++++++--------------
 1 file changed, 60 insertions(+), 35 deletions(-)

diff --git a/apps/magpie/src/protocol.rs b/apps/magpie/src/protocol.rs
index 650fb80..e466258 100644
--- a/apps/magpie/src/protocol.rs
+++ b/apps/magpie/src/protocol.rs
@@ -75,12 +75,66 @@ impl<T: Read + Write> ClientMessenger<T> {
 /// A [Messenger] specialized for Magpie servers.
 pub type ServerMessenger<T> = Messenger<T, MagpieServerMsg, MagpieClientMsg>;
 
-/// Bidirectional, transport-agnostic Magpie IO wrapper struct.
-pub struct Messenger<T, I, O> {
-    transport: T,
+/// Piecewise packet assembler for [Messenger].
+pub struct MessageQueue<I> {
     expected_len: Option<usize>,
     received_buf: VecDeque<u8>,
     received_queue: VecDeque<I>,
+}
+
+impl<I> Default for MessageQueue<I> {
+    fn default() -> Self {
+        Self {
+            expected_len: None,
+            received_buf: Default::default(),
+            received_queue: Default::default(),
+        }
+    }
+}
+
+impl<I: DeserializeOwned> MessageQueue<I> {
+    pub fn on_data(&mut self, data: &[u8]) -> std::io::Result<()> {
+        self.received_buf.write_all(data)?;
+
+        loop {
+            if let Some(expected_len) = self.expected_len {
+                if self.received_buf.len() < expected_len {
+                    break;
+                }
+
+                self.expected_len = None;
+                let mut buf = vec![0u8; expected_len];
+                self.received_buf.read_exact(&mut buf)?;
+                match serde_json::from_slice::<I>(&buf) {
+                    Ok(received) => self.received_queue.push_front(received),
+                    Err(e) => {
+                        let kind = std::io::ErrorKind::InvalidData;
+                        let payload = Box::new(e);
+                        let error = std::io::Error::new(kind, payload);
+                        return Err(error);
+                    }
+                }
+            } else if self.received_buf.len() >= 4 {
+                use byteorder::{LittleEndian, ReadBytesExt};
+                let expected_len = self.received_buf.read_u32::<LittleEndian>()?;
+                self.expected_len = Some(expected_len as usize);
+            } else {
+                break;
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn recv(&mut self) -> Option<I> {
+        self.received_queue.pop_back()
+    }
+}
+
+/// Bidirectional, transport-agnostic Magpie IO wrapper struct.
+pub struct Messenger<T, I, O> {
+    transport: T,
+    queue: MessageQueue<I>,
     closed: bool,
     _output: PhantomData<O>,
 }
@@ -89,9 +143,7 @@ impl<T: Read + Write, I: DeserializeOwned, O: Serialize> Messenger<T, I, O> {
     pub fn new(transport: T) -> Self {
         Self {
             transport,
-            expected_len: None,
-            received_buf: Default::default(),
-            received_queue: Default::default(),
+            queue: Default::default(),
             closed: false,
             _output: PhantomData,
         }
@@ -126,7 +178,7 @@ impl<T: Read + Write, I: DeserializeOwned, O: Serialize> Messenger<T, I, O> {
                     break;
                 }
                 Ok(n) => {
-                    self.received_buf.write(&buf[..n])?;
+                    self.queue.on_data(&buf[..n])?;
                 }
                 Err(ref err) if err.kind() == std::io::ErrorKind::WouldBlock => break,
                 Err(ref err) if err.kind() == std::io::ErrorKind::Interrupted => continue,
@@ -134,39 +186,12 @@ impl<T: Read + Write, I: DeserializeOwned, O: Serialize> Messenger<T, I, O> {
             }
         }
 
-        loop {
-            if let Some(expected_len) = self.expected_len {
-                if self.received_buf.len() < expected_len {
-                    break;
-                }
-
-                self.expected_len = None;
-                let mut buf = vec![0u8; expected_len];
-                self.received_buf.read_exact(&mut buf)?;
-                match serde_json::from_slice::<I>(&buf) {
-                    Ok(received) => self.received_queue.push_front(received),
-                    Err(e) => {
-                        let kind = std::io::ErrorKind::InvalidData;
-                        let payload = Box::new(e);
-                        let error = std::io::Error::new(kind, payload);
-                        return Err(error);
-                    }
-                }
-            } else if self.received_buf.len() >= 4 {
-                use byteorder::{LittleEndian, ReadBytesExt};
-                let expected_len = self.received_buf.read_u32::<LittleEndian>()?;
-                self.expected_len = Some(expected_len as usize);
-            } else {
-                break;
-            }
-        }
-
         Ok(())
     }
 
     /// Tries to receive a single input packet.
     pub fn recv(&mut self) -> Option<I> {
-        self.received_queue.pop_back()
+        self.queue.recv()
     }
 
     /// Destroys this messenger and returns the inner transport.

From 763c55d3e45e8ad8aad8704815ac289c503358f0 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 11:08:23 -0700
Subject: [PATCH 48/77] Add async feature + Messenger::recv_async()

---
 apps/magpie/Cargo.toml      |  2 ++
 apps/magpie/src/protocol.rs | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/apps/magpie/Cargo.toml b/apps/magpie/Cargo.toml
index ae5b420..1dcb110 100644
--- a/apps/magpie/Cargo.toml
+++ b/apps/magpie/Cargo.toml
@@ -12,6 +12,7 @@ required-features = ["service"]
 anyhow = { version = "1", optional = true }
 byteorder = "1.4"
 canary = { path = "../..", optional = true }
+futures-util = { version = "0.3", optional = true, features = ["io"] }
 glium = { version = "0.32", optional = true}
 mio = { version = "0.8", features = ["net", "os-poll"], optional = true }
 mio-signals = { version = "0.2", optional = true }
@@ -21,4 +22,5 @@ serde_json = "1"
 slab = { version = "0.4", optional = true}
 
 [features]
+async = ["dep:futures-util"]
 service = ["dep:anyhow", "dep:canary", "dep:glium", "dep:mio", "dep:mio-signals", "dep:parking_lot", "dep:slab"]
diff --git a/apps/magpie/src/protocol.rs b/apps/magpie/src/protocol.rs
index e466258..582c781 100644
--- a/apps/magpie/src/protocol.rs
+++ b/apps/magpie/src/protocol.rs
@@ -139,7 +139,7 @@ pub struct Messenger<T, I, O> {
     _output: PhantomData<O>,
 }
 
-impl<T: Read + Write, I: DeserializeOwned, O: Serialize> Messenger<T, I, O> {
+impl<T, I, O> Messenger<T, I, O> {
     pub fn new(transport: T) -> Self {
         Self {
             transport,
@@ -153,6 +153,13 @@ impl<T: Read + Write, I: DeserializeOwned, O: Serialize> Messenger<T, I, O> {
         self.closed
     }
 
+    /// Destroys this messenger and returns the inner transport.
+    pub fn into_transport(self) -> T {
+        self.transport
+    }
+}
+
+impl<T: Write, I, O: Serialize> Messenger<T, I, O> {
     pub fn send(&mut self, msg: &O) -> std::io::Result<()> {
         use byteorder::{LittleEndian, WriteBytesExt};
         let payload = serde_json::to_vec(msg).unwrap();
@@ -162,7 +169,9 @@ impl<T: Read + Write, I: DeserializeOwned, O: Serialize> Messenger<T, I, O> {
         self.transport.flush()?;
         Ok(())
     }
+}
 
+impl<T: Read, I: DeserializeOwned, O> Messenger<T, I, O> {
     /// Receives all pending messages and queues them for [recv].
     pub fn flush_recv(&mut self) -> std::io::Result<()> {
         let mut buf = [0u8; 1024];
@@ -193,9 +202,26 @@ impl<T: Read + Write, I: DeserializeOwned, O: Serialize> Messenger<T, I, O> {
     pub fn recv(&mut self) -> Option<I> {
         self.queue.recv()
     }
+}
 
-    /// Destroys this messenger and returns the inner transport.
-    pub fn into_transport(self) -> T {
-        self.transport
+#[cfg(feature = "async")]
+mod async_messages {
+    use super::*;
+    use futures_util::AsyncReadExt;
+    use std::marker::Unpin;
+
+    impl<T: AsyncReadExt + Unpin, I: DeserializeOwned, O: Serialize> Messenger<T, I, O> {
+        pub async fn recv_async(&mut self) -> std::io::Result<I> {
+            let mut buf = [0u8; 1024];
+
+            loop {
+                let num = self.transport.read(&mut buf).await?;
+                self.queue.on_data(&buf[..num]);
+
+                if let Some(msg) = self.queue.recv() {
+                    return Ok(msg);
+                }
+            }
+        }
     }
 }

From c244834004b20149e5955864f89894cd58255983 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 11:15:50 -0700
Subject: [PATCH 49/77] Better Messenger recv-related docs and names

---
 apps/magpie/src/protocol.rs    | 19 +++++++++++++------
 apps/magpie/src/service/ipc.rs |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/apps/magpie/src/protocol.rs b/apps/magpie/src/protocol.rs
index 582c781..133d59f 100644
--- a/apps/magpie/src/protocol.rs
+++ b/apps/magpie/src/protocol.rs
@@ -172,7 +172,11 @@ impl<T: Write, I, O: Serialize> Messenger<T, I, O> {
 }
 
 impl<T: Read, I: DeserializeOwned, O> Messenger<T, I, O> {
-    /// Receives all pending messages and queues them for [recv].
+    /// Synchronously receives all pending messages and queues them for [recv].
+    ///
+    /// This function only works if the transport is in non-blocking mode.
+    /// Otherwise, this may block while waiting for more data, even if the
+    /// data it receives does not add up to a full message.
     pub fn flush_recv(&mut self) -> std::io::Result<()> {
         let mut buf = [0u8; 1024];
 
@@ -199,7 +203,10 @@ impl<T: Read, I: DeserializeOwned, O> Messenger<T, I, O> {
     }
 
     /// Tries to receive a single input packet.
-    pub fn recv(&mut self) -> Option<I> {
+    ///
+    /// For messages to be received here, [flush_recv] must be called to
+    /// continuously read pending data from the transport.
+    pub fn try_recv(&mut self) -> Option<I> {
         self.queue.recv()
     }
 }
@@ -211,16 +218,16 @@ mod async_messages {
     use std::marker::Unpin;
 
     impl<T: AsyncReadExt + Unpin, I: DeserializeOwned, O: Serialize> Messenger<T, I, O> {
-        pub async fn recv_async(&mut self) -> std::io::Result<I> {
+        pub async fn recv(&mut self) -> std::io::Result<I> {
             let mut buf = [0u8; 1024];
 
             loop {
-                let num = self.transport.read(&mut buf).await?;
-                self.queue.on_data(&buf[..num]);
-
                 if let Some(msg) = self.queue.recv() {
                     return Ok(msg);
                 }
+
+                let num = self.transport.read(&mut buf).await?;
+                self.queue.on_data(&buf[..num])?;
             }
         }
     }
diff --git a/apps/magpie/src/service/ipc.rs b/apps/magpie/src/service/ipc.rs
index a59bd3c..c4271bf 100644
--- a/apps/magpie/src/service/ipc.rs
+++ b/apps/magpie/src/service/ipc.rs
@@ -94,7 +94,7 @@ impl Client {
             eprintln!("flush_recv() error: {:?}", err);
         }
 
-        while let Some(msg) = self.messenger.recv() {
+        while let Some(msg) = self.messenger.try_recv() {
             println!("Client #{}: {:?}", self.token.0, msg);
             match msg {
                 MagpieServerMsg::CreatePanel(CreatePanel {

From ac5d6475f10b53daf31b5951de338bc44f0ebeed Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 11:24:58 -0700
Subject: [PATCH 50/77] Add Messenger::send_async()

---
 apps/magpie/src/protocol.rs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/magpie/src/protocol.rs b/apps/magpie/src/protocol.rs
index 133d59f..87c89c6 100644
--- a/apps/magpie/src/protocol.rs
+++ b/apps/magpie/src/protocol.rs
@@ -214,10 +214,23 @@ impl<T: Read, I: DeserializeOwned, O> Messenger<T, I, O> {
 #[cfg(feature = "async")]
 mod async_messages {
     use super::*;
-    use futures_util::AsyncReadExt;
+    use futures_util::{AsyncReadExt, AsyncWriteExt};
     use std::marker::Unpin;
 
-    impl<T: AsyncReadExt + Unpin, I: DeserializeOwned, O: Serialize> Messenger<T, I, O> {
+    impl<T: AsyncWriteExt + Unpin, I, O: Serialize> Messenger<T, I, O> {
+        pub async fn send_async(&mut self, msg: &O) -> std::io::Result<()> {
+            use byteorder::{LittleEndian, WriteBytesExt};
+            let payload = serde_json::to_vec(msg).unwrap();
+            let len = payload.len() as u32;
+            let mut msg = Vec::with_capacity(4 + payload.len());
+            msg.write_u32::<LittleEndian>(len)?;
+            msg.extend_from_slice(&payload);
+            self.transport.write_all(&msg).await?;
+            Ok(())
+        }
+    }
+
+    impl<T: AsyncReadExt + Unpin, I: DeserializeOwned, O> Messenger<T, I, O> {
         pub async fn recv(&mut self) -> std::io::Result<I> {
             let mut buf = [0u8; 1024];
 

From 2d242520c108cac377921038675d7da9dd12366c Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 11:39:12 -0700
Subject: [PATCH 51/77] Add send_panel_json_async()

---
 apps/magpie/src/protocol.rs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/magpie/src/protocol.rs b/apps/magpie/src/protocol.rs
index 87c89c6..eacf451 100644
--- a/apps/magpie/src/protocol.rs
+++ b/apps/magpie/src/protocol.rs
@@ -60,7 +60,7 @@ pub enum MagpieClientMsg {
 /// A [Messenger] specialized for Magpie clients.
 pub type ClientMessenger<T> = Messenger<T, MagpieClientMsg, MagpieServerMsg>;
 
-impl<T: Read + Write> ClientMessenger<T> {
+impl<T: Write> ClientMessenger<T> {
     pub fn send_panel_json<O: Serialize>(&mut self, id: PanelId, msg: &O) {
         let msg = serde_json::to_string(msg).unwrap();
         eprintln!("Sending message: {:?}", msg);
@@ -217,6 +217,20 @@ mod async_messages {
     use futures_util::{AsyncReadExt, AsyncWriteExt};
     use std::marker::Unpin;
 
+    impl<T: AsyncWriteExt + Unpin> ClientMessenger<T> {
+        pub async fn send_panel_json_async<O: Serialize>(&mut self, id: PanelId, msg: &O) {
+            let msg = serde_json::to_string(msg).unwrap();
+            eprintln!("Sending message: {:?}", msg);
+
+            let _ = self
+                .send_async(&MagpieServerMsg::SendMessage(SendMessage {
+                    id,
+                    msg: msg.into_bytes(),
+                }))
+                .await;
+        }
+    }
+
     impl<T: AsyncWriteExt + Unpin, I, O: Serialize> Messenger<T, I, O> {
         pub async fn send_async(&mut self, msg: &O) -> std::io::Result<()> {
             use byteorder::{LittleEndian, WriteBytesExt};
@@ -226,6 +240,7 @@ mod async_messages {
             msg.write_u32::<LittleEndian>(len)?;
             msg.extend_from_slice(&payload);
             self.transport.write_all(&msg).await?;
+            self.transport.flush().await?;
             Ok(())
         }
     }

From b005176bcf9a30ddfb5f2c4d42d549e94d6f4300 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 11:39:31 -0700
Subject: [PATCH 52/77] Switch to async UnixStream in music player

---
 apps/music-player/Cargo.toml  |  2 +-
 apps/music-player/src/main.rs | 72 +++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/apps/music-player/Cargo.toml b/apps/music-player/Cargo.toml
index 107df85..09ab086 100644
--- a/apps/music-player/Cargo.toml
+++ b/apps/music-player/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/main.rs"
 required-features = ["bin"]
 
 [dependencies]
-canary-magpie = { path = "../magpie", optional = true }
+canary-magpie = { path = "../magpie", optional = true, features = ["async"] }
 futures-util = { version = "0.3", optional = true }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 9814f0d..aaf7e71 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -1,12 +1,13 @@
 // Copyright (c) 2022 Marceline Cramer
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-use std::{os::unix::net::UnixStream, path::Path};
+use std::path::Path;
 
 use canary_magpie::protocol::{ClientMessenger, CreatePanel, MagpieServerMsg, MAGPIE_SOCK};
 use canary_music_player::*;
+use smol::net::unix::UnixStream;
 
-pub type MagpieClient<'a> = ClientMessenger<&'a UnixStream>;
+pub type MagpieClient = ClientMessenger<UnixStream>;
 
 pub mod mpris;
 
@@ -54,24 +55,29 @@ impl<'a> From<MetadataMap<'a>> for Metadata {
 }
 
 impl Metadata {
-    pub fn new(magpie: &mut MagpieClient, metadata: MetadataMap) -> Self {
+    pub async fn update_new(magpie: &mut MagpieClient, metadata: MetadataMap<'_>) -> Self {
         let new: Self = metadata.into();
-        magpie.send_panel_json(0, &InMsg::AlbumChanged(new.album.clone()));
-        magpie.send_panel_json(0, &InMsg::TrackChanged(new.track.clone()));
+        let msg = InMsg::AlbumChanged(new.album.clone());
+        magpie.send_panel_json_async(0, &msg).await;
+        let msg = InMsg::TrackChanged(new.track.clone());
+        magpie.send_panel_json_async(0, &msg).await;
         new
     }
 
-    pub fn update(&mut self, messenger: &mut MagpieClient, metadata: MetadataMap) {
+    pub async fn update_diff(&mut self, messenger: &mut MagpieClient, metadata: MetadataMap<'_>) {
         let new: Self = metadata.into();
 
         if self.album != new.album {
-            messenger.send_panel_json(0, &InMsg::AlbumChanged(new.album.clone()));
+            let msg = InMsg::AlbumChanged(new.album.clone());
+            messenger.send_panel_json_async(0, &msg).await;
         }
 
         if self.track != new.track {
-            messenger.send_panel_json(0, &InMsg::TrackChanged(new.track.clone()));
+            let msg = InMsg::TrackChanged(new.track.clone());
+            messenger.send_panel_json_async(0, &msg).await;
             let progress = ProgressChanged { position: 0.0 };
-            messenger.send_panel_json(0, &InMsg::ProgressChanged(progress));
+            let msg = InMsg::ProgressChanged(progress);
+            messenger.send_panel_json_async(0, &msg).await;
         }
 
         *self = new;
@@ -80,14 +86,14 @@ impl Metadata {
 
 async fn player_main(
     player: &PlayerProxy<'_>,
-    magpie: &mut MagpieClient<'_>,
+    magpie: &mut MagpieClient,
 ) -> Result<(), Box<dyn std::error::Error>> {
     use futures_util::StreamExt;
     let mut playback_status = player.receive_playback_status_changed().await.fuse();
     let mut metadata_tracker = player.receive_metadata_changed().await.fuse();
     let mut position_tracker = player.receive_position_changed().await.fuse();
 
-    let mut metadata = Metadata::new(magpie, player.metadata().await?);
+    let mut metadata = Metadata::update_new(magpie, player.metadata().await?).await;
 
     loop {
         futures_util::select! {
@@ -107,7 +113,8 @@ async fn player_main(
                 };
 
                 if let Some(status) = status {
-                    magpie.send_panel_json(0, &InMsg::PlaybackStatusChanged(status));
+                    let msg = InMsg::PlaybackStatusChanged(status);
+                    magpie.send_panel_json_async(0, &msg).await;
                 }
             }
             position = position_tracker.next() => {
@@ -119,7 +126,8 @@ async fn player_main(
                 let position = position.get().await?;
                 let position = position as f32 / 1_000_000.0; // Microseconds to seconds
                 let progress = ProgressChanged { position };
-                magpie.send_panel_json(0, &InMsg::ProgressChanged(progress));
+                let msg = InMsg::ProgressChanged(progress);
+                magpie.send_panel_json_async(0, &msg).await;
             }
             new_metadata = metadata_tracker.next() => {
                 let new_metadata = match new_metadata {
@@ -128,7 +136,7 @@ async fn player_main(
                 };
 
                 let new_metadata = new_metadata.get().await?;
-                metadata.update(magpie, new_metadata);
+                metadata.update_diff(magpie, new_metadata).await;
             }
         };
     }
@@ -143,23 +151,23 @@ fn main() {
         .expect("Please pass a path to a Canary script!")
         .to_owned();
 
-    let sock_dir = std::env::var("XDG_RUNTIME_DIR").expect("XDG_RUNTIME_DIR not set");
-    let sock_dir = Path::new(&sock_dir);
-    let sock_path = sock_dir.join(MAGPIE_SOCK);
-    let socket = UnixStream::connect(sock_path).unwrap();
-    let mut magpie = MagpieClient::new(&socket);
-    let protocol = "tebibyte-media.desktop.music-player-controller".to_string();
-    let script = std::path::PathBuf::from(&module_path);
-    let msg = CreatePanel {
-        id: 0,
-        protocol,
-        script,
-    };
-
-    let msg = MagpieServerMsg::CreatePanel(msg);
-    magpie.send(&msg).unwrap();
-
     smol::block_on(async {
+        let sock_dir = std::env::var("XDG_RUNTIME_DIR").expect("XDG_RUNTIME_DIR not set");
+        let sock_dir = Path::new(&sock_dir);
+        let sock_path = sock_dir.join(MAGPIE_SOCK);
+        let socket = UnixStream::connect(sock_path).await.unwrap();
+        let mut magpie = MagpieClient::new(socket);
+        let protocol = "tebibyte-media.desktop.music-player-controller".to_string();
+        let script = std::path::PathBuf::from(&module_path);
+        let msg = CreatePanel {
+            id: 0,
+            protocol,
+            script,
+        };
+
+        let msg = MagpieServerMsg::CreatePanel(msg);
+        magpie.send_async(&msg).await.unwrap();
+
         let dbus = zbus::Connection::session().await.unwrap();
 
         let mut first_loop = true;
@@ -176,7 +184,7 @@ fn main() {
             if connected {
                 println!("Disconnected from MPRIS");
                 let msg = InMsg::Disconnected;
-                magpie.send_panel_json(0, &msg);
+                magpie.send_panel_json_async(0, &msg).await;
                 connected = false;
             }
 
@@ -200,7 +208,7 @@ fn main() {
                 player.destination().as_str()
             );
             connected = true;
-            magpie.send_panel_json(0, &InMsg::Connected);
+            magpie.send_panel_json_async(0, &InMsg::Connected).await;
 
             match player_main(&player, &mut magpie).await {
                 Ok(()) => {}

From a73869aae57a2959c937a7ce8a79e5b9e8f1141c Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 12:04:18 -0700
Subject: [PATCH 53/77] Music player responds to panel messages

---
 apps/music-player/src/main.rs | 42 ++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index aaf7e71..90dbe54 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -3,7 +3,9 @@
 
 use std::path::Path;
 
-use canary_magpie::protocol::{ClientMessenger, CreatePanel, MagpieServerMsg, MAGPIE_SOCK};
+use canary_magpie::protocol::{
+    ClientMessenger, CreatePanel, MagpieClientMsg, MagpieServerMsg, RecvMessage, MAGPIE_SOCK,
+};
 use canary_music_player::*;
 use smol::net::unix::UnixStream;
 
@@ -84,6 +86,37 @@ impl Metadata {
     }
 }
 
+async fn on_message(
+    player: &PlayerProxy<'_>,
+    magpie: &mut MagpieClient,
+    message: MagpieClientMsg,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let message = match message {
+        MagpieClientMsg::RecvMessage(RecvMessage { id: 0, msg }) => msg,
+        _ => return Ok(()),
+    };
+
+    let message: OutMsg = match serde_json::from_slice(&message) {
+        Ok(v) => v,
+        Err(err) => {
+            eprintln!("Panel message parse error: {:?}", err);
+            return Ok(());
+        }
+    };
+
+    match message {
+        OutMsg::Pause => player.pause().await?,
+        OutMsg::Play => player.play().await?,
+        OutMsg::PlayPause => player.play_pause().await?,
+        OutMsg::Stop => player.stop().await?,
+        OutMsg::Previous => player.previous().await?,
+        OutMsg::Next => player.next().await?,
+        _ => {}
+    }
+
+    Ok(())
+}
+
 async fn player_main(
     player: &PlayerProxy<'_>,
     magpie: &mut MagpieClient,
@@ -94,9 +127,16 @@ async fn player_main(
     let mut position_tracker = player.receive_position_changed().await.fuse();
 
     let mut metadata = Metadata::update_new(magpie, player.metadata().await?).await;
+    use futures_util::FutureExt;
 
     loop {
         futures_util::select! {
+            msg = magpie.recv().fuse() => {
+                match msg {
+                    Ok(msg) => on_message(player, magpie, msg).await?,
+                    Err(err) => eprintln!("Magpie recv error: {:?}", err),
+                }
+            }
             // TODO also update volume, shuffle status, and loop status
             status = playback_status.next() => {
                 let status = match status {

From 4a78743c406ce6a9f4a4728a0b6c6142fa895662 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 12:08:02 -0700
Subject: [PATCH 54/77] SAO UI placeholder album art uses theme's overlay color
 instead of magenta

---
 scripts/sao-ui/src/music_player.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/sao-ui/src/music_player.rs b/scripts/sao-ui/src/music_player.rs
index 19c0834..729dd14 100644
--- a/scripts/sao-ui/src/music_player.rs
+++ b/scripts/sao-ui/src/music_player.rs
@@ -1,7 +1,7 @@
 use api::*;
 use canary_script::*;
 
-use canary_music_player::{AlbumInfo, PlaybackStatus, ProgressChanged, TrackInfo, OutMsg};
+use canary_music_player::{AlbumInfo, OutMsg, PlaybackStatus, ProgressChanged, TrackInfo};
 
 use crate::widgets::prelude::*;
 use button::{RoundButton, RoundButtonStyle};
@@ -169,7 +169,8 @@ impl Container for MusicPlayerWidget {
             self.style.body.color,
         );
 
-        ctx.draw_rounded_rect(self.art_rect, self.style.rounding, Color::MAGENTA);
+        let placeholder_art_color = THEME.palette.overlay;
+        ctx.draw_rounded_rect(self.art_rect, self.style.rounding, placeholder_art_color);
 
         ctx.draw_partially_rounded_rect(
             CornerFlags::BOTTOM,

From e0ec4190fc8a48444a50b87eb3beeef82f5d675c Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 12:16:55 -0700
Subject: [PATCH 55/77] Enable vsync and MSAAx4 on Magpie windows

---
 apps/magpie/src/service/window.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/magpie/src/service/window.rs b/apps/magpie/src/service/window.rs
index 7ea34e2..fd41d39 100644
--- a/apps/magpie/src/service/window.rs
+++ b/apps/magpie/src/service/window.rs
@@ -54,7 +54,9 @@ impl Window {
         let wb = glutin::window::WindowBuilder::new()
             .with_transparent(true)
             .with_decorations(false);
-        let cb = glutin::ContextBuilder::new();
+        let cb = glutin::ContextBuilder::new()
+            .with_vsync(true)
+            .with_multisampling(4);
         let display = glium::Display::new(wb, cb, &event_loop)?;
         let graphics = Graphics::new(display);
         let last_update = Instant::now();

From 415d9e78452388f15947110bd87224bfc18a4d55 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 20 Nov 2022 12:18:47 -0700
Subject: [PATCH 56/77] Make SAO UI base colors more opaque

---
 scripts/sao-ui/src/style.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/sao-ui/src/style.rs b/scripts/sao-ui/src/style.rs
index afc002f..2f383f0 100644
--- a/scripts/sao-ui/src/style.rs
+++ b/scripts/sao-ui/src/style.rs
@@ -40,10 +40,10 @@ impl Palette {
 }
 
 /// The common base color alpha shared between all themes.
-pub const BASE_ALPHA: u8 = 0xc0;
+pub const BASE_ALPHA: u8 = 230;
 
 /// The common base_hover color alpha shared between all themes.
-pub const BASE_HOVER_ALPHA: u8 = 0xe0;
+pub const BASE_HOVER_ALPHA: u8 = 242;
 
 /// Converts 0xrrggbb hex to an opaque [Color].
 pub const fn hex(rgb: u32) -> Color {

From 0fe8139e02946c786e3fa796ad7ddc06d71d32c3 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Mon, 21 Nov 2022 20:25:29 -0700
Subject: [PATCH 57/77] Add initial Slider widget

---
 scripts/sao-ui/src/widgets/mod.rs    |  1 +
 scripts/sao-ui/src/widgets/slider.rs | 68 ++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 scripts/sao-ui/src/widgets/slider.rs

diff --git a/scripts/sao-ui/src/widgets/mod.rs b/scripts/sao-ui/src/widgets/mod.rs
index 310bf1a..a9ab031 100644
--- a/scripts/sao-ui/src/widgets/mod.rs
+++ b/scripts/sao-ui/src/widgets/mod.rs
@@ -10,6 +10,7 @@ pub mod flex;
 pub mod menu;
 pub mod palette;
 pub mod scroll;
+pub mod slider;
 pub mod shell;
 pub mod text;
 
diff --git a/scripts/sao-ui/src/widgets/slider.rs b/scripts/sao-ui/src/widgets/slider.rs
new file mode 100644
index 0000000..4146573
--- /dev/null
+++ b/scripts/sao-ui/src/widgets/slider.rs
@@ -0,0 +1,68 @@
+use super::prelude::*;
+
+pub struct SliderStyle {
+    pub bg_color: Color,
+    pub bg_padding: f32,
+    pub bg_rounding: f32,
+    pub fg_color: Color,
+}
+
+impl Default for SliderStyle {
+    fn default() -> Self {
+        Self {
+            bg_color: THEME.palette.overlay,
+            bg_padding: 2.5,
+            bg_rounding: 2.5,
+            fg_color: THEME.palette.blue,
+        }
+    }
+}
+
+pub struct Slider {
+    style: SliderStyle,
+    bg_rect: Rect,
+    fg_rect: Rect,
+    position: f32,
+    dirty: bool,
+}
+
+impl Slider {
+    pub fn new(style: SliderStyle, rect: Rect) -> Self {
+        Self {
+            style,
+            bg_rect: rect,
+            fg_rect: rect,
+            position: 0.5,
+            dirty: true,
+        }
+    }
+
+    pub fn set_position(&mut self, position: f32) {
+        self.position = position;
+        self.dirty = true;
+    }
+
+    pub fn set_rect(&mut self, rect: Rect) {
+        self.bg_rect = rect;
+        self.dirty = true;
+    }
+
+    fn undirty(&mut self) {
+        if !self.dirty {
+            return;
+        }
+
+        let mut fg_space = self.bg_rect.inset(self.style.bg_padding);
+        fg_space.br.x = (fg_space.width() * self.position) + fg_space.tl.x;
+        self.fg_rect = fg_space;
+        self.dirty = false;
+    }
+}
+
+impl Widget for Slider {
+    fn draw(&mut self, ctx: &DrawContext) {
+        self.undirty();
+        ctx.draw_rounded_rect(self.bg_rect, self.style.bg_rounding, self.style.bg_color);
+        ctx.draw_rect(self.fg_rect, self.style.fg_color);
+    }
+}

From 2b058c7202783e9fa6e9aac7c36d11584bd394e6 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Mon, 21 Nov 2022 20:25:41 -0700
Subject: [PATCH 58/77] Use slider widget for position in music player

---
 scripts/sao-ui/src/music_player.rs | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/scripts/sao-ui/src/music_player.rs b/scripts/sao-ui/src/music_player.rs
index 729dd14..353513c 100644
--- a/scripts/sao-ui/src/music_player.rs
+++ b/scripts/sao-ui/src/music_player.rs
@@ -7,6 +7,7 @@ use crate::widgets::prelude::*;
 use button::{RoundButton, RoundButtonStyle};
 use dialog::{DialogBodyStyle, DialogFooterStyle};
 use shell::Offset;
+use slider::Slider;
 use text::{HorizontalAlignment, Label, LabelText};
 
 pub struct MusicPlayerPanel {
@@ -91,6 +92,7 @@ pub struct MusicPlayerStyle {
     pub rounding: f32,
     pub art_margin: f32,
     pub button_spacing: f32,
+    pub slider_height: f32,
 }
 
 impl Default for MusicPlayerStyle {
@@ -101,6 +103,7 @@ impl Default for MusicPlayerStyle {
             rounding: 5.0,
             art_margin: 5.0,
             button_spacing: 15.0,
+            slider_height: 7.5,
         }
     }
 }
@@ -115,11 +118,13 @@ pub struct MusicPlayerWidget {
     next: Offset<RoundButton>,
     position: Offset<Label>,
     duration: Offset<Label>,
+    slider: Slider,
     style: MusicPlayerStyle,
     art_rect: Rect,
     body_rect: Rect,
     footer_rect: Rect,
     position_secs: f32,
+    duration_secs: f32,
     position_dirty: bool,
     status: PlaybackStatus,
 }
@@ -134,6 +139,7 @@ impl Container for MusicPlayerWidget {
         f(&mut self.next);
         f(&mut self.position);
         f(&mut self.duration);
+        f(&mut self.slider);
     }
 
     fn update(&mut self, dt: f32) {
@@ -146,6 +152,8 @@ impl Container for MusicPlayerWidget {
             self.position_dirty = false;
             self.position
                 .set_text(&Self::format_time(self.position_secs));
+
+            self.slider.set_position(self.position_secs / self.duration_secs);
         }
 
         if self.previous.was_clicked() {
@@ -258,6 +266,11 @@ impl MusicPlayerWidget {
         let play = RoundButton::new(primary_button, Some(play_text));
         let next = RoundButton::new(secondary_button, Some(next_text));
 
+        let slider = Slider::new(
+            Default::default(),
+            Rect::from_xy_size(Vec2::ZERO, Vec2::ZERO),
+        );
+
         Self {
             panel,
             artist: make_body_label("Artist"),
@@ -268,11 +281,13 @@ impl MusicPlayerWidget {
             next: Offset::new(next, Vec2::ZERO),
             position: make_footer_label("--:--"),
             duration: make_footer_label("--:--"),
+            slider,
             style,
             art_rect: Rect::from_xy_size(Vec2::ZERO, Vec2::ZERO),
             body_rect: Rect::from_xy_size(Vec2::ZERO, Vec2::ZERO),
             footer_rect: Rect::from_xy_size(Vec2::ZERO, Vec2::ZERO),
             position_secs: 0.0,
+            duration_secs: 0.0,
             position_dirty: false,
             status: PlaybackStatus::Paused,
         }
@@ -317,8 +332,17 @@ impl MusicPlayerWidget {
         let play_x = style.button_spacing * 1.5;
         let next_x = style.button_spacing * 2.5;
         let position_x = style.button_spacing * 3.5;
+        let slider_left = style.button_spacing * 4.5;
+        let slider_right = width - style.button_spacing * 1.75;
+        let slider_top = button_y - style.slider_height / 2.0;
+        let slider_bottom = button_y + style.slider_height / 2.0;
         let duration_x = width - style.button_spacing * 0.75;
 
+        let slider_rect = Rect {
+            tl: Vec2::new(slider_left, slider_top),
+            br: Vec2::new(slider_right, slider_bottom),
+        };
+
         self.artist.set_offset(Vec2::new(label_x, artist_baseline));
         self.album.set_offset(Vec2::new(label_x, album_baseline));
         self.track.set_offset(Vec2::new(label_x, track_baseline));
@@ -331,6 +355,8 @@ impl MusicPlayerWidget {
         self.previous.set_offset(Vec2::new(previous_x, button_y));
         self.play.set_offset(Vec2::new(play_x, button_y));
         self.next.set_offset(Vec2::new(next_x, button_y));
+
+        self.slider.set_rect(slider_rect);
     }
 
     pub fn update_album(&mut self, info: AlbumInfo) {
@@ -359,6 +385,7 @@ impl MusicPlayerWidget {
 
         if let Some(length) = info.length {
             self.duration.set_text(&Self::format_time(length));
+            self.duration_secs = length;
         } else {
             self.duration.set_text("--:--");
         }

From 238f4f878dbed1ac515f85873141b8df7bbc1f9a Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Mon, 21 Nov 2022 21:06:03 -0700
Subject: [PATCH 59/77] Implement music player SetPosition message

---
 apps/music-player/src/main.rs  | 6 ++++++
 apps/music-player/src/mpris.rs | 1 +
 2 files changed, 7 insertions(+)

diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 90dbe54..27b65a4 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -111,6 +111,12 @@ async fn on_message(
         OutMsg::Stop => player.stop().await?,
         OutMsg::Previous => player.previous().await?,
         OutMsg::Next => player.next().await?,
+        OutMsg::SetPosition { position } => {
+            let current = player.position().await?;
+            let next = (position * 1_000_000.0) as i64; // Seconds to microseconds
+            let offset = next - current;
+            player.seek(offset).await?;
+        }
         _ => {}
     }
 
diff --git a/apps/music-player/src/mpris.rs b/apps/music-player/src/mpris.rs
index 74e47c2..4cf2b4b 100644
--- a/apps/music-player/src/mpris.rs
+++ b/apps/music-player/src/mpris.rs
@@ -17,6 +17,7 @@ trait Player {
     fn play_pause(&self) -> Result<()>;
     fn stop(&self) -> Result<()>;
     fn play(&self) -> Result<()>;
+    fn seek(&self, offset: i64) -> Result<()>;
 
     #[dbus_proxy(property)]
     fn playback_status(&self) -> Result<String>;

From f37ec4251dab4bea691719a6175b4d1a829080db Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Mon, 21 Nov 2022 21:06:25 -0700
Subject: [PATCH 60/77] Add interactive Slider functionality

---
 scripts/sao-ui/src/widgets/slider.rs | 45 ++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/scripts/sao-ui/src/widgets/slider.rs b/scripts/sao-ui/src/widgets/slider.rs
index 4146573..5a8cd20 100644
--- a/scripts/sao-ui/src/widgets/slider.rs
+++ b/scripts/sao-ui/src/widgets/slider.rs
@@ -24,6 +24,7 @@ pub struct Slider {
     fg_rect: Rect,
     position: f32,
     dirty: bool,
+    updating: bool,
 }
 
 impl Slider {
@@ -34,12 +35,23 @@ impl Slider {
             fg_rect: rect,
             position: 0.5,
             dirty: true,
+            updating: false,
         }
     }
 
     pub fn set_position(&mut self, position: f32) {
-        self.position = position;
-        self.dirty = true;
+        if !self.updating {
+            self.position = position;
+            self.dirty = true;
+        }
+    }
+
+    pub fn has_update(&mut self) -> Option<f32> {
+        if self.updating {
+            Some(self.position)
+        } else {
+            None
+        }
     }
 
     pub fn set_rect(&mut self, rect: Rect) {
@@ -57,6 +69,10 @@ impl Slider {
         self.fg_rect = fg_space;
         self.dirty = false;
     }
+
+    pub fn get_position(&self) -> f32 {
+        self.position
+    }
 }
 
 impl Widget for Slider {
@@ -65,4 +81,29 @@ impl Widget for Slider {
         ctx.draw_rounded_rect(self.bg_rect, self.style.bg_rounding, self.style.bg_color);
         ctx.draw_rect(self.fg_rect, self.style.fg_color);
     }
+
+    fn on_cursor_event(&mut self, kind: CursorEventKind, at: Vec2) {
+        if let CursorEventKind::Select = kind {
+            if self.bg_rect.contains_point(at) {
+                self.updating = true;
+            }
+        }
+
+        if !self.updating {
+            return;
+        }
+
+        match kind {
+            CursorEventKind::Hover => {}
+            CursorEventKind::Select | CursorEventKind::Drag => {
+                let offset = at.x - self.fg_rect.tl.x;
+                let range = self.bg_rect.inset(self.style.bg_padding).width();
+                self.position = (offset / range).clamp(0.0, 1.0);
+                self.dirty = true;
+            }
+            CursorEventKind::Deselect => {
+                self.updating = false;
+            }
+        }
+    }
 }

From 1453ab0c46bdb99aca48f3fc8e3e3b2f592c8a12 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Mon, 21 Nov 2022 21:06:53 -0700
Subject: [PATCH 61/77] SAO UI music player sets position from slider

---
 scripts/sao-ui/src/music_player.rs | 31 ++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/scripts/sao-ui/src/music_player.rs b/scripts/sao-ui/src/music_player.rs
index 353513c..0ea7888 100644
--- a/scripts/sao-ui/src/music_player.rs
+++ b/scripts/sao-ui/src/music_player.rs
@@ -126,6 +126,7 @@ pub struct MusicPlayerWidget {
     position_secs: f32,
     duration_secs: f32,
     position_dirty: bool,
+    position_updating: bool,
     status: PlaybackStatus,
 }
 
@@ -143,17 +144,30 @@ impl Container for MusicPlayerWidget {
     }
 
     fn update(&mut self, dt: f32) {
-        if let PlaybackStatus::Playing = self.status {
+        let position_display = if let Some(position) = self.slider.has_update() {
+            self.position_updating = true;
+            Some(position * self.duration_secs)
+        } else if self.position_updating {
+            let position = self.slider.get_position() * self.duration_secs;
+            let msg = OutMsg::SetPosition { position };
+            self.send_message(&msg);
+            self.position_updating = false;
+            Some(position)
+        } else if let PlaybackStatus::Playing = self.status {
             self.position_secs += dt;
-            self.position_dirty = true;
-        }
-
-        if self.position_dirty {
+            self.slider
+                .set_position(self.position_secs / self.duration_secs);
+            Some(self.position_secs)
+        } else if self.position_dirty {
             self.position_dirty = false;
-            self.position
-                .set_text(&Self::format_time(self.position_secs));
+            Some(self.position_secs)
+        } else {
+            None
+        };
 
-            self.slider.set_position(self.position_secs / self.duration_secs);
+        if let Some(position) = position_display {
+            self.position_dirty = false;
+            self.position.set_text(&Self::format_time(position));
         }
 
         if self.previous.was_clicked() {
@@ -289,6 +303,7 @@ impl MusicPlayerWidget {
             position_secs: 0.0,
             duration_secs: 0.0,
             position_dirty: false,
+            position_updating: false,
             status: PlaybackStatus::Paused,
         }
     }

From 448435eb8c2f72f0fc3ae94b360d479be8ac8699 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Tue, 22 Nov 2022 16:00:51 -0700
Subject: [PATCH 62/77] Improve music player slider positioning

---
 scripts/sao-ui/src/music_player.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/sao-ui/src/music_player.rs b/scripts/sao-ui/src/music_player.rs
index 0ea7888..4c0d992 100644
--- a/scripts/sao-ui/src/music_player.rs
+++ b/scripts/sao-ui/src/music_player.rs
@@ -347,8 +347,8 @@ impl MusicPlayerWidget {
         let play_x = style.button_spacing * 1.5;
         let next_x = style.button_spacing * 2.5;
         let position_x = style.button_spacing * 3.5;
-        let slider_left = style.button_spacing * 4.5;
-        let slider_right = width - style.button_spacing * 1.75;
+        let slider_left = style.button_spacing * 4.25;
+        let slider_right = width - style.button_spacing * 1.5;
         let slider_top = button_y - style.slider_height / 2.0;
         let slider_bottom = button_y + style.slider_height / 2.0;
         let duration_x = width - style.button_spacing * 0.75;

From 57768d041a2742d09675b22821afb97b451a8642 Mon Sep 17 00:00:00 2001
From: Iris Pupo <pupoi@tutanota.com>
Date: Fri, 25 Nov 2022 19:43:58 -0500
Subject: [PATCH 63/77] Added module caching

---
 Cargo.toml              |  1 +
 src/backend/wasmtime.rs | 39 ++++++++++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index fe2e0dd..55b8413 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,6 +24,7 @@ ouroboros = "^0.15"
 parking_lot = "0.12"
 slab = "0.4"
 wasmtime = "0.38"
+prehash = "0.3.3"
 
 [dependencies.font-kit]
 version = "*"
diff --git a/src/backend/wasmtime.rs b/src/backend/wasmtime.rs
index 7df636a..22aaacd 100644
--- a/src/backend/wasmtime.rs
+++ b/src/backend/wasmtime.rs
@@ -1,4 +1,10 @@
-use std::ops::DerefMut;
+use std::collections::hash_map::RandomState;
+use std::hash::{Hash, BuildHasher};
+use std::{ops::DerefMut, collections::hash_map};
+use std::collections::HashMap;
+
+use std::collections::hash_map::DefaultHasher;
+use std::hash::Hasher;
 
 use super::{Arc, Backend, Instance, PanelId};
 use crate::{DrawCommand, ScriptAbi, ScriptAbiImpl};
@@ -9,9 +15,14 @@ use parking_lot::Mutex;
 type Caller<'a> = wasmtime::Caller<'a, ScriptAbiImpl>;
 type Store = wasmtime::Store<ScriptAbiImpl>;
 type Linker = wasmtime::Linker<ScriptAbiImpl>;
+type ModuleCache = Mutex<HashMap<Prehashed<u64>, wasmtime::Module, DefaultPrehasher>>;
+
+use prehash::{new_prehashed_set, DefaultPrehasher, Prehasher, Prehashed};
+use wasmtime::Module;
 
 pub struct WasmtimeBackend {
     engine: wasmtime::Engine,
+    module_cache: ModuleCache,
 }
 
 impl WasmtimeBackend {
@@ -23,21 +34,35 @@ impl WasmtimeBackend {
         config.cache_config_load_default()?;
 
         let engine = wasmtime::Engine::new(&config)?;
-
-        Ok(Self { engine })
+        let module_cache = Default::default();
+        Ok(Self { engine, module_cache })
     }
 }
 
-
 impl Backend for WasmtimeBackend {
-
     fn load_module(&self, module: &[u8]) -> anyhow::Result<Arc<dyn Instance>> {
-        let module = wasmtime::Module::new(&self.engine, module)?;
+
+        let mut hasher = DefaultHasher::new();
+        hasher.write(module);
+        let hashed = hasher.finish();
+
+        let prehasher = DefaultPrehasher::new();
+        let prehashed = prehasher.prehash(hashed);
+        let mut cache = self.module_cache.lock(); 
+
+        let gotten = if let Some(module) = cache.get(&prehashed){
+            module
+        } else {
+            let module = wasmtime::Module::new(&self.engine, module)?;
+            cache.insert(prehashed, module);
+            cache.get(&prehashed).unwrap()
+        };
+        
         let abi = ScriptAbiImpl::default();
         let mut store = wasmtime::Store::new(&self.engine, abi);
         let mut linker = Linker::new(&self.engine);
         WasmtimeInstance::link(&mut linker)?;
-        let instance = linker.instantiate(&mut store, &module)?;
+        let instance = linker.instantiate(&mut store, gotten)?;
         let bind_panel = instance.get_typed_func(&mut store, "bind_panel")?;
         let update = instance.get_typed_func(&mut store, "update")?;
         let draw = instance.get_typed_func(&mut store, "draw")?;

From 2bef47a65af92d5d5b797255baa911df85fe1c79 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 25 Nov 2022 17:48:36 -0700
Subject: [PATCH 64/77] Replace music player SetPosition message with relative
 Seek

---
 apps/music-player/src/lib.rs       | 4 ++--
 apps/music-player/src/main.rs      | 6 ++----
 scripts/sao-ui/src/music_player.rs | 8 +++++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/music-player/src/lib.rs b/apps/music-player/src/lib.rs
index e7cdd2b..fa0e96d 100644
--- a/apps/music-player/src/lib.rs
+++ b/apps/music-player/src/lib.rs
@@ -104,6 +104,6 @@ pub enum OutMsg {
     /// Sets the volume. Values are clamped to 0.0 to 1.0.
     SetVolume { volume: f32 },
 
-    /// Set the current track position in seconds.
-    SetPosition { position: f32 },
+    /// Seeks the current track's position in seconds.
+    Seek { offset: f32 },
 }
diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index 27b65a4..fb647ee 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -111,10 +111,8 @@ async fn on_message(
         OutMsg::Stop => player.stop().await?,
         OutMsg::Previous => player.previous().await?,
         OutMsg::Next => player.next().await?,
-        OutMsg::SetPosition { position } => {
-            let current = player.position().await?;
-            let next = (position * 1_000_000.0) as i64; // Seconds to microseconds
-            let offset = next - current;
+        OutMsg::Seek { offset } => {
+            let offset = (offset * 1_000_000.0) as i64; // Seconds to microseconds
             player.seek(offset).await?;
         }
         _ => {}
diff --git a/scripts/sao-ui/src/music_player.rs b/scripts/sao-ui/src/music_player.rs
index 4c0d992..ab05398 100644
--- a/scripts/sao-ui/src/music_player.rs
+++ b/scripts/sao-ui/src/music_player.rs
@@ -149,14 +149,14 @@ impl Container for MusicPlayerWidget {
             Some(position * self.duration_secs)
         } else if self.position_updating {
             let position = self.slider.get_position() * self.duration_secs;
-            let msg = OutMsg::SetPosition { position };
+            let offset = position - self.position_secs;
+            let msg = OutMsg::Seek { offset };
             self.send_message(&msg);
+            self.position_secs = position;
             self.position_updating = false;
             Some(position)
         } else if let PlaybackStatus::Playing = self.status {
             self.position_secs += dt;
-            self.slider
-                .set_position(self.position_secs / self.duration_secs);
             Some(self.position_secs)
         } else if self.position_dirty {
             self.position_dirty = false;
@@ -168,6 +168,8 @@ impl Container for MusicPlayerWidget {
         if let Some(position) = position_display {
             self.position_dirty = false;
             self.position.set_text(&Self::format_time(position));
+            self.slider
+                .set_position(self.position_secs / self.duration_secs);
         }
 
         if self.previous.was_clicked() {

From 57c627595826095f078d3234f2f53cbbab4c6d48 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 25 Nov 2022 17:49:38 -0700
Subject: [PATCH 65/77] Sort prehash crate dep alphabetically

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 55b8413..287df87 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,9 +22,9 @@ canary-script = { path = "crates/script" }
 lyon = "1"
 ouroboros = "^0.15"
 parking_lot = "0.12"
+prehash = "0.3.3"
 slab = "0.4"
 wasmtime = "0.38"
-prehash = "0.3.3"
 
 [dependencies.font-kit]
 version = "*"

From d43a62dfda01c59f92e89a59c51f1b6767b1bf8c Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Fri, 25 Nov 2022 17:52:24 -0700
Subject: [PATCH 66/77] Clean up wasmtime caching code

---
 src/backend/wasmtime.rs | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/backend/wasmtime.rs b/src/backend/wasmtime.rs
index 22aaacd..2f7f553 100644
--- a/src/backend/wasmtime.rs
+++ b/src/backend/wasmtime.rs
@@ -1,25 +1,19 @@
-use std::collections::hash_map::RandomState;
-use std::hash::{Hash, BuildHasher};
-use std::{ops::DerefMut, collections::hash_map};
-use std::collections::HashMap;
-
-use std::collections::hash_map::DefaultHasher;
+use std::collections::{hash_map::DefaultHasher, HashMap};
 use std::hash::Hasher;
+use std::ops::DerefMut;
 
 use super::{Arc, Backend, Instance, PanelId};
 use crate::{DrawCommand, ScriptAbi, ScriptAbiImpl};
 
 use canary_script::{Color, CursorEventKind, Rect, Vec2};
 use parking_lot::Mutex;
+use prehash::{DefaultPrehasher, Prehashed, Prehasher};
 
 type Caller<'a> = wasmtime::Caller<'a, ScriptAbiImpl>;
 type Store = wasmtime::Store<ScriptAbiImpl>;
 type Linker = wasmtime::Linker<ScriptAbiImpl>;
 type ModuleCache = Mutex<HashMap<Prehashed<u64>, wasmtime::Module, DefaultPrehasher>>;
 
-use prehash::{new_prehashed_set, DefaultPrehasher, Prehasher, Prehashed};
-use wasmtime::Module;
-
 pub struct WasmtimeBackend {
     engine: wasmtime::Engine,
     module_cache: ModuleCache,
@@ -35,34 +29,36 @@ impl WasmtimeBackend {
 
         let engine = wasmtime::Engine::new(&config)?;
         let module_cache = Default::default();
-        Ok(Self { engine, module_cache })
+        Ok(Self {
+            engine,
+            module_cache,
+        })
     }
 }
 
 impl Backend for WasmtimeBackend {
     fn load_module(&self, module: &[u8]) -> anyhow::Result<Arc<dyn Instance>> {
-
         let mut hasher = DefaultHasher::new();
         hasher.write(module);
         let hashed = hasher.finish();
 
         let prehasher = DefaultPrehasher::new();
         let prehashed = prehasher.prehash(hashed);
-        let mut cache = self.module_cache.lock(); 
+        let mut cache = self.module_cache.lock();
 
-        let gotten = if let Some(module) = cache.get(&prehashed){
+        let module = if let Some(module) = cache.get(&prehashed) {
             module
         } else {
             let module = wasmtime::Module::new(&self.engine, module)?;
             cache.insert(prehashed, module);
             cache.get(&prehashed).unwrap()
         };
-        
+
         let abi = ScriptAbiImpl::default();
         let mut store = wasmtime::Store::new(&self.engine, abi);
         let mut linker = Linker::new(&self.engine);
         WasmtimeInstance::link(&mut linker)?;
-        let instance = linker.instantiate(&mut store, gotten)?;
+        let instance = linker.instantiate(&mut store, module)?;
         let bind_panel = instance.get_typed_func(&mut store, "bind_panel")?;
         let update = instance.get_typed_func(&mut store, "update")?;
         let draw = instance.get_typed_func(&mut store, "draw")?;

From b1b7d1d4e76ab3d1c908be0eef02bb34d5f158d8 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 26 Nov 2022 21:53:03 -0700
Subject: [PATCH 67/77] Fix check_licenses.sh tomcat error failure

---
 check_licenses.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/check_licenses.sh b/check_licenses.sh
index aad8cd3..9dc761d 100755
--- a/check_licenses.sh
+++ b/check_licenses.sh
@@ -12,16 +12,17 @@ dir="$(pwd | sed 's/\//\n/g' | tail -n 1)"
 
 for toml in $(find "$PWD" -name "Cargo.toml"); do
 	printf "Project: %s\n" "$(tomcat package.name "$toml")"
+
+	if [ "$(toml_lic="$(tomcat package.license "$toml" && printf "%s\n" "$?")")" = "0" ]; then
+		printf "%s: Missing license information\n" "$(printf "%s\n" "$toml" |\
+			sed "s/^.\+$dir\///g")"
+			continue
+	fi
+
 	for file in $(find "$(printf "%s\n" "$toml" |\
 		sed 's/Cargo\.toml/src/g')" -name "*.rs")
 	do
 		info="$(head -n 2 "$file")"
-		toml_lic="$(tomcat package.license "$toml")"
-		if ! test -n "$toml_lic"; then
-			printf "%s: Missing license information\n" "$(printf "%s\n" "$toml" |\
-				sed "s/^.\+$dir\///g")"
-			continue 2
-		fi
 		if ! [ "$toml_lic" = "$(printf "%s\n" "$info" | tail -n 1 |\
 			sed -n 's/\/\/ SPDX-License-Identifier: //p')" ]
 		then

From b774115d207bf1a5e3182e08e16f02a49c798604 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 26 Nov 2022 22:03:51 -0700
Subject: [PATCH 68/77] Hacky e-flag manipulation to catch tomcat errors

---
 check_licenses.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/check_licenses.sh b/check_licenses.sh
index 9dc761d..f06bcd6 100755
--- a/check_licenses.sh
+++ b/check_licenses.sh
@@ -13,11 +13,14 @@ dir="$(pwd | sed 's/\//\n/g' | tail -n 1)"
 for toml in $(find "$PWD" -name "Cargo.toml"); do
 	printf "Project: %s\n" "$(tomcat package.name "$toml")"
 
-	if [ "$(toml_lic="$(tomcat package.license "$toml" && printf "%s\n" "$?")")" = "0" ]; then
+	set +e # disable error propogation to catch tomcat exit code
+	toml_lic="$(tomcat package.license "$toml")"
+	if ! [ "$?" = "0" ]; then
 		printf "%s: Missing license information\n" "$(printf "%s\n" "$toml" |\
 			sed "s/^.\+$dir\///g")"
 			continue
 	fi
+	set -e # re-enable error propogation for the rest of the script
 
 	for file in $(find "$(printf "%s\n" "$toml" |\
 		sed 's/Cargo\.toml/src/g')" -name "*.rs")

From b0c29818eef5ec400ffc10a23b59f6b7d8e40927 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 26 Nov 2022 22:06:09 -0700
Subject: [PATCH 69/77] Add AGPL license to magpie Cargo.toml

---
 apps/magpie/Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/magpie/Cargo.toml b/apps/magpie/Cargo.toml
index 1dcb110..37e72e8 100644
--- a/apps/magpie/Cargo.toml
+++ b/apps/magpie/Cargo.toml
@@ -2,6 +2,7 @@
 name = "canary-magpie"
 version = "0.1.0"
 edition = "2021"
+license = "AGPL-3.0-or-later"
 
 [[bin]]
 name = "magpie"

From 6054949694ebed754aae8d8fa9dbf2fec7ff7c3c Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 26 Nov 2022 22:06:21 -0700
Subject: [PATCH 70/77] Add license header to music-player mpris.rs

---
 apps/music-player/src/mpris.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/music-player/src/mpris.rs b/apps/music-player/src/mpris.rs
index 4cf2b4b..fb06bf0 100644
--- a/apps/music-player/src/mpris.rs
+++ b/apps/music-player/src/mpris.rs
@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use std::collections::HashMap;
 
 use zbus::fdo::DBusProxy;

From 734ad8d6306be32973d4b76f24ff9d7c6d746678 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 26 Nov 2022 22:06:39 -0700
Subject: [PATCH 71/77] Add missing license headers to SAO UI sources

---
 scripts/sao-ui/src/music_player.rs    | 3 +++
 scripts/sao-ui/src/style.rs           | 3 +++
 scripts/sao-ui/src/widgets/palette.rs | 3 +++
 scripts/sao-ui/src/widgets/slider.rs  | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/scripts/sao-ui/src/music_player.rs b/scripts/sao-ui/src/music_player.rs
index ab05398..9be32f0 100644
--- a/scripts/sao-ui/src/music_player.rs
+++ b/scripts/sao-ui/src/music_player.rs
@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Crmaer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use api::*;
 use canary_script::*;
 
diff --git a/scripts/sao-ui/src/style.rs b/scripts/sao-ui/src/style.rs
index 2f383f0..0d5c2ff 100644
--- a/scripts/sao-ui/src/style.rs
+++ b/scripts/sao-ui/src/style.rs
@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Crmaer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use canary_script::Color;
 
 /// A reusable set of colors. Used by default widget styles.
diff --git a/scripts/sao-ui/src/widgets/palette.rs b/scripts/sao-ui/src/widgets/palette.rs
index d045feb..82652eb 100644
--- a/scripts/sao-ui/src/widgets/palette.rs
+++ b/scripts/sao-ui/src/widgets/palette.rs
@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Crmaer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use super::prelude::*;
 use shell::Offset;
 use text::{HorizontalAlignment, Label, LabelText};
diff --git a/scripts/sao-ui/src/widgets/slider.rs b/scripts/sao-ui/src/widgets/slider.rs
index 5a8cd20..509681a 100644
--- a/scripts/sao-ui/src/widgets/slider.rs
+++ b/scripts/sao-ui/src/widgets/slider.rs
@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Crmaer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use super::prelude::*;
 
 pub struct SliderStyle {

From 01a37153af01496392ed37743c85e177112a1613 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 26 Nov 2022 22:14:34 -0700
Subject: [PATCH 72/77] Revert "Hacky e-flag manipulation to catch tomcat
 errors"

This reverts commit b774115d207bf1a5e3182e08e16f02a49c798604.
---
 check_licenses.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/check_licenses.sh b/check_licenses.sh
index f06bcd6..9dc761d 100755
--- a/check_licenses.sh
+++ b/check_licenses.sh
@@ -13,14 +13,11 @@ dir="$(pwd | sed 's/\//\n/g' | tail -n 1)"
 for toml in $(find "$PWD" -name "Cargo.toml"); do
 	printf "Project: %s\n" "$(tomcat package.name "$toml")"
 
-	set +e # disable error propogation to catch tomcat exit code
-	toml_lic="$(tomcat package.license "$toml")"
-	if ! [ "$?" = "0" ]; then
+	if [ "$(toml_lic="$(tomcat package.license "$toml" && printf "%s\n" "$?")")" = "0" ]; then
 		printf "%s: Missing license information\n" "$(printf "%s\n" "$toml" |\
 			sed "s/^.\+$dir\///g")"
 			continue
 	fi
-	set -e # re-enable error propogation for the rest of the script
 
 	for file in $(find "$(printf "%s\n" "$toml" |\
 		sed 's/Cargo\.toml/src/g')" -name "*.rs")

From 89470414179a5374ec3184e6a2ee7146ab5abe3f Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 26 Nov 2022 22:14:48 -0700
Subject: [PATCH 73/77] Revert "Fix check_licenses.sh tomcat error failure"

This reverts commit b1b7d1d4e76ab3d1c908be0eef02bb34d5f158d8.
---
 check_licenses.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/check_licenses.sh b/check_licenses.sh
index 9dc761d..aad8cd3 100755
--- a/check_licenses.sh
+++ b/check_licenses.sh
@@ -12,17 +12,16 @@ dir="$(pwd | sed 's/\//\n/g' | tail -n 1)"
 
 for toml in $(find "$PWD" -name "Cargo.toml"); do
 	printf "Project: %s\n" "$(tomcat package.name "$toml")"
-
-	if [ "$(toml_lic="$(tomcat package.license "$toml" && printf "%s\n" "$?")")" = "0" ]; then
-		printf "%s: Missing license information\n" "$(printf "%s\n" "$toml" |\
-			sed "s/^.\+$dir\///g")"
-			continue
-	fi
-
 	for file in $(find "$(printf "%s\n" "$toml" |\
 		sed 's/Cargo\.toml/src/g')" -name "*.rs")
 	do
 		info="$(head -n 2 "$file")"
+		toml_lic="$(tomcat package.license "$toml")"
+		if ! test -n "$toml_lic"; then
+			printf "%s: Missing license information\n" "$(printf "%s\n" "$toml" |\
+				sed "s/^.\+$dir\///g")"
+			continue 2
+		fi
 		if ! [ "$toml_lic" = "$(printf "%s\n" "$info" | tail -n 1 |\
 			sed -n 's/\/\/ SPDX-License-Identifier: //p')" ]
 		then

From f8965b802ca26ce268e1aaa96bf0dbe361348f13 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 26 Nov 2022 22:16:12 -0700
Subject: [PATCH 74/77] Move check_licenses.sh license fetch outside of src/
 loop

---
 check_licenses.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/check_licenses.sh b/check_licenses.sh
index aad8cd3..19da131 100755
--- a/check_licenses.sh
+++ b/check_licenses.sh
@@ -12,16 +12,16 @@ dir="$(pwd | sed 's/\//\n/g' | tail -n 1)"
 
 for toml in $(find "$PWD" -name "Cargo.toml"); do
 	printf "Project: %s\n" "$(tomcat package.name "$toml")"
+	toml_lic="$(tomcat package.license "$toml")"
+	if ! test -n "$toml_lic"; then
+		printf "%s: Missing license information\n" "$(printf "%s\n" "$toml" |\
+			sed "s/^.\+$dir\///g")"
+		continue 2
+	fi
 	for file in $(find "$(printf "%s\n" "$toml" |\
 		sed 's/Cargo\.toml/src/g')" -name "*.rs")
 	do
 		info="$(head -n 2 "$file")"
-		toml_lic="$(tomcat package.license "$toml")"
-		if ! test -n "$toml_lic"; then
-			printf "%s: Missing license information\n" "$(printf "%s\n" "$toml" |\
-				sed "s/^.\+$dir\///g")"
-			continue 2
-		fi
 		if ! [ "$toml_lic" = "$(printf "%s\n" "$info" | tail -n 1 |\
 			sed -n 's/\/\/ SPDX-License-Identifier: //p')" ]
 		then

From 01e2aee16455fba8122b674a4753ef16a73076da Mon Sep 17 00:00:00 2001
From: Iris Pupo <pupoi@tutanota.com>
Date: Sun, 4 Dec 2022 00:03:55 -0500
Subject: [PATCH 75/77] added new function for listener struct

---
 apps/magpie/src/service/ipc.rs | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/apps/magpie/src/service/ipc.rs b/apps/magpie/src/service/ipc.rs
index c4271bf..1ecb694 100644
--- a/apps/magpie/src/service/ipc.rs
+++ b/apps/magpie/src/service/ipc.rs
@@ -66,6 +66,21 @@ impl DerefMut for Listener {
     }
 }
 
+impl Listener {
+    fn new() -> std::io::Result<Self>{
+        let sock_dir = std::env::var("XDG_RUNTIME_DIR").expect("XDG_RUNTIME_DIR not set");
+        let sock_dir = Path::new(&sock_dir);
+        let sock_path = sock_dir.join(SOCK_NAME);
+        eprintln!("Making socket at: {:?}", sock_path);
+
+        let uds = UnixListener::bind(&sock_path)?;
+        let path = sock_path.to_path_buf();
+        Ok(Self{uds, path})
+    }
+
+}
+
+
 pub struct IpcData {
     poll: Poll,
     window_to_client_panel: HashMap<usize, (usize, PanelId)>,
@@ -162,15 +177,8 @@ pub struct Ipc {
 
 impl Ipc {
     pub fn new(window_sender: WindowMessageSender) -> std::io::Result<(Self, IpcMessageSender)> {
-        let sock_dir = std::env::var("XDG_RUNTIME_DIR").expect("XDG_RUNTIME_DIR not set");
-        let sock_dir = Path::new(&sock_dir);
-        let sock_path = sock_dir.join(SOCK_NAME);
-        eprintln!("Making socket at: {:?}", sock_path);
 
-        let mut listener = Listener {
-            uds: UnixListener::bind(&sock_path)?,
-            path: sock_path.to_path_buf(),
-        };
+        let mut listener = Listener::new()?;
 
         let mut signals = Signals::new(Signal::Interrupt | Signal::Quit)?;
 
@@ -301,3 +309,4 @@ impl Ipc {
         }
     }
 }
+

From 0768a7dc6190418dfaa049ea544a18d79e141e08 Mon Sep 17 00:00:00 2001
From: Iris Pupo <pupoi@tutanota.com>
Date: Sun, 4 Dec 2022 01:08:36 -0500
Subject: [PATCH 76/77] Handle previous sockets in Listener::new()

---
 apps/magpie/src/service/ipc.rs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/apps/magpie/src/service/ipc.rs b/apps/magpie/src/service/ipc.rs
index 1ecb694..c9f0300 100644
--- a/apps/magpie/src/service/ipc.rs
+++ b/apps/magpie/src/service/ipc.rs
@@ -17,6 +17,8 @@ use slab::Slab;
 use crate::protocol::*;
 use crate::service::window::{WindowMessage, WindowMessageSender};
 
+use std::io::{Error, ErrorKind};
+
 const SOCK_NAME: &str = "magpie.sock";
 
 #[derive(Debug)]
@@ -71,8 +73,24 @@ impl Listener {
         let sock_dir = std::env::var("XDG_RUNTIME_DIR").expect("XDG_RUNTIME_DIR not set");
         let sock_dir = Path::new(&sock_dir);
         let sock_path = sock_dir.join(SOCK_NAME);
-        eprintln!("Making socket at: {:?}", sock_path);
 
+        match UnixStream::connect(&sock_path) {
+            Ok(_) => {
+                eprintln!("Socket is already in use. Another instance of Magpie may be running.");
+                let kind = ErrorKind::AddrInUse;
+                let error = Error::new(kind, "Socket is already in use.");
+                return Err(error);
+            }
+            Err(ref err) if err.kind() == ErrorKind::ConnectionRefused => {
+                eprintln!("Found leftover socket; removing");
+                std::fs::remove_file(&sock_path)?;
+            }
+            Err(ref err) if err.kind() == ErrorKind::NotFound => {}
+            Err(err) => return Err(err)
+
+        }
+
+        eprintln!("Making socket at: {:?}", sock_path);
         let uds = UnixListener::bind(&sock_path)?;
         let path = sock_path.to_path_buf();
         Ok(Self{uds, path})

From c8a6aa6fbd8b210e13e3613dc5c3f5f36d250c51 Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 4 Dec 2022 14:39:06 -0700
Subject: [PATCH 77/77] Cleanup socket cleanup code

---
 apps/magpie/src/service/ipc.rs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/apps/magpie/src/service/ipc.rs b/apps/magpie/src/service/ipc.rs
index c9f0300..ad9dce2 100644
--- a/apps/magpie/src/service/ipc.rs
+++ b/apps/magpie/src/service/ipc.rs
@@ -17,8 +17,6 @@ use slab::Slab;
 use crate::protocol::*;
 use crate::service::window::{WindowMessage, WindowMessageSender};
 
-use std::io::{Error, ErrorKind};
-
 const SOCK_NAME: &str = "magpie.sock";
 
 #[derive(Debug)]
@@ -69,11 +67,12 @@ impl DerefMut for Listener {
 }
 
 impl Listener {
-    fn new() -> std::io::Result<Self>{
+    fn new() -> std::io::Result<Self> {
         let sock_dir = std::env::var("XDG_RUNTIME_DIR").expect("XDG_RUNTIME_DIR not set");
         let sock_dir = Path::new(&sock_dir);
         let sock_path = sock_dir.join(SOCK_NAME);
 
+        use std::io::{Error, ErrorKind};
         match UnixStream::connect(&sock_path) {
             Ok(_) => {
                 eprintln!("Socket is already in use. Another instance of Magpie may be running.");
@@ -82,23 +81,20 @@ impl Listener {
                 return Err(error);
             }
             Err(ref err) if err.kind() == ErrorKind::ConnectionRefused => {
-                eprintln!("Found leftover socket; removing");
+                eprintln!("Found leftover socket; removing.");
                 std::fs::remove_file(&sock_path)?;
             }
             Err(ref err) if err.kind() == ErrorKind::NotFound => {}
-            Err(err) => return Err(err)
-
+            Err(err) => return Err(err),
         }
 
         eprintln!("Making socket at: {:?}", sock_path);
         let uds = UnixListener::bind(&sock_path)?;
         let path = sock_path.to_path_buf();
-        Ok(Self{uds, path})
+        Ok(Self { uds, path })
     }
-
 }
 
-
 pub struct IpcData {
     poll: Poll,
     window_to_client_panel: HashMap<usize, (usize, PanelId)>,
@@ -195,7 +191,6 @@ pub struct Ipc {
 
 impl Ipc {
     pub fn new(window_sender: WindowMessageSender) -> std::io::Result<(Self, IpcMessageSender)> {
-
         let mut listener = Listener::new()?;
 
         let mut signals = Signals::new(Signal::Interrupt | Signal::Quit)?;
@@ -327,4 +322,3 @@ impl Ipc {
         }
     }
 }
-