From ec1a4e4205920df9fd85d780d9faeabb4d331b14 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Sun, 21 Dec 2025 22:16:02 +0900
Subject: [PATCH 01/29] left, right & middle-specific press-release actions on
 buttons

---
 wlx-overlay-s/src/gui/README.md        |   5 +
 wlx-overlay-s/src/gui/panel/button.rs  | 144 +++++++++++++++++++++----
 wlx-overlay-s/src/overlays/edit/mod.rs |  50 +++++++--
 wlx-overlay-s/src/overlays/watch.rs    |  34 ++++--
 4 files changed, 199 insertions(+), 34 deletions(-)

diff --git a/wlx-overlay-s/src/gui/README.md b/wlx-overlay-s/src/gui/README.md
index d50955a..029b1f2 100644
--- a/wlx-overlay-s/src/gui/README.md
+++ b/wlx-overlay-s/src/gui/README.md
@@ -81,6 +81,11 @@ Supported events:
 <button _press="..." _release="..." />
 ```
 
+Laser-color-specific variants are also available:
+- `_press_left` & `_release_left` for blue laser
+- `_press_right` & `_release_right` for orange laser
+- `_press_middle` & `_release_middle` for purple laser
+
 #### Supported button actions
 
 ##### `::ShellExec <command> [args ..]`
diff --git a/wlx-overlay-s/src/gui/panel/button.rs b/wlx-overlay-s/src/gui/panel/button.rs
index 9fa2adc..6ea7d73 100644
--- a/wlx-overlay-s/src/gui/panel/button.rs
+++ b/wlx-overlay-s/src/gui/panel/button.rs
@@ -10,7 +10,9 @@ use std::{
 use anyhow::Context;
 use wgui::{
     components::button::ComponentButton,
-    event::{self, EventCallback, EventListenerKind},
+    event::{
+        self, CallbackData, CallbackMetadata, EventCallback, EventListenerKind, MouseButtonIndex,
+    },
     i18n::Translation,
     layout::Layout,
     parser::CustomAttribsInfoOwned,
@@ -31,18 +33,72 @@ use crate::{
 #[cfg(feature = "wayvr")]
 use crate::backend::wayvr::WayVRAction;
 
-pub const BUTTON_EVENTS: [(&str, EventListenerKind); 2] = [
-    ("_press", EventListenerKind::MousePress),
-    ("_release", EventListenerKind::MouseRelease),
+pub const BUTTON_EVENTS: [(&str, EventListenerKind, fn(&mut CallbackData) -> bool); 8] = [
+    ("_press", EventListenerKind::MousePress, any_button),
+    ("_release", EventListenerKind::MouseRelease, any_button),
+    ("_press_left", EventListenerKind::MousePress, left_button),
+    (
+        "_release_left",
+        EventListenerKind::MouseRelease,
+        left_button,
+    ),
+    ("_press_right", EventListenerKind::MousePress, right_button),
+    (
+        "_release_right",
+        EventListenerKind::MouseRelease,
+        right_button,
+    ),
+    (
+        "_press_middle",
+        EventListenerKind::MousePress,
+        middle_button,
+    ),
+    (
+        "_release_middle",
+        EventListenerKind::MouseRelease,
+        middle_button,
+    ),
 ];
 
+fn any_button(_: &mut CallbackData) -> bool {
+    true
+}
+
+fn left_button(data: &mut CallbackData) -> bool {
+    if let CallbackMetadata::MouseButton(b) = data.metadata
+        && let MouseButtonIndex::Left = b.index
+    {
+        true
+    } else {
+        false
+    }
+}
+fn right_button(data: &mut CallbackData) -> bool {
+    if let CallbackMetadata::MouseButton(b) = data.metadata
+        && let MouseButtonIndex::Right = b.index
+    {
+        true
+    } else {
+        false
+    }
+}
+fn middle_button(data: &mut CallbackData) -> bool {
+    if let CallbackMetadata::MouseButton(b) = data.metadata
+        && let MouseButtonIndex::Middle = b.index
+    {
+        true
+    } else {
+        false
+    }
+}
+
 pub(super) fn setup_custom_button<S: 'static>(
     layout: &mut Layout,
     attribs: &CustomAttribsInfoOwned,
     _app: &AppState,
     button: Rc<ComponentButton>,
 ) {
-    for (name, kind) in &BUTTON_EVENTS {
+    for (name, kind, test_btn) in &BUTTON_EVENTS {
         let Some(action) = attribs.get_value(name) else {
             continue;
         };
@@ -54,7 +110,11 @@ pub(super) fn setup_custom_button<S: 'static>(
 
         let callback: EventCallback<AppState, S> = match command {
             #[cfg(feature = "wayvr")]
-            "::DashToggle" => Box::new(move |_common, _data, app, _| {
+            "::DashToggle" => Box::new(move |_common, data, app, _| {
+                if !test_btn(data) {
+                    return Ok(EventResult::Pass);
+                }
+
                 app.tasks
                     .enqueue(TaskType::WayVR(WayVRAction::ToggleDashboard));
                 Ok(EventResult::Consumed)
@@ -65,7 +125,11 @@ pub(super) fn setup_custom_button<S: 'static>(
                     log::error!("{command} has invalid argument: \"{arg}\"");
                     return;
                 };
-                Box::new(move |_common, _data, app, _| {
+                Box::new(move |_common, data, app, _| {
+                    if !test_btn(data) {
+                        return Ok(EventResult::Pass);
+                    }
+
                     app.tasks
                         .enqueue(TaskType::Overlay(OverlayTask::ToggleSet(set_idx)));
                     Ok(EventResult::Consumed)
@@ -77,7 +141,11 @@ pub(super) fn setup_custom_button<S: 'static>(
                     return;
                 };
 
-                Box::new(move |_common, _data, app, _| {
+                Box::new(move |_common, data, app, _| {
+                    if !test_btn(data) {
+                        return Ok(EventResult::Pass);
+                    }
+
                     app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
                         OverlaySelector::Name(arg.clone()),
                         Box::new(move |app, owc| {
@@ -91,13 +159,21 @@ pub(super) fn setup_custom_button<S: 'static>(
                     Ok(EventResult::Consumed)
                 })
             }
-            "::EditToggle" => Box::new(move |_common, _data, app, _| {
+            "::EditToggle" => Box::new(move |_common, data, app, _| {
+                if !test_btn(data) {
+                    return Ok(EventResult::Pass);
+                }
+
                 app.tasks
                     .enqueue(TaskType::Overlay(OverlayTask::ToggleEditMode));
                 Ok(EventResult::Consumed)
             }),
             #[cfg(feature = "wayland")]
-            "::NewMirror" => Box::new(move |_common, _data, app, _| {
+            "::NewMirror" => Box::new(move |_common, data, app, _| {
+                if !test_btn(data) {
+                    return Ok(EventResult::Pass);
+                }
+
                 let name = crate::overlays::mirror::new_mirror_name();
                 app.tasks.enqueue(TaskType::Overlay(OverlayTask::Create(
                     OverlaySelector::Name(name.clone()),
@@ -107,21 +183,37 @@ pub(super) fn setup_custom_button<S: 'static>(
                 )));
                 Ok(EventResult::Consumed)
             }),
-            "::CleanupMirrors" => Box::new(move |_common, _data, app, _| {
+            "::CleanupMirrors" => Box::new(move |_common, data, app, _| {
+                if !test_btn(data) {
+                    return Ok(EventResult::Pass);
+                }
+
                 app.tasks
                     .enqueue(TaskType::Overlay(OverlayTask::CleanupMirrors));
                 Ok(EventResult::Consumed)
             }),
-            "::PlayspaceReset" => Box::new(move |_common, _data, app, _| {
+            "::PlayspaceReset" => Box::new(move |_common, data, app, _| {
+                if !test_btn(data) {
+                    return Ok(EventResult::Pass);
+                }
+
                 app.tasks.enqueue(TaskType::Playspace(PlayspaceTask::Reset));
                 Ok(EventResult::Consumed)
             }),
-            "::PlayspaceRecenter" => Box::new(move |_common, _data, app, _| {
+            "::PlayspaceRecenter" => Box::new(move |_common, data, app, _| {
+                if !test_btn(data) {
+                    return Ok(EventResult::Pass);
+                }
+
                 app.tasks
                     .enqueue(TaskType::Playspace(PlayspaceTask::Recenter));
                 Ok(EventResult::Consumed)
             }),
-            "::PlayspaceFixFloor" => Box::new(move |_common, _data, app, _| {
+            "::PlayspaceFixFloor" => Box::new(move |_common, data, app, _| {
+                if !test_btn(data) {
+                    return Ok(EventResult::Pass);
+                }
+
                 for i in 0..5 {
                     Toast::new(
                         ToastTopic::System,
@@ -138,7 +230,11 @@ pub(super) fn setup_custom_button<S: 'static>(
                 );
                 Ok(EventResult::Consumed)
             }),
-            "::Shutdown" => Box::new(move |_common, _data, _app, _| {
+            "::Shutdown" => Box::new(move |_common, data, _app, _| {
+                if !test_btn(data) {
+                    return Ok(EventResult::Pass);
+                }
+
                 RUNNING.store(false, Ordering::Relaxed);
                 Ok(EventResult::Consumed)
             }),
@@ -155,7 +251,11 @@ pub(super) fn setup_custom_button<S: 'static>(
                     log::error!("{command} has bad/missing arguments");
                     return;
                 };
-                Box::new(move |_common, _data, app, _| {
+                Box::new(move |_common, data, app, _| {
+                    if !test_btn(data) {
+                        return Ok(EventResult::Pass);
+                    }
+
                     app.hid_provider.send_key_routed(key, down);
                     Ok(EventResult::Consumed)
                 })
@@ -182,7 +282,11 @@ pub(super) fn setup_custom_button<S: 'static>(
                     }),
                 );
 
-                Box::new(move |_common, _data, _app, _| {
+                Box::new(move |_common, data, _app, _| {
+                    if !test_btn(data) {
+                        return Ok(EventResult::Pass);
+                    }
+
                     let _ = shell_on_action(&state).inspect_err(|e| log::error!("{e:?}"));
                     Ok(EventResult::Consumed)
                 })
@@ -206,7 +310,11 @@ pub(super) fn setup_custom_button<S: 'static>(
                     osc_args.push(osc_arg);
                 }
 
-                Box::new(move |_common, _data, app, _| {
+                Box::new(move |_common, data, app, _| {
+                    if !test_btn(data) {
+                        return Ok(EventResult::Pass);
+                    }
+
                     let Some(sender) = app.osc_sender.as_mut() else {
                         log::error!("OscSend: sender is not available.");
                         return Ok(EventResult::Consumed);
diff --git a/wlx-overlay-s/src/overlays/edit/mod.rs b/wlx-overlay-s/src/overlays/edit/mod.rs
index 4175852..3694e1d 100644
--- a/wlx-overlay-s/src/overlays/edit/mod.rs
+++ b/wlx-overlay-s/src/overlays/edit/mod.rs
@@ -283,7 +283,7 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
     };
 
     let on_custom_attrib: OnCustomAttribFunc = Box::new(move |layout, attribs, _app| {
-        for (name, kind) in &BUTTON_EVENTS {
+        for (name, kind, test_btn) in &BUTTON_EVENTS {
             let Some(action) = attribs.get_value(name) else {
                 continue;
             };
@@ -294,14 +294,22 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
             };
 
             let callback: EventCallback<AppState, EditModeState> = match command {
-                "::EditModeToggleLock" => Box::new(move |common, _data, app, state| {
+                "::EditModeToggleLock" => Box::new(move |common, data, app, state| {
+                    if !test_btn(data) {
+                        return Ok(EventResult::Pass);
+                    }
+
                     let sel = OverlaySelector::Id(*state.id.borrow());
                     let task = state.lock.toggle(common, app);
                     app.tasks
                         .enqueue(TaskType::Overlay(OverlayTask::Modify(sel, task)));
                     Ok(EventResult::Consumed)
                 }),
-                "::EditModeToggleGrab" => Box::new(move |_common, _data, app, state| {
+                "::EditModeToggleGrab" => Box::new(move |_common, data, app, state| {
+                    if !test_btn(data) {
+                        return Ok(EventResult::Pass);
+                    }
+
                     let sel = OverlaySelector::Id(*state.id.borrow());
                     app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
                         sel,
@@ -314,14 +322,22 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                 }),
                 "::EditModeTab" => {
                     let tab_name = args.next().unwrap().to_owned();
-                    Box::new(move |common, _data, _app, state| {
+                    Box::new(move |common, data, _app, state| {
+                        if !test_btn(data) {
+                            return Ok(EventResult::Pass);
+                        }
+
                         state.tabs.tab_button_clicked(common, &tab_name);
                         Ok(EventResult::Consumed)
                     })
                 }
                 "::EditModeSetPos" => {
                     let key = args.next().unwrap().to_owned();
-                    Box::new(move |common, _data, app, state| {
+                    Box::new(move |common, data, app, state| {
+                        if !test_btn(data) {
+                            return Ok(EventResult::Pass);
+                        }
+
                         let sel = OverlaySelector::Id(*state.id.borrow());
                         let task = state.pos.button_clicked(common, &key);
                         app.tasks
@@ -331,7 +347,11 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                 }
                 "::EditModeSetStereo" => {
                     let key = args.next().unwrap().to_owned();
-                    Box::new(move |common, _data, app, state| {
+                    Box::new(move |common, data, app, state| {
+                        if !test_btn(data) {
+                            return Ok(EventResult::Pass);
+                        }
+
                         let sel = OverlaySelector::Id(*state.id.borrow());
                         let task = state.stereo.button_clicked(common, &key);
                         app.tasks
@@ -341,7 +361,11 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                 }
                 "::EditModeSetMouse" => {
                     let key = args.next().unwrap().to_owned();
-                    Box::new(move |common, _data, app, state| {
+                    Box::new(move |common, data, app, state| {
+                        if !test_btn(data) {
+                            return Ok(EventResult::Pass);
+                        }
+
                         let sel = OverlaySelector::Id(*state.id.borrow());
                         let task = state.mouse.button_clicked(common, &key);
                         app.tasks
@@ -349,12 +373,20 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                         Ok(EventResult::Consumed)
                     })
                 }
-                "::EditModeDeletePress" => Box::new(move |_common, _data, _app, state| {
+                "::EditModeDeletePress" => Box::new(move |_common, data, _app, state| {
+                    if !test_btn(data) {
+                        return Ok(EventResult::Pass);
+                    }
+
                     state.delete.pressed = Instant::now();
                     // TODO: animate to light up button after 2s
                     Ok(EventResult::Consumed)
                 }),
-                "::EditModeDeleteRelease" => Box::new(move |_common, _data, app, state| {
+                "::EditModeDeleteRelease" => Box::new(move |_common, data, app, state| {
+                    if !test_btn(data) {
+                        return Ok(EventResult::Pass);
+                    }
+
                     if state.delete.pressed.elapsed() < Duration::from_secs(1) {
                         return Ok(EventResult::Pass);
                     }
diff --git a/wlx-overlay-s/src/overlays/watch.rs b/wlx-overlay-s/src/overlays/watch.rs
index cc351d1..2095505 100644
--- a/wlx-overlay-s/src/overlays/watch.rs
+++ b/wlx-overlay-s/src/overlays/watch.rs
@@ -5,7 +5,7 @@ use std::{
 };
 
 use glam::{Affine3A, Quat, Vec3, Vec3A, vec3};
-use idmap::{DirectIdMap, ordered::Keys};
+use idmap::DirectIdMap;
 use slotmap::SecondaryMap;
 use wgui::{
     components::button::ComponentButton,
@@ -79,7 +79,7 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
     let state = WatchState::default();
 
     let on_custom_attrib: OnCustomAttribFunc = Box::new(move |layout, attribs, _app| {
-        for (name, kind) in &BUTTON_EVENTS {
+        for (name, kind, test_btn) in &BUTTON_EVENTS {
             let Some(action) = attribs.get_value(name) else {
                 continue;
             };
@@ -90,11 +90,19 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
             };
 
             let callback: EventCallback<AppState, WatchState> = match command {
-                "::EditModeDeleteDown" => Box::new(move |_common, _data, _app, state| {
+                "::EditModeDeleteDown" => Box::new(move |_common, data, _app, state| {
+                    if !test_btn(data) {
+                        return Ok(EventResult::Pass);
+                    }
+
                     state.delete.pressed = Instant::now();
                     Ok(EventResult::Consumed)
                 }),
-                "::EditModeDeleteUp" => Box::new(move |_common, _data, app, state| {
+                "::EditModeDeleteUp" => Box::new(move |_common, data, app, state| {
+                    if !test_btn(data) {
+                        return Ok(EventResult::Pass);
+                    }
+
                     if state.delete.pressed.elapsed() < Duration::from_secs(1) {
                         return Ok(EventResult::Consumed);
                     }
@@ -102,7 +110,11 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
                         .enqueue(TaskType::Overlay(OverlayTask::DeleteActiveSet));
                     Ok(EventResult::Consumed)
                 }),
-                "::EditModeAddSet" => Box::new(move |_common, _data, app, _state| {
+                "::EditModeAddSet" => Box::new(move |_common, data, app, _state| {
+                    if !test_btn(data) {
+                        return Ok(EventResult::Pass);
+                    }
+
                     app.tasks.enqueue(TaskType::Overlay(OverlayTask::AddSet));
                     Ok(EventResult::Consumed)
                 }),
@@ -112,7 +124,11 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
                         log::error!("{command} has invalid argument: \"{arg}\"");
                         return;
                     };
-                    Box::new(move |_common, _data, app, state| {
+                    Box::new(move |_common, data, app, state| {
+                        if !test_btn(data) {
+                            return Ok(EventResult::Pass);
+                        }
+
                         let Some(overlay) = state.overlay_metas.get(idx) else {
                             log::error!("No overlay at index {idx}.");
                             return Ok(EventResult::Consumed);
@@ -137,7 +153,11 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
                         log::error!("{command} has invalid argument: \"{arg}\"");
                         return;
                     };
-                    Box::new(move |_common, _data, app, state| {
+                    Box::new(move |_common, data, app, state| {
+                        if !test_btn(data) {
+                            return Ok(EventResult::Pass);
+                        }
+
                         let Some(overlay) = state.overlay_metas.get(idx) else {
                             log::error!("No overlay at index {idx}.");
                             return Ok(EventResult::Consumed);

From b69d382451217f6e04e960d548bb57497143540a Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Sun, 21 Dec 2025 22:28:15 +0900
Subject: [PATCH 02/29] fix watch sticky states

---
 wlx-overlay-s/src/assets/gui/watch-noset.xml | 6 +++---
 wlx-overlay-s/src/assets/gui/watch.xml       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wlx-overlay-s/src/assets/gui/watch-noset.xml b/wlx-overlay-s/src/assets/gui/watch-noset.xml
index 93e0967..d2faa63 100644
--- a/wlx-overlay-s/src/assets/gui/watch-noset.xml
+++ b/wlx-overlay-s/src/assets/gui/watch-noset.xml
@@ -34,7 +34,7 @@ All overlays are listed on bottom row.
   </template>
 
   <template name="Overlay">
-    <Button macro="button_style" id="overlay_${idx}" sticky="1"
+    <Button macro="button_style" id="overlay_${idx}" 
       tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::SingleSetOverlayToggle ${idx}"
       align_items="center"
       height="40">
@@ -111,13 +111,13 @@ All overlays are listed on bottom row.
 
         <!-- Bottom buttons -->
         <div id="toolbox-condensed" gap="6" width="100%" max_width="400" flex_direction="row" flex_wrap="wrap">
-          <Button id="btn_dashboard" height="40" macro="button_style" _press="::DashToggle" tooltip="WATCH.DASHBOARD" tooltip_side="top" sticky="1" >
+          <Button id="btn_dashboard" height="40" macro="button_style" _press="::DashToggle" tooltip="WATCH.DASHBOARD" tooltip_side="top" >
             <sprite color="~set_color" width="32" height="32" src="watch/wayvr_dashboard_mono.svg" />
           </Button>
           <Button id="btn_edit_mode" height="40" macro="button_style" _press="::EditToggle" tooltip="WATCH.EDIT_MODE" tooltip_side="top">
             <sprite color="~set_color" width="32" height="32" src="watch/edit.svg" />
           </Button>
-          <Button id="btn_keyboard" height="40" macro="button_style" tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::OverlayToggle kbd" sticky="1" >
+          <Button id="btn_keyboard" height="40" macro="button_style" tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::OverlayToggle kbd" >
             <sprite src_builtin="watch/keyboard.svg" width="32" height="32" />
           </Button>
           <!-- Src here may be changed, but maintain `OverlayCategory` order: Panel, Screen, Mirror, WayVR -->
diff --git a/wlx-overlay-s/src/assets/gui/watch.xml b/wlx-overlay-s/src/assets/gui/watch.xml
index df9f075..36d17f7 100644
--- a/wlx-overlay-s/src/assets/gui/watch.xml
+++ b/wlx-overlay-s/src/assets/gui/watch.xml
@@ -30,7 +30,7 @@
   </template>
 
   <template name="Overlay">
-    <Button macro="button_style" id="overlay_${idx}" sticky="1"
+    <Button macro="button_style" id="overlay_${idx}" 
       tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::EditModeOverlayToggle ${idx}"
       align_items="center"
       height="40">
@@ -120,7 +120,7 @@
           </div>
           <div flex_direction="column" align_items="center" justify_content="center">
             <div id="toolbox" gap="8" width="100%" max_width="400" flex_direction="row" flex_wrap="wrap">
-              <Button id="btn_keyboard" height="40" macro="button_style" tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::OverlayToggle kbd" sticky="1" >
+              <Button id="btn_keyboard" height="40" macro="button_style" tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::OverlayToggle kbd" >
                 <sprite src_builtin="watch/keyboard.svg" width="32" height="32" />
                 <label translation="EDIT_MODE.KEYBOARD" size="18" />
               </Button>
@@ -136,7 +136,7 @@
 
         <!-- Bottom buttons -->
         <div flex_direction="row" gap="4">
-          <Button id="btn_dashboard" macro="button_style" _press="::DashToggle" tooltip="WATCH.DASHBOARD" tooltip_side="top" sticky="1" >
+          <Button id="btn_dashboard" macro="button_style" _press="::DashToggle" tooltip="WATCH.DASHBOARD" tooltip_side="top" >
             <sprite color="~set_color" width="40" height="40" src="watch/wayvr_dashboard_mono.svg" />
           </Button>
           <div id="edit_delete" display="none">

From d18871eb0ad763471b78135ab68a4cb5e96f5429 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Sun, 21 Dec 2025 22:50:10 +0900
Subject: [PATCH 03/29] max 6 sets

---
 wlx-overlay-s/src/windowing/manager.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wlx-overlay-s/src/windowing/manager.rs b/wlx-overlay-s/src/windowing/manager.rs
index d3964f2..95de2f7 100644
--- a/wlx-overlay-s/src/windowing/manager.rs
+++ b/wlx-overlay-s/src/windowing/manager.rs
@@ -34,7 +34,7 @@ use crate::{
     },
 };
 
-pub const MAX_OVERLAY_SETS: usize = 7;
+pub const MAX_OVERLAY_SETS: usize = 6;
 
 pub struct OverlayWindowManager<T> {
     wrappers: EditWrapperManager,

From 770dcdaf4ca2a8ac845072c181c4eda90e4b6232 Mon Sep 17 00:00:00 2001
From: Aleksander <aleksander@oo8.dev>
Date: Sun, 21 Dec 2025 15:05:43 +0100
Subject: [PATCH 04/29] add translations

[skip ci]
---
 wlx-overlay-s/src/assets/lang/de.json | 28 ++++++++++++++++++++++++---
 wlx-overlay-s/src/assets/lang/en.json |  4 ++--
 wlx-overlay-s/src/assets/lang/es.json | 26 +++++++++++++++++++++++--
 wlx-overlay-s/src/assets/lang/ja.json | 26 +++++++++++++++++++++++--
 wlx-overlay-s/src/assets/lang/pl.json | 24 ++++++++++++++++++++++-
 5 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/wlx-overlay-s/src/assets/lang/de.json b/wlx-overlay-s/src/assets/lang/de.json
index 968b747..24247dd 100644
--- a/wlx-overlay-s/src/assets/lang/de.json
+++ b/wlx-overlay-s/src/assets/lang/de.json
@@ -45,7 +45,29 @@
       "SPLIT_TOP_BOTTOM": "OBEN→UNTEN",
       "SPLIT_BOTTOM_TOP": "UNTEN→OBEN"
     },
-    "STEREO_3D_MODE_": {}
+    "STEREO_3D_MODE_": {},
+    "ALIGN_TO_HMD": "An HMD ausrichten",
+    "MOUSE": {
+      "TITLE": "Mauskorrekturen",
+      "WRONG_SCREEN_SELECTION_HELP": "Wenn der Cursor auf einem völlig anderen Bildschirm verschwindet,\nwurden die Bildschirme wahrscheinlich falsch ausgewählt. Siehe Lesezeichen.",
+      "NORMAL": "Normal",
+      "ROTATE90": "Um 90° gedreht",
+      "ROTATE180": "Um 180° gedreht",
+      "ROTATE270": "Um 270° gedreht",
+      "FLIPPED": "Umgedreht"
+    }
   },
-  "DISABLED": "Deaktiviert"
-}
+  "DISABLED": "Deaktiviert",
+  "DEFAULT": "Standard",
+  "GRAB": {
+    "ADJUST_DISTANCE": "Entfernung anpassen",
+    "ADJUST_SIZE": "Größe anpassen",
+    "UNRESTRICTED_MOVEMENT": "Unbeschränkte Bewegung",
+    "GRABBING_WATCH": "Um die Hände zu vertauschen, bewegen Sie die Uhr vor sich und greifen Sie sie mit der anderen Hand.",
+    "GRABBING_STATIC": "Dieses Overlay ist statisch und bleibt an Ort und Stelle, ignoriert die Neu-Zentrierung.",
+    "GRABBING_ANCHORED": "Festgelegte Overlays bewegen sich alle zusammen. Trennen Sie ein einzelnes Fenster, indem Sie es mit der anderen Hand greifen, während Sie den Anker weiterhin greifen.",
+    "GRABBING_ANCHORED_EDIT": "Diese Overlay-Darstellung bleibt an der Mittelmarkierung verankert.",
+    "GRABBING_FLOATING": "Diese Overlay-Darstellung ist frei schwebend und bleibt an Ort und Stelle, es sei denn, sie wird neu zentriert.",
+    "GRABBING_FOLLOW": "Dieses Overlay wird dem Gerät folgen, an das es angehängt ist."
+  }
+}
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/lang/en.json b/wlx-overlay-s/src/assets/lang/en.json
index 42a2403..70ee026 100644
--- a/wlx-overlay-s/src/assets/lang/en.json
+++ b/wlx-overlay-s/src/assets/lang/en.json
@@ -39,11 +39,11 @@
 			"WRONG_SCREEN_SELECTION_HELP": "If the cursor moves on a completely different screen,\nthe screens were likely selected wrong. See readme.",
 			"NORMAL": "Normal",
 			"ROTATE90": "Rotated 90°",
-			"ROTATE180": "Rotated 170°",
+			"ROTATE180": "Rotated 180°",
 			"ROTATE270": "Rotated 270°",
 			"FLIPPED": "Flipped",
 			"ROTATE90": "Flipped 90°",
-			"ROTATE180": "Flipped 170°",
+			"ROTATE180": "Flipped 180°",
 			"ROTATE270": "Flipped 270°"
 		}
 	},
diff --git a/wlx-overlay-s/src/assets/lang/es.json b/wlx-overlay-s/src/assets/lang/es.json
index 8462bac..c369850 100644
--- a/wlx-overlay-s/src/assets/lang/es.json
+++ b/wlx-overlay-s/src/assets/lang/es.json
@@ -45,7 +45,29 @@
       "SPLIT_TOP_BOTTOM": "ARRIBA→ABAJO",
       "SPLIT_BOTTOM_TOP": "ABAJO→ARRIBA"
     },
-    "STEREO_3D_MODE_": {}
+    "STEREO_3D_MODE_": {},
+    "ALIGN_TO_HMD": "Alinear al HMD",
+    "MOUSE": {
+      "TITLE": "Correcciones del ratón",
+      "WRONG_SCREEN_SELECTION_HELP": "Si el cursor se mueve en una pantalla completamente diferente,\nes probable que las pantallas se hayan seleccionado incorrectamente. Consulta el archivo readme.",
+      "NORMAL": "Normal",
+      "ROTATE90": "Girar 90° volteado",
+      "ROTATE180": "Invertido 180°",
+      "ROTATE270": "Invertido 270°",
+      "FLIPPED": "Invertido"
+    }
   },
-  "DISABLED": "Deshabilitado"
+  "DISABLED": "Deshabilitado",
+  "DEFAULT": "Por defecto",
+  "GRAB": {
+    "ADJUST_DISTANCE": "Ajustar distancia",
+    "ADJUST_SIZE": "Ajustar tamaño",
+    "UNRESTRICTED_MOVEMENT": "Movimiento sin restricciones",
+    "GRABBING_WATCH": "Para intercambiar las manos, mueve el reloj al frente y agrárralo con la otra mano.",
+    "GRABBING_STATIC": "Esta superposición es estática y permanecerá en su lugar, ignorando el recentrado.",
+    "GRABBING_ANCHORED": "Las superposiciones ancladas se mueven todas juntas. Separa una ventana individual agarrándola con la otra mano mientras aún sujetas el ancla.",
+    "GRABBING_ANCHORED_EDIT": "Esta superposición permanecerá anclada al marcador central.",
+    "GRABBING_FLOATING": "Esta superposición es flotante y permanecerá en su lugar a menos que se recentre.",
+    "GRABBING_FOLLOW": "Esta superposición seguirá el dispositivo al que está adjunta."
+  }
 }
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/lang/ja.json b/wlx-overlay-s/src/assets/lang/ja.json
index 745b58b..0546604 100644
--- a/wlx-overlay-s/src/assets/lang/ja.json
+++ b/wlx-overlay-s/src/assets/lang/ja.json
@@ -45,7 +45,29 @@
       "SPLIT_TOP_BOTTOM": "上→下",
       "SPLIT_BOTTOM_TOP": "下→上"
     },
-    "STEREO_3D_MODE_": {}
+    "STEREO_3D_MODE_": {},
+    "ALIGN_TO_HMD": "HMDに合わせる",
+    "MOUSE": {
+      "TITLE": "マウスの修正",
+      "WRONG_SCREEN_SELECTION_HELP": "カーソルが全く別のスクリーンに移動する場合、\nスクリーンが正しく選択されていない可能性があります。\nreadme を参照してください。",
+      "NORMAL": "通常",
+      "ROTATE90": "90°回転",
+      "ROTATE180": "180度反転",
+      "ROTATE270": "180度反転",
+      "FLIPPED": "反転"
+    }
   },
-  "DISABLED": "無効"
+  "DISABLED": "無効",
+  "DEFAULT": "デフォルト",
+  "GRAB": {
+    "ADJUST_DISTANCE": "距離を調整",
+    "ADJUST_SIZE": "サイズ調整",
+    "UNRESTRICTED_MOVEMENT": "自由な動き",
+    "GRABBING_WATCH": "手を入れ替えるには、時計を前に移動させて、もう一方の手で掴んでください。",
+    "GRABBING_STATIC": "このオーバーレイは静的であり、リセンターを無視してその場にとどまります。",
+    "GRABBING_ANCHORED": "アンカーされたオーバーレイはすべて一緒に移動します。もう一方の手で掴んでアンカーを掴んだまま、単一のウィンドウを分離します。",
+    "GRABBING_ANCHORED_EDIT": "このオーバーレイは、センターマーカーに固定されたままになります。",
+    "GRABBING_FLOATING": "このオーバーレイは浮いているため、位置が再調整されるまでその場所に留まります。",
+    "GRABBING_FOLLOW": "このオーバーレイは、接続されているデバイスに追従します。"
+  }
 }
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/lang/pl.json b/wlx-overlay-s/src/assets/lang/pl.json
index a418e0e..045d32b 100644
--- a/wlx-overlay-s/src/assets/lang/pl.json
+++ b/wlx-overlay-s/src/assets/lang/pl.json
@@ -43,7 +43,29 @@
       "SPLIT_RIGHT_LEFT": "PRAWO→LEWO",
       "SPLIT_TOP_BOTTOM": "GÓRA→DÓŁ",
       "TITLE": "Tryb stereoskopowy 3D"
+    },
+    "ALIGN_TO_HMD": "Dopasuj do HMD",
+    "MOUSE": {
+      "TITLE": "Naprawa myszy",
+      "WRONG_SCREEN_SELECTION_HELP": "Jeśli kursor porusza się na zupełnie innym ekranie,\nekrany zostały prawdopodobnie nieprawidłowo wybrane. Zobacz dokument README.",
+      "NORMAL": "Normalny",
+      "ROTATE90": "Odwrócone o 90°",
+      "ROTATE180": "Obrócony o 180°",
+      "ROTATE270": "Odwrócone o 270°",
+      "FLIPPED": "Odwrócone"
     }
   },
-  "DISABLED": "Wyłączone"
+  "DISABLED": "Wyłączone",
+  "DEFAULT": "Domyślny",
+  "GRAB": {
+    "ADJUST_DISTANCE": "Dostosuj odległość",
+    "ADJUST_SIZE": "Dostosuj rozmiar",
+    "UNRESTRICTED_MOVEMENT": "Nieograniczony ruch",
+    "GRABBING_WATCH": "Aby zamienić ręce, przenieś zegarek na przód i chwyć go drugą ręką.",
+    "GRABBING_STATIC": "Ta nakładka jest statyczna i pozostanie na swoim miejscu, ignorując centrowanie.",
+    "GRABBING_ANCHORED": "Przymocowane nakładki poruszają się razem. Aby oddzielić pojedyncze okno, chwyć je drugą ręką, podczas gdy nadal trzymasz kotwicę.",
+    "GRABBING_ANCHORED_EDIT": "Ta nakładka pozostanie zakotwiczona do znacznika centralnego.",
+    "GRABBING_FLOATING": "Ta nakładka jest zawieszony i pozostanie na miejscu, chyba że zostanie wycentrowany.",
+    "GRABBING_FOLLOW": "Ta nakładka będzie śledzić urządzenie, do którego jest dołączona."
+  }
 }
\ No newline at end of file

From 39ea443a07ae7df481d6cc79fd70e9fd9347b9dc Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Mon, 22 Dec 2025 00:03:27 +0900
Subject: [PATCH 05/29] fix translation keys

---
 wlx-overlay-s/src/assets/lang/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wlx-overlay-s/src/assets/lang/en.json b/wlx-overlay-s/src/assets/lang/en.json
index 70ee026..0bdb704 100644
--- a/wlx-overlay-s/src/assets/lang/en.json
+++ b/wlx-overlay-s/src/assets/lang/en.json
@@ -42,9 +42,9 @@
 			"ROTATE180": "Rotated 180°",
 			"ROTATE270": "Rotated 270°",
 			"FLIPPED": "Flipped",
-			"ROTATE90": "Flipped 90°",
-			"ROTATE180": "Flipped 180°",
-			"ROTATE270": "Flipped 270°"
+			"FLIP90": "Flipped 90°",
+			"FLIP180": "Flipped 180°",
+			"FLIP270": "Flipped 270°"
 		}
 	},
 	"GRAB": {

From 9da4fa685dee7633ce139eec2a68526df412bcb0 Mon Sep 17 00:00:00 2001
From: Aleksander <aleksander@oo8.dev>
Date: Sun, 21 Dec 2025 16:09:05 +0100
Subject: [PATCH 06/29] fix translated translation keys

[skip ci]
---
 wlx-overlay-s/src/assets/lang/de.json |  7 +++++--
 wlx-overlay-s/src/assets/lang/es.json | 11 +++++++----
 wlx-overlay-s/src/assets/lang/ja.json |  9 ++++++---
 wlx-overlay-s/src/assets/lang/pl.json |  9 ++++++---
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/wlx-overlay-s/src/assets/lang/de.json b/wlx-overlay-s/src/assets/lang/de.json
index 24247dd..6e5cd4f 100644
--- a/wlx-overlay-s/src/assets/lang/de.json
+++ b/wlx-overlay-s/src/assets/lang/de.json
@@ -51,10 +51,13 @@
       "TITLE": "Mauskorrekturen",
       "WRONG_SCREEN_SELECTION_HELP": "Wenn der Cursor auf einem völlig anderen Bildschirm verschwindet,\nwurden die Bildschirme wahrscheinlich falsch ausgewählt. Siehe Lesezeichen.",
       "NORMAL": "Normal",
+      "FLIPPED": "Umgedreht",
+      "FLIP90": "Um 90° gedreht",
+      "FLIP180": "Um 180° gedreht",
+      "FLIP270": "Um 270° gedreht",
       "ROTATE90": "Um 90° gedreht",
       "ROTATE180": "Um 180° gedreht",
-      "ROTATE270": "Um 270° gedreht",
-      "FLIPPED": "Umgedreht"
+      "ROTATE270": "Um 270° gedreht"
     }
   },
   "DISABLED": "Deaktiviert",
diff --git a/wlx-overlay-s/src/assets/lang/es.json b/wlx-overlay-s/src/assets/lang/es.json
index c369850..0a5ef4a 100644
--- a/wlx-overlay-s/src/assets/lang/es.json
+++ b/wlx-overlay-s/src/assets/lang/es.json
@@ -51,10 +51,13 @@
       "TITLE": "Correcciones del ratón",
       "WRONG_SCREEN_SELECTION_HELP": "Si el cursor se mueve en una pantalla completamente diferente,\nes probable que las pantallas se hayan seleccionado incorrectamente. Consulta el archivo readme.",
       "NORMAL": "Normal",
-      "ROTATE90": "Girar 90° volteado",
-      "ROTATE180": "Invertido 180°",
-      "ROTATE270": "Invertido 270°",
-      "FLIPPED": "Invertido"
+      "FLIPPED": "Invertido",
+      "FLIP90": "Girado 90°",
+      "FLIP180": "Invertido 180°",
+      "FLIP270": "Invertido 270°",
+      "ROTATE90": "Rotado 90°",
+      "ROTATE180": "Rotado 180°",
+      "ROTATE270": "Rotado 270°"
     }
   },
   "DISABLED": "Deshabilitado",
diff --git a/wlx-overlay-s/src/assets/lang/ja.json b/wlx-overlay-s/src/assets/lang/ja.json
index 0546604..c232862 100644
--- a/wlx-overlay-s/src/assets/lang/ja.json
+++ b/wlx-overlay-s/src/assets/lang/ja.json
@@ -51,10 +51,13 @@
       "TITLE": "マウスの修正",
       "WRONG_SCREEN_SELECTION_HELP": "カーソルが全く別のスクリーンに移動する場合、\nスクリーンが正しく選択されていない可能性があります。\nreadme を参照してください。",
       "NORMAL": "通常",
+      "FLIPPED": "反転",
+      "FLIP90": "90°回転",
+      "FLIP180": "180°反転",
+      "FLIP270": "270°回転",
       "ROTATE90": "90°回転",
-      "ROTATE180": "180度反転",
-      "ROTATE270": "180度反転",
-      "FLIPPED": "反転"
+      "ROTATE180": "180°回転",
+      "ROTATE270": "270度回転"
     }
   },
   "DISABLED": "無効",
diff --git a/wlx-overlay-s/src/assets/lang/pl.json b/wlx-overlay-s/src/assets/lang/pl.json
index 045d32b..9f1775b 100644
--- a/wlx-overlay-s/src/assets/lang/pl.json
+++ b/wlx-overlay-s/src/assets/lang/pl.json
@@ -49,10 +49,13 @@
       "TITLE": "Naprawa myszy",
       "WRONG_SCREEN_SELECTION_HELP": "Jeśli kursor porusza się na zupełnie innym ekranie,\nekrany zostały prawdopodobnie nieprawidłowo wybrane. Zobacz dokument README.",
       "NORMAL": "Normalny",
-      "ROTATE90": "Odwrócone o 90°",
+      "ROTATE90": "Obrócony o 90°",
       "ROTATE180": "Obrócony o 180°",
-      "ROTATE270": "Odwrócone o 270°",
-      "FLIPPED": "Odwrócone"
+      "ROTATE270": "Obrócony o 270°",
+      "FLIPPED": "Odwrócony",
+      "FLIP90": "Odwrócony o 90°",
+      "FLIP180": "Odwrócony o 180°",
+      "FLIP270": "Odwrócony o 270°"
     }
   },
   "DISABLED": "Wyłączone",

From 1a1e1c51b0a638602ab9a8b3691b57b9404f0d66 Mon Sep 17 00:00:00 2001
From: Mitsuami <173323057+mitsuami-megane@users.noreply.github.com>
Date: Mon, 22 Dec 2025 03:00:50 +0000
Subject: [PATCH 07/29] update ja locale (#318)

---
 dash-frontend/assets/lang/ja.json     | 14 +++----
 wlx-overlay-s/src/assets/lang/ja.json | 56 +++++++++++++--------------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/dash-frontend/assets/lang/ja.json b/dash-frontend/assets/lang/ja.json
index e8c59fb..28bd8ef 100644
--- a/dash-frontend/assets/lang/ja.json
+++ b/dash-frontend/assets/lang/ja.json
@@ -16,14 +16,14 @@
     "HEADSET_SETTINGS": "ヘッドセット設定",
     "BRIGHTNESS": "明るさ",
     "WLX": {
-      "NOTIFICATIONS_ENABLED": "通知が有効",
-      "NOTIFICATIONS_SOUND_ENABLED": "通知音を有効にする",
-      "KEYBOARD_SOUND_ENABLED": "キーボード音を有効にする",
+      "NOTIFICATIONS_ENABLED": "通知",
+      "NOTIFICATIONS_SOUND_ENABLED": "通知音",
+      "KEYBOARD_SOUND_ENABLED": "キーボード音",
       "BLOCK_GAME_INPUT": "ゲーム入力をブロック",
       "SPACE_DRAG_MULTIPLIER": "スペースドラッグ乗数",
-      "SPACE_DRAG_ROTATION_ENABLED": "スペースドラッグでの回転を有効にする",
-      "SHOW_SKYBOX": "スカイボックスを表示",
-      "ENABLE_PASSTHROUGH": "Passthroughを有効にする"
+      "SPACE_DRAG_ROTATION_ENABLED": "スペースドラッグでの回転",
+      "SHOW_SKYBOX": "スカイボックス",
+      "ENABLE_PASSTHROUGH": "パススルー"
     },
     "RESTART_SOFTWARE": "ソフトウェアを再起動"
   },
@@ -46,4 +46,4 @@
   "ACTIONS": {
     "RECENTER_PLAYSPACE": "プレイスペースを再中央"
   }
-}
\ No newline at end of file
+}
diff --git a/wlx-overlay-s/src/assets/lang/ja.json b/wlx-overlay-s/src/assets/lang/ja.json
index c232862..777e11f 100644
--- a/wlx-overlay-s/src/assets/lang/ja.json
+++ b/wlx-overlay-s/src/assets/lang/ja.json
@@ -16,28 +16,27 @@
     "LONG_PRESS_TO_DELETE_SET": "長押しでセットを削除"
   },
   "EDIT_MODE": {
-    "ADJUST_CURVATURE": "曲率を調整する",
-    "ALPHA_BLEND_MODE": "アルファブレンドモード",
-    "BLENDING_ADDITIVE": "加算",
+    "ADJUST_CURVATURE": "曲率の調整",
+    "ALPHA_BLEND_MODE": "アルファブレンド",
+    "BLENDING_ADDITIVE": "加算モード",
     "CURVATURE": "曲率",
     "DELETE": "削除",
-    "HINT_POINT_WINDOW": "ウィンドウをタップしてそのパラメータを変更します。\n完了したら、右側のボタンで編集モードを終了してください。",
-    "LEAVE": "編集モードを終了",
-    "LOCK_INTERACTION": "インタラクションをロック",
+    "HINT_POINT_WINDOW": "ウィンドウをタップしてそのパラメータを変更できます。\n右側のボタンで編集モードを終了できます。",
+    "LEAVE": "編集モードを終了する",
+    "LOCK_INTERACTION": "インタラクションを無効化",
     "DISABLE_GRAB": "グラブを無効化",
     "MOVE_PRESS_AND_DRAG": "移動（押してドラッグ）",
     "OPACITY": "不透明度",
-    "POSITIONING": "位置調整",
+    "POSITIONING": "位置付け",
     "RESIZE_PRESS_AND_DRAG": "サイズ変更（押してドラッグ）",
-    "POS_STATIC": "固定：その場に留まり、再センタリングされません。",
-    "POS_ANCHORED": "アンカー：他のセット要素と一緒に移動します。デフォルト。",
-    "POS_FLOATING": "フローティング：その場に留まり、表示されるときに再センタリングされます。",
+    "POS_STATIC": "固定：置かれた場所に留まり、再センタリングされません。",
+    "POS_ANCHORED": "アンカー：セット内の他のウィンドウと共に移動します。デフォルト。",
+    "POS_FLOATING": "フローティング：置かれた場所に留まるが、表示される時に再センタリングされます。",
     "POS_HMD": "HMD に追従する。",
     "POS_HAND_L": "左手に追従する。",
     "POS_HAND_R": "右手に追従する。",
-    "INTERPOLATION": "補間",
+    "INTERPOLATION": "スムージング",
     "KEYBOARD": "キーボード",
-    "STEREO_3D_MODE_A": {},
     "STEREO_3D_MODE": {
       "TITLE": "ステレオ3Dモード",
       "SPLIT_LEFT_RIGHT": "左→右",
@@ -45,19 +44,18 @@
       "SPLIT_TOP_BOTTOM": "上→下",
       "SPLIT_BOTTOM_TOP": "下→上"
     },
-    "STEREO_3D_MODE_": {},
-    "ALIGN_TO_HMD": "HMDに合わせる",
+    "ALIGN_TO_HMD": "常にHMDの方を向く",
     "MOUSE": {
       "TITLE": "マウスの修正",
-      "WRONG_SCREEN_SELECTION_HELP": "カーソルが全く別のスクリーンに移動する場合、\nスクリーンが正しく選択されていない可能性があります。\nreadme を参照してください。",
+      "WRONG_SCREEN_SELECTION_HELP": "カーソルが全く別のスクリーンで動く場合、\nスクリーンが正しく選択されていない可能性があります。\nマニュアルをご確認ください。",
       "NORMAL": "通常",
-      "FLIPPED": "反転",
-      "FLIP90": "90°回転",
-      "FLIP180": "180°反転",
-      "FLIP270": "270°回転",
-      "ROTATE90": "90°回転",
-      "ROTATE180": "180°回転",
-      "ROTATE270": "270度回転"
+      "FLIPPED": "ミラー",
+      "FLIP90": "ミラー 90°",
+      "FLIP180": "ミラー 180°",
+      "FLIP270": "ミラー 270°",
+      "ROTATE90": "回転 90°",
+      "ROTATE180": "回転 180°",
+      "ROTATE270": "回転 270°"
     }
   },
   "DISABLED": "無効",
@@ -65,12 +63,12 @@
   "GRAB": {
     "ADJUST_DISTANCE": "距離を調整",
     "ADJUST_SIZE": "サイズ調整",
-    "UNRESTRICTED_MOVEMENT": "自由な動き",
-    "GRABBING_WATCH": "手を入れ替えるには、時計を前に移動させて、もう一方の手で掴んでください。",
-    "GRABBING_STATIC": "このオーバーレイは静的であり、リセンターを無視してその場にとどまります。",
-    "GRABBING_ANCHORED": "アンカーされたオーバーレイはすべて一緒に移動します。もう一方の手で掴んでアンカーを掴んだまま、単一のウィンドウを分離します。",
-    "GRABBING_ANCHORED_EDIT": "このオーバーレイは、センターマーカーに固定されたままになります。",
-    "GRABBING_FLOATING": "このオーバーレイは浮いているため、位置が再調整されるまでその場所に留まります。",
+    "UNRESTRICTED_MOVEMENT": "配置制限なし",
+    "GRABBING_WATCH": "手を入れ替えるにはウォッチを前に移動させて、もう一方の手で掴んでください。",
+    "GRABBING_STATIC": "このオーバーレイは固定であり、リセンターを無視してその場に留まります。",
+    "GRABBING_ANCHORED": "アンカーされたオーバーレイはすべて一緒に移動します。もう一方の手で掴んでアンカーを掴んだまま、単一のウィンドウを分離できます。",
+    "GRABBING_ANCHORED_EDIT": "このオーバーレイは、センター・マーカーに固定されます。",
+    "GRABBING_FLOATING": "このオーバーレイはフローティングのため、リセンターまではその場所に留まります。",
     "GRABBING_FOLLOW": "このオーバーレイは、接続されているデバイスに追従します。"
   }
-}
\ No newline at end of file
+}

From e6cb608bbfd667fb66dc71c3c4d4a67da1b1ad66 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Mon, 22 Dec 2025 13:08:02 +0900
Subject: [PATCH 08/29] add space_drag_unlocked settings

---
 wlx-common/src/config.rs                      |  3 ++
 wlx-overlay-s/src/backend/openvr/playspace.rs | 28 +++++++++-------
 wlx-overlay-s/src/backend/openxr/playspace.rs | 32 +++++++++++--------
 wlx-overlay-s/src/res/config.yaml             |  8 +++--
 4 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/wlx-common/src/config.rs b/wlx-common/src/config.rs
index 8b6e6f6..03590e7 100644
--- a/wlx-common/src/config.rs
+++ b/wlx-common/src/config.rs
@@ -205,6 +205,9 @@ pub struct GeneralConfig {
 	#[serde(default = "def_point3")]
 	pub pointer_lerp_factor: f32,
 
+	#[serde(default = "def_true")]
+	pub space_drag_unlocked: bool,
+
 	#[serde(default = "def_false")]
 	pub space_rotate_unlocked: bool,
 
diff --git a/wlx-overlay-s/src/backend/openvr/playspace.rs b/wlx-overlay-s/src/backend/openvr/playspace.rs
index 918aad7..0ff600a 100644
--- a/wlx-overlay-s/src/backend/openvr/playspace.rs
+++ b/wlx-overlay-s/src/backend/openvr/playspace.rs
@@ -1,4 +1,4 @@
-use glam::{Affine3A, Quat, Vec3, Vec3A};
+use glam::{Affine3A, Quat, Vec3, Vec3A, vec3a};
 use ovr_overlay::{
     chaperone_setup::ChaperoneSetupManager,
     compositor::CompositorManager,
@@ -58,12 +58,12 @@ impl PlayspaceMover {
         &mut self,
         chaperone_mgr: &mut ChaperoneSetupManager,
         overlays: &mut OverlayWindowManager<OpenVrOverlayData>,
-        state: &AppState,
+        app: &AppState,
     ) {
         let universe = self.universe.clone();
 
         if let Some(data) = self.rotate.as_mut() {
-            let pointer = &state.input_state.pointers[data.hand];
+            let pointer = &app.input_state.pointers[data.hand];
             if !pointer.now.space_rotate {
                 self.rotate = None;
                 log::info!("End space rotate");
@@ -71,7 +71,7 @@ impl PlayspaceMover {
             }
 
             let new_hand =
-                Quat::from_affine3(&(data.pose * state.input_state.pointers[data.hand].raw_pose));
+                Quat::from_affine3(&(data.pose * app.input_state.pointers[data.hand].raw_pose));
 
             let dq = new_hand * data.hand_pose.conjugate();
             let rel_y = f32::atan2(
@@ -80,8 +80,8 @@ impl PlayspaceMover {
             );
 
             let mut space_transform = Affine3A::from_rotation_y(rel_y);
-            let offset = (space_transform.transform_vector3a(state.input_state.hmd.translation)
-                - state.input_state.hmd.translation)
+            let offset = (space_transform.transform_vector3a(app.input_state.hmd.translation)
+                - app.input_state.hmd.translation)
                 * -1.0;
             let mut overlay_transform = Affine3A::from_rotation_y(-rel_y);
 
@@ -97,7 +97,7 @@ impl PlayspaceMover {
             set_working_copy(&universe, chaperone_mgr, &data.pose);
             chaperone_mgr.commit_working_copy(EChaperoneConfigFile::EChaperoneConfigFile_Live);
         } else {
-            for (i, pointer) in state.input_state.pointers.iter().enumerate() {
+            for (i, pointer) in app.input_state.pointers.iter().enumerate() {
                 if pointer.now.space_rotate {
                     let Some(mat) = get_working_copy(&universe, chaperone_mgr) else {
                         log::warn!("Can't space rotate - failed to get zero pose");
@@ -117,7 +117,7 @@ impl PlayspaceMover {
         }
 
         if let Some(data) = self.drag.as_mut() {
-            let pointer = &state.input_state.pointers[data.hand];
+            let pointer = &app.input_state.pointers[data.hand];
             if !pointer.now.space_drag {
                 self.drag = None;
                 log::info!("End space drag");
@@ -126,9 +126,13 @@ impl PlayspaceMover {
 
             let new_hand = data
                 .pose
-                .transform_point3a(state.input_state.pointers[data.hand].raw_pose.translation);
-            let relative_pos =
-                (new_hand - data.hand_pose) * state.session.config.space_drag_multiplier;
+                .transform_point3a(app.input_state.pointers[data.hand].raw_pose.translation);
+
+            let relative_pos = if app.session.config.space_drag_unlocked {
+                new_hand - data.hand_pose
+            } else {
+                vec3a(0., new_hand.y - data.hand_pose.y, 0.)
+            } * app.session.config.space_drag_multiplier;
 
             if relative_pos.length_squared() > 1000.0 {
                 log::warn!("Space drag too fast, ignoring");
@@ -156,7 +160,7 @@ impl PlayspaceMover {
             set_working_copy(&universe, chaperone_mgr, &data.pose);
             chaperone_mgr.commit_working_copy(EChaperoneConfigFile::EChaperoneConfigFile_Live);
         } else {
-            for (i, pointer) in state.input_state.pointers.iter().enumerate() {
+            for (i, pointer) in app.input_state.pointers.iter().enumerate() {
                 if pointer.now.space_drag {
                     let Some(mat) = get_working_copy(&universe, chaperone_mgr) else {
                         log::warn!("Can't space drag - failed to get zero pose");
diff --git a/wlx-overlay-s/src/backend/openxr/playspace.rs b/wlx-overlay-s/src/backend/openxr/playspace.rs
index 0af07da..8c0bdaf 100644
--- a/wlx-overlay-s/src/backend/openxr/playspace.rs
+++ b/wlx-overlay-s/src/backend/openxr/playspace.rs
@@ -1,4 +1,4 @@
-use glam::{Affine3A, Quat, Vec3A};
+use glam::{Affine3A, Quat, Vec3A, vec3a};
 use libmonado::{Monado, Pose, ReferenceSpaceType};
 
 use crate::{
@@ -60,10 +60,10 @@ impl PlayspaceMover {
     pub fn update(
         &mut self,
         overlays: &mut OverlayWindowManager<OpenXrOverlayData>,
-        state: &AppState,
+        app: &AppState,
         monado: &mut Monado,
     ) {
-        for pointer in &state.input_state.pointers {
+        for pointer in &app.input_state.pointers {
             if pointer.now.space_reset {
                 if !pointer.before.space_reset {
                     log::info!("Space reset");
@@ -74,7 +74,7 @@ impl PlayspaceMover {
         }
 
         if let Some(mut data) = self.rotate.take() {
-            let pointer = &state.input_state.pointers[data.hand];
+            let pointer = &app.input_state.pointers[data.hand];
             if !pointer.now.space_rotate {
                 self.last_transform = data.pose;
                 log::info!("End space rotate");
@@ -82,10 +82,10 @@ impl PlayspaceMover {
             }
 
             let new_hand =
-                Quat::from_affine3(&(data.pose * state.input_state.pointers[data.hand].raw_pose));
+                Quat::from_affine3(&(data.pose * app.input_state.pointers[data.hand].raw_pose));
 
             let dq = new_hand * data.hand_pose.conjugate();
-            let mut space_transform = if state.session.config.space_rotate_unlocked {
+            let mut space_transform = if app.session.config.space_rotate_unlocked {
                 Affine3A::from_quat(dq)
             } else {
                 let rel_y = f32::atan2(
@@ -95,8 +95,8 @@ impl PlayspaceMover {
 
                 Affine3A::from_rotation_y(rel_y)
             };
-            let offset = (space_transform.transform_vector3a(state.input_state.hmd.translation)
-                - state.input_state.hmd.translation)
+            let offset = (space_transform.transform_vector3a(app.input_state.hmd.translation)
+                - app.input_state.hmd.translation)
                 * -1.0;
 
             space_transform.translation = offset;
@@ -107,7 +107,7 @@ impl PlayspaceMover {
             apply_offset(data.pose, monado);
             self.rotate = Some(data);
         } else {
-            for (i, pointer) in state.input_state.pointers.iter().enumerate() {
+            for (i, pointer) in app.input_state.pointers.iter().enumerate() {
                 if pointer.now.space_rotate {
                     let hand_pose = Quat::from_affine3(&(self.last_transform * pointer.raw_pose));
                     self.rotate = Some(MoverData {
@@ -123,7 +123,7 @@ impl PlayspaceMover {
         }
 
         if let Some(mut data) = self.drag.take() {
-            let pointer = &state.input_state.pointers[data.hand];
+            let pointer = &app.input_state.pointers[data.hand];
             if !pointer.now.space_drag {
                 self.last_transform = data.pose;
                 log::info!("End space drag");
@@ -132,9 +132,13 @@ impl PlayspaceMover {
 
             let new_hand = data
                 .pose
-                .transform_point3a(state.input_state.pointers[data.hand].raw_pose.translation);
-            let relative_pos =
-                (new_hand - data.hand_pose) * state.session.config.space_drag_multiplier;
+                .transform_point3a(app.input_state.pointers[data.hand].raw_pose.translation);
+
+            let relative_pos = if app.session.config.space_drag_unlocked {
+                new_hand - data.hand_pose
+            } else {
+                vec3a(0., new_hand.y - data.hand_pose.y, 0.)
+            } * app.session.config.space_drag_multiplier;
 
             if relative_pos.length_squared() > 1000.0 {
                 log::warn!("Space drag too fast, ignoring");
@@ -159,7 +163,7 @@ impl PlayspaceMover {
             apply_offset(data.pose, monado);
             self.drag = Some(data);
         } else {
-            for (i, pointer) in state.input_state.pointers.iter().enumerate() {
+            for (i, pointer) in app.input_state.pointers.iter().enumerate() {
                 if pointer.now.space_drag {
                     let hand_pos = self
                         .last_transform
diff --git a/wlx-overlay-s/src/res/config.yaml b/wlx-overlay-s/src/res/config.yaml
index 8dc9270..073a1d0 100644
--- a/wlx-overlay-s/src/res/config.yaml
+++ b/wlx-overlay-s/src/res/config.yaml
@@ -28,8 +28,12 @@
 ## How fast to drag when the space drag feature is activated
 #space_drag_multiplier: 1.0
 
-## When enabled, the space_rotate binding can be used
-## to rotate in any axis. Imagine horizon mode².
+## Setting this to false will make space_drag
+## only affect the vertical axis (Y).
+#space_drag_unlocked: true
+
+## Monado/WiVRn only. When enabled, the space_rotate binding
+## can rotate in any axis. Imagine horizon mode².
 #space_rotate_unlocked: false
 
 ## Monado/WiVRn only. Use passthrough camera if the headset supports it.

From b9513c3c363e05ff38c3e98171be2ed7eec30a7a Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Mon, 22 Dec 2025 14:21:18 +0900
Subject: [PATCH 09/29] add extra trace logs, mirrors to support
 MainThreadWlxCapture

---
 wlx-capture/src/pipewire.rs                   |  3 +++
 wlx-overlay-s/src/backend/openxr/mod.rs       |  8 +++++++
 wlx-overlay-s/src/gui/panel/button.rs         |  7 ++++--
 wlx-overlay-s/src/overlays/mod.rs             |  2 --
 wlx-overlay-s/src/overlays/screen/backend.rs  |  1 +
 .../src/overlays/{ => screen}/mirror.rs       | 22 ++++++++++++++-----
 wlx-overlay-s/src/overlays/screen/mod.rs      |  2 ++
 wlx-overlay-s/src/overlays/screen/pw.rs       |  6 +++++
 wlx-overlay-s/src/windowing/backend.rs        |  1 +
 9 files changed, 43 insertions(+), 9 deletions(-)
 rename wlx-overlay-s/src/overlays/{ => screen}/mirror.rs (90%)

diff --git a/wlx-capture/src/pipewire.rs b/wlx-capture/src/pipewire.rs
index 3992f51..1358411 100644
--- a/wlx-capture/src/pipewire.rs
+++ b/wlx-capture/src/pipewire.rs
@@ -47,12 +47,14 @@ use crate::frame::Transform;
 use crate::frame::WlxFrame;
 use crate::frame::{DmabufFrame, FramePlane, MemFdFrame, MemPtrFrame};
 
+#[derive(Debug, Clone)]
 pub struct PipewireStream {
     pub node_id: u32,
     pub position: Option<(i32, i32)>,
     pub size: Option<(i32, i32)>,
 }
 
+#[derive(Debug, Clone)]
 pub struct PipewireSelectScreenResult {
     pub streams: Vec<PipewireStream>,
     pub restore_token: Option<String>,
@@ -279,6 +281,7 @@ where
     U: Any,
     R: Any,
 {
+    log::debug!("{}: pipewire main_loop start", &name);
     let main_loop = MainLoop::new(None)?;
     let context = Context::new(&main_loop)?;
     let core = context.connect(None)?;
diff --git a/wlx-overlay-s/src/backend/openxr/mod.rs b/wlx-overlay-s/src/backend/openxr/mod.rs
index a5c2a04..e6fe762 100644
--- a/wlx-overlay-s/src/backend/openxr/mod.rs
+++ b/wlx-overlay-s/src/backend/openxr/mod.rs
@@ -238,6 +238,7 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
 
         if !session_running {
             std::thread::sleep(Duration::from_millis(100));
+            log::trace!("session not running: continue");
             continue 'main_loop;
         }
 
@@ -387,10 +388,12 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
         for o in overlays.values_mut() {
             o.data.cur_visible = false;
             let Some(alpha) = o.config.active_state.as_ref().map(|x| x.alpha) else {
+                log::trace!("{}: hidden, skip render", o.config.name);
                 continue;
             };
 
             if !o.data.init {
+                log::trace!("{}: init", o.config.name);
                 o.init(&mut app)?;
                 o.data.init = true;
             }
@@ -400,8 +403,10 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
                 ShouldRender::Can => (o.data.last_alpha - alpha).abs() > f32::EPSILON,
                 ShouldRender::Unable => false, //try show old image if exists
             };
+            log::trace!("{}: should_render returned: {should_render}", o.config.name);
 
             if should_render {
+                log::trace!("{}: render new frame", o.config.name);
                 let meta = o.config.backend.frame_meta().unwrap(); // want panic
                 let wsi = o.ensure_swapchain_acquire(&app, &xr_state, meta.extent)?;
                 let tgt = RenderTarget { views: wsi.views };
@@ -410,7 +415,10 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
                 o.data.last_alpha = alpha;
                 futures.execute_results(rdr.end()?)?;
             } else if o.data.swapchain.is_none() {
+                log::trace!("{}: not showing due to missing swapchain", o.config.name);
                 continue;
+            } else {
+                log::trace!("{}: showing stale frame", o.config.name);
             }
             o.data.cur_visible = true;
         }
diff --git a/wlx-overlay-s/src/gui/panel/button.rs b/wlx-overlay-s/src/gui/panel/button.rs
index 6ea7d73..5129d19 100644
--- a/wlx-overlay-s/src/gui/panel/button.rs
+++ b/wlx-overlay-s/src/gui/panel/button.rs
@@ -174,11 +174,14 @@ pub(super) fn setup_custom_button<S: 'static>(
                     return Ok(EventResult::Pass);
                 }
 
-                let name = crate::overlays::mirror::new_mirror_name();
+                let name = crate::overlays::screen::mirror::new_mirror_name();
                 app.tasks.enqueue(TaskType::Overlay(OverlayTask::Create(
                     OverlaySelector::Name(name.clone()),
                     Box::new(move |app| {
-                        Some(crate::overlays::mirror::new_mirror(name, &app.session))
+                        Some(crate::overlays::screen::mirror::new_mirror(
+                            name,
+                            &app.session,
+                        ))
                     }),
                 )));
                 Ok(EventResult::Consumed)
diff --git a/wlx-overlay-s/src/overlays/mod.rs b/wlx-overlay-s/src/overlays/mod.rs
index 3d27c44..0b9795f 100644
--- a/wlx-overlay-s/src/overlays/mod.rs
+++ b/wlx-overlay-s/src/overlays/mod.rs
@@ -2,8 +2,6 @@ pub mod anchor;
 pub mod custom;
 pub mod edit;
 pub mod keyboard;
-#[cfg(feature = "wayland")]
-pub mod mirror;
 pub mod screen;
 pub mod toast;
 pub mod watch;
diff --git a/wlx-overlay-s/src/overlays/screen/backend.rs b/wlx-overlay-s/src/overlays/screen/backend.rs
index 7e3b857..4f943be 100644
--- a/wlx-overlay-s/src/overlays/screen/backend.rs
+++ b/wlx-overlay-s/src/overlays/screen/backend.rs
@@ -215,6 +215,7 @@ impl OverlayBackend for ScreenBackend {
                 Ok(ShouldRender::Can)
             }
         } else {
+            log::trace!("{}: backend ready, but no image received.", self.name);
             Ok(ShouldRender::Unable)
         }
     }
diff --git a/wlx-overlay-s/src/overlays/mirror.rs b/wlx-overlay-s/src/overlays/screen/mirror.rs
similarity index 90%
rename from wlx-overlay-s/src/overlays/mirror.rs
rename to wlx-overlay-s/src/overlays/screen/mirror.rs
index e54e601..94b298d 100644
--- a/wlx-overlay-s/src/overlays/mirror.rs
+++ b/wlx-overlay-s/src/overlays/screen/mirror.rs
@@ -8,7 +8,10 @@ use std::{
 
 use futures::{Future, FutureExt};
 use glam::{Affine2, Affine3A, Quat, Vec3, vec3};
-use wlx_capture::pipewire::{PipewireCapture, PipewireSelectScreenResult, pipewire_select_screen};
+use wlx_capture::{
+    WlxCapture,
+    pipewire::{PipewireCapture, PipewireSelectScreenResult, pipewire_select_screen},
+};
 use wlx_common::{
     overlays::{BackendAttrib, BackendAttribValue},
     windowing::OverlayWindowState,
@@ -19,6 +22,7 @@ use crate::{
         input::{HoverResult, PointerHit},
         task::{OverlayTask, TaskType},
     },
+    overlays::screen::capture::{MainThreadWlxCapture, new_wlx_capture},
     state::{AppSession, AppState},
     subsystem::hid::WheelDelta,
     windowing::{
@@ -31,7 +35,7 @@ use crate::{
     },
 };
 
-use super::screen::backend::ScreenBackend;
+use super::backend::ScreenBackend;
 type PinnedSelectorFuture = core::pin::Pin<
     Box<dyn Future<Output = Result<PipewireSelectScreenResult, wlx_capture::pipewire::AshpdError>>>,
 >;
@@ -76,13 +80,21 @@ impl OverlayBackend for MirrorBackend {
 
             match maybe_pw_result {
                 Ok(pw_result) => {
+                    log::debug!(
+                        "{}: PipeWire result streams: {:?}",
+                        self.name,
+                        &pw_result.streams
+                    );
                     let node_id = pw_result.streams.first().unwrap().node_id; // streams guaranteed to have at least one element
-                    log::info!("{}: PipeWire node selected: {}", self.name.clone(), node_id);
-                    let capture = PipewireCapture::new(self.name.clone(), node_id);
+                    log::info!("{}: PipeWire node selected: {}", self.name, node_id);
+                    let capture = new_wlx_capture!(
+                        app.gfx_extras.queue_capture,
+                        PipewireCapture::new(self.name.clone(), node_id)
+                    );
                     self.renderer = Some(ScreenBackend::new_raw(
                         self.name.clone(),
                         app.xr_backend,
-                        Box::new(capture),
+                        capture,
                     ));
                     app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
                         OverlaySelector::Name(self.name.clone()),
diff --git a/wlx-overlay-s/src/overlays/screen/mod.rs b/wlx-overlay-s/src/overlays/screen/mod.rs
index 6a21262..f27e2a0 100644
--- a/wlx-overlay-s/src/overlays/screen/mod.rs
+++ b/wlx-overlay-s/src/overlays/screen/mod.rs
@@ -15,6 +15,8 @@ use crate::{
 
 pub mod backend;
 mod capture;
+#[cfg(feature = "wayland")]
+pub mod mirror;
 #[cfg(feature = "pipewire")]
 pub mod pw;
 #[cfg(feature = "wayland")]
diff --git a/wlx-overlay-s/src/overlays/screen/pw.rs b/wlx-overlay-s/src/overlays/screen/pw.rs
index 112c946..2180bbb 100644
--- a/wlx-overlay-s/src/overlays/screen/pw.rs
+++ b/wlx-overlay-s/src/overlays/screen/pw.rs
@@ -42,6 +42,12 @@ impl ScreenBackend {
             false,
         )?;
 
+        log::debug!(
+            "{}: PipeWire result streams: {:?}",
+            output.name,
+            &select_screen_result.streams
+        );
+
         let node_id = select_screen_result.streams.first().unwrap().node_id; // streams guaranteed to have at least one element
 
         let capture = new_wlx_capture!(
diff --git a/wlx-overlay-s/src/windowing/backend.rs b/wlx-overlay-s/src/windowing/backend.rs
index b3bf57b..e9af14c 100644
--- a/wlx-overlay-s/src/windowing/backend.rs
+++ b/wlx-overlay-s/src/windowing/backend.rs
@@ -27,6 +27,7 @@ pub struct FrameMeta {
     pub clear: WGfxClearMode,
 }
 
+#[derive(Debug, Clone, Copy)]
 pub enum ShouldRender {
     /// The overlay is dirty and needs to be rendered.
     Should,

From a0bc4001c06b0e76bc3bdf6d550aceee93ca2845 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Mon, 22 Dec 2025 15:03:17 +0900
Subject: [PATCH 10/29] settings for text+bg colors, anim speed, rounding

---
 dash-frontend/src/util/toast_manager.rs       |  2 +-
 wgui/src/components/button.rs                 | 40 +++++++++++++------
 wgui/src/components/checkbox.rs               | 33 +++++++++------
 wgui/src/components/slider.rs                 | 22 +++++-----
 wgui/src/globals.rs                           |  6 +++
 wgui/src/parser/component_button.rs           |  8 ++--
 wgui/src/parser/mod.rs                        |  3 +-
 wgui/src/parser/style.rs                      | 10 ++---
 wgui/src/parser/widget_rectangle.rs           |  9 ++++-
 wlx-common/src/config.rs                      |  9 +++++
 wlx-overlay-s/src/assets/gui/keyboard.xml     |  2 +-
 wlx-overlay-s/src/overlays/edit/lock.rs       |  5 ++-
 wlx-overlay-s/src/overlays/edit/mod.rs        |  4 +-
 .../src/overlays/keyboard/builder.rs          | 16 +++++---
 wlx-overlay-s/src/res/config.yaml             |  8 ++++
 wlx-overlay-s/src/state.rs                    | 33 +++++++--------
 16 files changed, 134 insertions(+), 76 deletions(-)

diff --git a/dash-frontend/src/util/toast_manager.rs b/dash-frontend/src/util/toast_manager.rs
index d6eb3bd..929f6d9 100644
--- a/dash-frontend/src/util/toast_manager.rs
+++ b/dash-frontend/src/util/toast_manager.rs
@@ -124,7 +124,7 @@ impl ToastManager {
 		// show-up animation
 		layout.animations.add(Animation::new(
 			rect.id,
-			160,
+			160, // does not use anim_mult
 			AnimationEasing::Linear,
 			Box::new(move |common, data| {
 				let pos_showup = AnimationEasing::OutQuint.interpolate((data.pos * 4.0).min(1.0));
diff --git a/wgui/src/components/button.rs b/wgui/src/components/button.rs
index c185220..6ab9043 100644
--- a/wgui/src/components/button.rs
+++ b/wgui/src/components/button.rs
@@ -1,29 +1,30 @@
 use crate::{
 	animation::{Animation, AnimationEasing},
 	assets::AssetPath,
-	components::{self, Component, ComponentBase, ComponentTrait, RefreshData, tooltip::ComponentTooltip},
+	components::{self, tooltip::ComponentTooltip, Component, ComponentBase, ComponentTrait, RefreshData},
 	drawing::{self, Boundary, Color},
 	event::{CallbackDataCommon, EventListenerCollection, EventListenerID, EventListenerKind},
 	i18n::Translation,
 	layout::{LayoutTask, WidgetID, WidgetPair},
 	renderer_vk::{
 		text::{
-			FontWeight, TextStyle,
 			custom_glyph::{CustomGlyphContent, CustomGlyphData},
+			FontWeight, TextStyle,
 		},
 		util::centered_matrix,
 	},
 	widget::{
-		self, ConstructEssentials, EventResult, WidgetData,
+		self,
 		label::{WidgetLabel, WidgetLabelParams},
 		rectangle::{WidgetRectangle, WidgetRectangleParams},
 		sprite::{WidgetSprite, WidgetSpriteParams},
 		util::WLength,
+		ConstructEssentials, EventResult, WidgetData,
 	},
 };
 use glam::{Mat4, Vec3};
 use std::{cell::RefCell, rc::Rc};
-use taffy::{AlignItems, JustifyContent, prelude::length};
+use taffy::{prelude::length, AlignItems, JustifyContent};
 
 pub struct Params<'a> {
 	pub text: Option<Translation>, // if unset, label will not be populated
@@ -170,10 +171,13 @@ impl ComponentButton {
 			return;
 		}
 
+		let anim_mult = common.state.globals.defaults().animation_mult;
+		let anim_ticks = if sticky_down { 5. } else { 10. };
+
 		let state = self.state.clone();
 		let anim = Animation::new(
 			self.data.id_rect,
-			if sticky_down { 5 } else { 10 },
+			(anim_ticks * anim_mult) as _,
 			AnimationEasing::OutCubic,
 			Box::new(move |common, anim_data| {
 				let rect = anim_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
@@ -227,10 +231,10 @@ fn anim_hover(
 	rect.params.border_color = init_border_color.lerp(&colors.hover_border_color, mult);
 }
 
-fn anim_hover_create(state: Rc<RefCell<State>>, widget_id: WidgetID, fade_in: bool) -> Animation {
+fn anim_hover_create(state: Rc<RefCell<State>>, widget_id: WidgetID, fade_in: bool, anim_mult: f32) -> Animation {
 	Animation::new(
 		widget_id,
-		if fade_in { 5 } else { 10 },
+		((if fade_in { 5. } else { 10. }) * anim_mult) as _,
 		AnimationEasing::OutCubic,
 		Box::new(move |common, anim_data| {
 			let rect = anim_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
@@ -254,6 +258,7 @@ fn register_event_mouse_enter(
 	state: Rc<RefCell<State>>,
 	listeners: &mut EventListenerCollection,
 	info: Option<components::tooltip::TooltipInfo>,
+	anim_mult: f32,
 ) -> EventListenerID {
 	listeners.register(
 		EventListenerKind::MouseEnter,
@@ -262,7 +267,7 @@ fn register_event_mouse_enter(
 			common.alterables.mark_redraw();
 			common
 				.alterables
-				.animate(anim_hover_create(state.clone(), event_data.widget_id, true));
+				.animate(anim_hover_create(state.clone(), event_data.widget_id, true, anim_mult));
 
 			if let Some(info) = info.clone() {
 				common.alterables.tasks.push(LayoutTask::ModifyLayoutState({
@@ -282,14 +287,18 @@ fn register_event_mouse_enter(
 	)
 }
 
-fn register_event_mouse_leave(state: Rc<RefCell<State>>, listeners: &mut EventListenerCollection) -> EventListenerID {
+fn register_event_mouse_leave(
+	state: Rc<RefCell<State>>,
+	listeners: &mut EventListenerCollection,
+	anim_mult: f32,
+) -> EventListenerID {
 	listeners.register(
 		EventListenerKind::MouseLeave,
 		Box::new(move |common, event_data, (), ()| {
 			common.alterables.trigger_haptics();
 			common
 				.alterables
-				.animate(anim_hover_create(state.clone(), event_data.widget_id, false));
+				.animate(anim_hover_create(state.clone(), event_data.widget_id, false, anim_mult));
 			let mut state = state.borrow_mut();
 			state.active_tooltip = None;
 			state.hovered = false;
@@ -510,9 +519,16 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 		id: root.id,
 		lhandles: {
 			let mut widget = ess.layout.state.widgets.get(id_rect).unwrap().state();
+			let anim_mult = ess.layout.state.globals.defaults().animation_mult;
 			vec![
-				register_event_mouse_enter(data.clone(), state.clone(), &mut widget.event_listeners, params.tooltip),
-				register_event_mouse_leave(state.clone(), &mut widget.event_listeners),
+				register_event_mouse_enter(
+					data.clone(),
+					state.clone(),
+					&mut widget.event_listeners,
+					params.tooltip,
+					anim_mult,
+				),
+				register_event_mouse_leave(state.clone(), &mut widget.event_listeners, anim_mult),
 				register_event_mouse_press(state.clone(), &mut widget.event_listeners),
 				register_event_mouse_release(data.clone(), state.clone(), &mut widget.event_listeners),
 			]
diff --git a/wgui/src/components/checkbox.rs b/wgui/src/components/checkbox.rs
index affe0af..71195c9 100644
--- a/wgui/src/components/checkbox.rs
+++ b/wgui/src/components/checkbox.rs
@@ -1,7 +1,7 @@
 use std::{cell::RefCell, rc::Rc};
 use taffy::{
-	AlignItems,
 	prelude::{length, percent},
+	AlignItems,
 };
 
 use crate::{
@@ -13,10 +13,10 @@ use crate::{
 	layout::{self, WidgetID, WidgetPair},
 	renderer_vk::text::{FontWeight, TextStyle},
 	widget::{
-		ConstructEssentials, EventResult,
 		label::{WidgetLabel, WidgetLabelParams},
 		rectangle::{WidgetRectangle, WidgetRectangleParams},
 		util::WLength,
+		ConstructEssentials, EventResult,
 	},
 };
 
@@ -120,10 +120,10 @@ fn anim_hover(rect: &mut WidgetRectangle, pos: f32, pressed: bool) {
 	}
 }
 
-fn anim_hover_in(state: Rc<RefCell<State>>, widget_id: WidgetID) -> Animation {
+fn anim_hover_in(state: Rc<RefCell<State>>, widget_id: WidgetID, anim_mult: f32) -> Animation {
 	Animation::new(
 		widget_id,
-		5,
+		(5. * anim_mult) as _,
 		AnimationEasing::OutQuad,
 		Box::new(move |common, anim_data| {
 			let rect = anim_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
@@ -133,10 +133,10 @@ fn anim_hover_in(state: Rc<RefCell<State>>, widget_id: WidgetID) -> Animation {
 	)
 }
 
-fn anim_hover_out(state: Rc<RefCell<State>>, widget_id: WidgetID) -> Animation {
+fn anim_hover_out(state: Rc<RefCell<State>>, widget_id: WidgetID, anim_mult: f32) -> Animation {
 	Animation::new(
 		widget_id,
-		8,
+		(8. * anim_mult) as _,
 		AnimationEasing::OutQuad,
 		Box::new(move |common, anim_data| {
 			let rect = anim_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
@@ -146,28 +146,36 @@ fn anim_hover_out(state: Rc<RefCell<State>>, widget_id: WidgetID) -> Animation {
 	)
 }
 
-fn register_event_mouse_enter(state: Rc<RefCell<State>>, listeners: &mut EventListenerCollection) -> EventListenerID {
+fn register_event_mouse_enter(
+	state: Rc<RefCell<State>>,
+	listeners: &mut EventListenerCollection,
+	anim_mult: f32,
+) -> EventListenerID {
 	listeners.register(
 		EventListenerKind::MouseEnter,
 		Box::new(move |common, event_data, (), ()| {
 			common.alterables.trigger_haptics();
 			common
 				.alterables
-				.animate(anim_hover_in(state.clone(), event_data.widget_id));
+				.animate(anim_hover_in(state.clone(), event_data.widget_id, anim_mult));
 			state.borrow_mut().hovered = true;
 			Ok(EventResult::Pass)
 		}),
 	)
 }
 
-fn register_event_mouse_leave(state: Rc<RefCell<State>>, listeners: &mut EventListenerCollection) -> EventListenerID {
+fn register_event_mouse_leave(
+	state: Rc<RefCell<State>>,
+	listeners: &mut EventListenerCollection,
+	anim_mult: f32,
+) -> EventListenerID {
 	listeners.register(
 		EventListenerKind::MouseLeave,
 		Box::new(move |common, event_data, (), ()| {
 			common.alterables.trigger_haptics();
 			common
 				.alterables
-				.animate(anim_hover_out(state.clone(), event_data.widget_id));
+				.animate(anim_hover_out(state.clone(), event_data.widget_id, anim_mult));
 			state.borrow_mut().hovered = false;
 			Ok(EventResult::Pass)
 		}),
@@ -341,9 +349,10 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 		id: root.id,
 		lhandles: {
 			let mut widget = ess.layout.state.widgets.get(id_container).unwrap().state();
+			let anim_mult = ess.layout.state.globals.defaults().animation_mult;
 			vec![
-				register_event_mouse_enter(state.clone(), &mut widget.event_listeners),
-				register_event_mouse_leave(state.clone(), &mut widget.event_listeners),
+				register_event_mouse_enter(state.clone(), &mut widget.event_listeners, anim_mult),
+				register_event_mouse_leave(state.clone(), &mut widget.event_listeners, anim_mult),
 				register_event_mouse_press(state.clone(), &mut widget.event_listeners),
 				register_event_mouse_release(data.clone(), state.clone(), &mut widget.event_listeners),
 			]
diff --git a/wgui/src/components/slider.rs b/wgui/src/components/slider.rs
index bbb0964..1b7f0f7 100644
--- a/wgui/src/components/slider.rs
+++ b/wgui/src/components/slider.rs
@@ -18,11 +18,11 @@ use crate::{
 		util,
 	},
 	widget::{
-		ConstructEssentials, EventResult,
 		div::WidgetDiv,
 		label::{WidgetLabel, WidgetLabelParams},
 		rectangle::{WidgetRectangle, WidgetRectangleParams},
 		util::WLength,
+		ConstructEssentials, EventResult,
 	},
 };
 
@@ -263,10 +263,10 @@ fn anim_rect(rect: &mut WidgetRectangle, pos: f32) {
 	rect.params.border_color = drawing::Color::lerp(&HANDLE_BORDER_COLOR, &HANDLE_BORDER_COLOR_HOVERED, pos);
 }
 
-fn on_enter_anim(common: &mut event::CallbackDataCommon, handle_id: WidgetID) {
+fn on_enter_anim(common: &mut event::CallbackDataCommon, handle_id: WidgetID, anim_mult: f32) {
 	common.alterables.animate(Animation::new(
 		handle_id,
-		20,
+		(20. * anim_mult) as _,
 		AnimationEasing::OutBack,
 		Box::new(move |common, data| {
 			let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
@@ -277,10 +277,10 @@ fn on_enter_anim(common: &mut event::CallbackDataCommon, handle_id: WidgetID) {
 	));
 }
 
-fn on_leave_anim(common: &mut event::CallbackDataCommon, handle_id: WidgetID) {
+fn on_leave_anim(common: &mut event::CallbackDataCommon, handle_id: WidgetID, anim_mult: f32) {
 	common.alterables.animate(Animation::new(
 		handle_id,
-		10,
+		(10. * anim_mult) as _,
 		AnimationEasing::OutQuad,
 		Box::new(move |common, data| {
 			let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
@@ -295,13 +295,14 @@ fn register_event_mouse_enter(
 	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
 	listeners: &mut EventListenerCollection,
+	anim_mult: f32,
 ) -> event::EventListenerID {
 	listeners.register(
 		EventListenerKind::MouseEnter,
 		Box::new(move |common, _data, (), ()| {
 			common.alterables.trigger_haptics();
 			state.borrow_mut().hovered = true;
-			on_enter_anim(common, data.slider_handle_rect_id);
+			on_enter_anim(common, data.slider_handle_rect_id, anim_mult);
 			Ok(EventResult::Pass)
 		}),
 	)
@@ -311,13 +312,14 @@ fn register_event_mouse_leave(
 	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
 	listeners: &mut EventListenerCollection,
+	anim_mult: f32,
 ) -> event::EventListenerID {
 	listeners.register(
 		EventListenerKind::MouseLeave,
 		Box::new(move |common, _data, (), ()| {
 			common.alterables.trigger_haptics();
 			state.borrow_mut().hovered = false;
-			on_leave_anim(common, data.slider_handle_rect_id);
+			on_leave_anim(common, data.slider_handle_rect_id, anim_mult);
 			Ok(EventResult::Pass)
 		}),
 	)
@@ -500,12 +502,12 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 		id: root.id,
 		lhandles: {
 			let mut widget = ess.layout.state.widgets.get(body_id).unwrap().state();
+			let anim_mult = ess.layout.state.globals.defaults().animation_mult;
 			vec![
-				register_event_mouse_enter(data.clone(), state.clone(), &mut widget.event_listeners),
-				register_event_mouse_leave(data.clone(), state.clone(), &mut widget.event_listeners),
+				register_event_mouse_enter(data.clone(), state.clone(), &mut widget.event_listeners, anim_mult),
+				register_event_mouse_leave(data.clone(), state.clone(), &mut widget.event_listeners, anim_mult),
 				register_event_mouse_motion(data.clone(), state.clone(), &mut widget.event_listeners),
 				register_event_mouse_press(data.clone(), state.clone(), &mut widget.event_listeners),
-				register_event_mouse_leave(data.clone(), state.clone(), &mut widget.event_listeners),
 				register_event_mouse_release(state.clone(), &mut widget.event_listeners),
 			]
 		},
diff --git a/wgui/src/globals.rs b/wgui/src/globals.rs
index 24b9524..cdcbe59 100644
--- a/wgui/src/globals.rs
+++ b/wgui/src/globals.rs
@@ -22,7 +22,10 @@ pub struct Defaults {
 	pub accent_color: drawing::Color,
 	pub danger_color: drawing::Color,
 	pub faded_color: drawing::Color,
+	pub bg_color: drawing::Color,
 	pub translucent_alpha: f32,
+	pub animation_mult: f32,
+	pub rounding_mult: f32,
 }
 
 impl Default for Defaults {
@@ -34,7 +37,10 @@ impl Default for Defaults {
 			accent_color: drawing::Color::new(0.0, 0.54, 1.0, 1.0),
 			danger_color: drawing::Color::new(0.8, 0.0, 0.0, 1.0),
 			faded_color: drawing::Color::new(0.4, 0.5, 0.6, 1.0),
+			bg_color: drawing::Color::new(0.0039, 0.0078, 0.0235, 0.8352),
 			translucent_alpha: 0.25,
+			animation_mult: 1.0,
+			rounding_mult: 1.0,
 		}
 	}
 }
diff --git a/wgui/src/parser/component_button.rs b/wgui/src/parser/component_button.rs
index 1aeab62..02dab0f 100644
--- a/wgui/src/parser/component_button.rs
+++ b/wgui/src/parser/component_button.rs
@@ -1,13 +1,13 @@
 use crate::{
 	assets::AssetPath,
-	components::{Component, button, tooltip},
+	components::{button, tooltip, Component},
 	drawing::Color,
 	i18n::Translation,
 	layout::WidgetID,
 	parser::{
-		AttribPair, ParserContext, ParserFile, parse_check_f32, parse_check_i32, parse_children, print_invalid_attrib,
-		process_component,
+		parse_check_f32, parse_check_i32, parse_children, print_invalid_attrib, process_component,
 		style::{parse_color_opt, parse_round, parse_style, parse_text_style},
+		AttribPair, ParserContext, ParserFile,
 	},
 	widget::util::WLength,
 };
@@ -45,7 +45,7 @@ pub fn parse_component_button<'a>(
 				translation = Some(Translation::from_translation_key(value));
 			}
 			"round" => {
-				parse_round(value, &mut round);
+				parse_round(value, &mut round, ctx.doc_params.globals.get().defaults.rounding_mult);
 			}
 			"color" => {
 				parse_color_opt(value, &mut color);
diff --git a/wgui/src/parser/mod.rs b/wgui/src/parser/mod.rs
index ea22263..92fb89f 100644
--- a/wgui/src/parser/mod.rs
+++ b/wgui/src/parser/mod.rs
@@ -8,7 +8,7 @@ mod widget_rectangle;
 mod widget_sprite;
 
 use crate::{
-	assets::{AssetPath, AssetPathOwned, normalize_path},
+	assets::{normalize_path, AssetPath, AssetPathOwned},
 	components::{Component, ComponentWeak},
 	drawing::{self},
 	globals::WguiGlobals,
@@ -400,6 +400,7 @@ impl ParserContext<'_> {
 		insert_color_vars!(self, "accent", def.accent_color, def.translucent_alpha);
 		insert_color_vars!(self, "danger", def.danger_color, def.translucent_alpha);
 		insert_color_vars!(self, "faded", def.faded_color, def.translucent_alpha);
+		insert_color_vars!(self, "bg", def.bg_color, def.translucent_alpha);
 	}
 }
 
diff --git a/wgui/src/parser/style.rs b/wgui/src/parser/style.rs
index 8e2b1a6..46a8cb0 100644
--- a/wgui/src/parser/style.rs
+++ b/wgui/src/parser/style.rs
@@ -6,22 +6,22 @@ use taffy::{
 use crate::{
 	drawing,
 	parser::{
-		AttribPair, is_percent, parse_color_hex, parse_f32, parse_percent, parse_size_unit, parse_val,
-		print_invalid_attrib, print_invalid_value,
+		is_percent, parse_color_hex, parse_f32, parse_percent, parse_size_unit, parse_val, print_invalid_attrib,
+		print_invalid_value, AttribPair,
 	},
 	renderer_vk::text::{FontWeight, HorizontalAlign, TextStyle},
 	widget::util::WLength,
 };
 
-pub fn parse_round(value: &str, round: &mut WLength) {
+pub fn parse_round(value: &str, round: &mut WLength, multiplier: f32) {
 	if is_percent(value) {
 		if let Some(val) = parse_percent(value) {
-			*round = WLength::Percent(val);
+			*round = WLength::Percent((val * multiplier).clamp(0., 1.));
 		} else {
 			print_invalid_value(value);
 		}
 	} else if let Some(val) = parse_f32(value) {
-		*round = WLength::Units(val);
+		*round = WLength::Units((val * multiplier).max(0.));
 	} else {
 		print_invalid_value(value);
 	}
diff --git a/wgui/src/parser/widget_rectangle.rs b/wgui/src/parser/widget_rectangle.rs
index 86ee223..0b42326 100644
--- a/wgui/src/parser/widget_rectangle.rs
+++ b/wgui/src/parser/widget_rectangle.rs
@@ -2,8 +2,9 @@ use crate::{
 	drawing::GradientMode,
 	layout::WidgetID,
 	parser::{
-		AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, print_invalid_attrib,
+		parse_children, parse_widget_universal, print_invalid_attrib,
 		style::{parse_color, parse_round, parse_style},
+		AttribPair, ParserContext, ParserFile,
 	},
 	widget::rectangle::{WidgetRectangle, WidgetRectangleParams},
 };
@@ -40,7 +41,11 @@ pub fn parse_widget_rectangle<'a>(
 				}
 			}
 			"round" => {
-				parse_round(value, &mut params.round);
+				parse_round(
+					value,
+					&mut params.round,
+					ctx.doc_params.globals.get().defaults.rounding_mult,
+				);
 			}
 			"border" => {
 				params.border = value.parse().unwrap_or_else(|_| {
diff --git a/wlx-common/src/config.rs b/wlx-common/src/config.rs
index 03590e7..c064a51 100644
--- a/wlx-common/src/config.rs
+++ b/wlx-common/src/config.rs
@@ -92,9 +92,18 @@ pub struct GeneralConfig {
 	#[serde(default = "def_theme_path")]
 	pub theme_path: Arc<str>,
 
+	pub color_text: Option<String>,
 	pub color_accent: Option<String>,
 	pub color_danger: Option<String>,
 	pub color_faded: Option<String>,
+	pub color_background: Option<String>,
+
+	#[serde(default = "def_one")]
+	pub animation_speed: f32,
+
+	#[serde(default = "def_one")]
+	pub round_multiplier: f32,
+
 	pub default_keymap: Option<String>,
 
 	#[serde(default)]
diff --git a/wlx-overlay-s/src/assets/gui/keyboard.xml b/wlx-overlay-s/src/assets/gui/keyboard.xml
index a2c5d1c..f012e92 100644
--- a/wlx-overlay-s/src/assets/gui/keyboard.xml
+++ b/wlx-overlay-s/src/assets/gui/keyboard.xml
@@ -15,7 +15,7 @@
   <template name="KeySpecial">
     <div macro="keycap_div">
       <rectangle id="${id}" macro="keycap_rect">
-        <sprite width="32" height="32" src="keyboard/${text}.svg" />
+        <sprite color="~color_text" width="32" height="32" src="keyboard/${text}.svg" />
       </rectangle>
     </div>
   </template>
diff --git a/wlx-overlay-s/src/overlays/edit/lock.rs b/wlx-overlay-s/src/overlays/edit/lock.rs
index 4aa54ad..0825095 100644
--- a/wlx-overlay-s/src/overlays/edit/lock.rs
+++ b/wlx-overlay-s/src/overlays/edit/lock.rs
@@ -54,6 +54,7 @@ impl InteractLockHandler {
         &mut self,
         common: &mut CallbackDataCommon,
         app: &mut AppState,
+        anim_mult: f32,
     ) -> Box<ModifyOverlayTask> {
         let defaults = app.wgui_globals.get().defaults.clone();
         let rect_color = self.color;
@@ -63,7 +64,7 @@ impl InteractLockHandler {
         let anim = if self.interactable {
             Animation::new(
                 self.id,
-                10,
+                (10. * anim_mult) as _,
                 AnimationEasing::OutQuad,
                 Box::new(move |common, data| {
                     let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
@@ -79,7 +80,7 @@ impl InteractLockHandler {
         } else {
             Animation::new(
                 self.id,
-                10,
+                (10. * anim_mult) as _,
                 AnimationEasing::OutBack,
                 Box::new(move |common, data| {
                     let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
diff --git a/wlx-overlay-s/src/overlays/edit/mod.rs b/wlx-overlay-s/src/overlays/edit/mod.rs
index 3694e1d..e6581b3 100644
--- a/wlx-overlay-s/src/overlays/edit/mod.rs
+++ b/wlx-overlay-s/src/overlays/edit/mod.rs
@@ -282,6 +282,8 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
         mouse: SpriteTabHandler::default(),
     };
 
+    let anim_mult = app.wgui_globals.defaults().animation_mult;
+
     let on_custom_attrib: OnCustomAttribFunc = Box::new(move |layout, attribs, _app| {
         for (name, kind, test_btn) in &BUTTON_EVENTS {
             let Some(action) = attribs.get_value(name) else {
@@ -300,7 +302,7 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                     }
 
                     let sel = OverlaySelector::Id(*state.id.borrow());
-                    let task = state.lock.toggle(common, app);
+                    let task = state.lock.toggle(common, app, anim_mult);
                     app.tasks
                         .enqueue(TaskType::Overlay(OverlayTask::Modify(sel, task)));
                     Ok(EventResult::Consumed)
diff --git a/wlx-overlay-s/src/overlays/keyboard/builder.rs b/wlx-overlay-s/src/overlays/keyboard/builder.rs
index 4989fb1..5974e42 100644
--- a/wlx-overlay-s/src/overlays/keyboard/builder.rs
+++ b/wlx-overlay-s/src/overlays/keyboard/builder.rs
@@ -39,11 +39,13 @@ pub(super) fn create_keyboard_panel(
     let globals = app.wgui_globals.clone();
     let accent_color = globals.get().defaults.accent_color;
 
+    let anim_mult = globals.defaults().animation_mult;
+
     let (background, _) = panel.layout.add_child(
         panel.layout.content_root_widget,
         WidgetRectangle::create(WidgetRectangleParams {
-            color: wgui::drawing::Color::new(0., 0., 0., 0.75),
-            round: WLength::Units(16.0),
+            color: globals.defaults().bg_color,
+            round: WLength::Units((16.0 * globals.defaults().rounding_mult).max(0.)),
             border: 2.0,
             border_color: accent_color,
             ..Default::default()
@@ -176,7 +178,7 @@ pub(super) fn create_keyboard_panel(
                         let k = key_state.clone();
                         move |common, data, _app, _state| {
                             common.alterables.trigger_haptics();
-                            on_enter_anim(k.clone(), common, data, accent_color);
+                            on_enter_anim(k.clone(), common, data, accent_color, anim_mult);
                             Ok(EventResult::Pass)
                         }
                     }),
@@ -188,7 +190,7 @@ pub(super) fn create_keyboard_panel(
                         let k = key_state.clone();
                         move |common, data, _app, _state| {
                             common.alterables.trigger_haptics();
-                            on_leave_anim(k.clone(), common, data, accent_color);
+                            on_leave_anim(k.clone(), common, data, accent_color, anim_mult);
                             Ok(EventResult::Pass)
                         }
                     }),
@@ -291,10 +293,11 @@ fn on_enter_anim(
     common: &mut event::CallbackDataCommon,
     data: &event::CallbackData,
     accent_color: drawing::Color,
+    anim_mult: f32,
 ) {
     common.alterables.animate(Animation::new(
         data.widget_id,
-        10,
+        (10. * anim_mult) as _,
         AnimationEasing::OutBack,
         Box::new(move |common, data| {
             let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
@@ -310,10 +313,11 @@ fn on_leave_anim(
     common: &mut event::CallbackDataCommon,
     data: &event::CallbackData,
     accent_color: drawing::Color,
+    anim_mult: f32,
 ) {
     common.alterables.animate(Animation::new(
         data.widget_id,
-        15,
+        (15. * anim_mult) as _,
         AnimationEasing::OutQuad,
         Box::new(move |common, data| {
             let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
diff --git a/wlx-overlay-s/src/res/config.yaml b/wlx-overlay-s/src/res/config.yaml
index 073a1d0..77624eb 100644
--- a/wlx-overlay-s/src/res/config.yaml
+++ b/wlx-overlay-s/src/res/config.yaml
@@ -91,9 +91,17 @@
 #theme_path: "theme"
 
 ## These can be used to control the color theme of WlxOverlay-S.
+#color_text: "#ffffff"
 #color_accent: "#008cff"
 #color_danger: "#ff3300"
 #color_faded: "#668299"
+#color_background: "#010206",
+
+## Multiplier for animation speed. 2.0 → double speed, 0.5 → half speed
+#animation_speed: 1.0
+
+## Adjust this between 0..1 for a more rectangular feel.
+#round_multiplier: 1.0
 
 ## Path to custom skybox texture, relative to `~/.config/wlxoverlay`
 #skybox_texture: ""
diff --git a/wlx-overlay-s/src/state.rs b/wlx-overlay-s/src/state.rs
index e68c80f..072e463 100644
--- a/wlx-overlay-s/src/state.rs
+++ b/wlx-overlay-s/src/state.rs
@@ -3,7 +3,7 @@ use idmap::IdMap;
 use smallvec::{SmallVec, smallvec};
 use std::sync::Arc;
 use wgui::{
-    font_config::WguiFontConfig, gfx::WGfx, globals::WguiGlobals, parser::parse_color_hex,
+    drawing, font_config::WguiFontConfig, gfx::WGfx, globals::WguiGlobals, parser::parse_color_hex,
     renderer_vk::context::SharedContext as WSharedContext,
 };
 use wlx_common::{
@@ -96,26 +96,21 @@ impl AppState {
         let theme = session.config.theme_path.clone();
 
         let mut defaults = wgui::globals::Defaults::default();
-        defaults.accent_color = session
-            .config
-            .color_accent
-            .as_ref()
-            .and_then(|c| parse_color_hex(&c))
-            .unwrap_or(defaults.accent_color);
 
-        defaults.danger_color = session
-            .config
-            .color_danger
-            .as_ref()
-            .and_then(|c| parse_color_hex(&c))
-            .unwrap_or(defaults.danger_color);
+        fn apply_color(default: &mut drawing::Color, value: &Option<String>) {
+            if let Some(parsed) = value.as_ref().and_then(|c| parse_color_hex(c)) {
+                *default = parsed;
+            }
+        }
 
-        defaults.faded_color = session
-            .config
-            .color_faded
-            .as_ref()
-            .and_then(|c| parse_color_hex(&c))
-            .unwrap_or(defaults.faded_color);
+        apply_color(&mut defaults.text_color, &session.config.color_text);
+        apply_color(&mut defaults.accent_color, &session.config.color_accent);
+        apply_color(&mut defaults.danger_color, &session.config.color_danger);
+        apply_color(&mut defaults.faded_color, &session.config.color_faded);
+        apply_color(&mut defaults.bg_color, &session.config.color_background);
+
+        defaults.animation_mult = 1. / session.config.animation_speed;
+        defaults.rounding_mult = session.config.round_multiplier;
 
         let dbus = DbusConnector::default();
 

From b90b7336e0ad7e9e6090f38842f4816e9086838f Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Mon, 22 Dec 2025 17:47:46 +0900
Subject: [PATCH 11/29] add universal _long_release and variants

---
 wgui/src/components/button.rs                |  16 +-
 wgui/src/parser/component_button.rs          |   7 +-
 wgui/src/widget/mod.rs                       |   6 +-
 wlx-common/src/config.rs                     |   3 +
 wlx-overlay-s/src/assets/gui/edit.xml        |   4 +-
 wlx-overlay-s/src/assets/gui/watch-noset.xml |   2 +-
 wlx-overlay-s/src/assets/gui/watch.xml       |   2 +-
 wlx-overlay-s/src/gui/README.md              |   8 +-
 wlx-overlay-s/src/gui/panel/button.rs        | 147 +++++++++++++++----
 wlx-overlay-s/src/gui/panel/mod.rs           |   5 +-
 wlx-overlay-s/src/overlays/edit/mod.rs       |  57 +++----
 wlx-overlay-s/src/overlays/watch.rs          |  64 ++++----
 wlx-overlay-s/src/res/config.yaml            |   6 +-
 13 files changed, 223 insertions(+), 104 deletions(-)

diff --git a/wgui/src/components/button.rs b/wgui/src/components/button.rs
index 6ab9043..95656b2 100644
--- a/wgui/src/components/button.rs
+++ b/wgui/src/components/button.rs
@@ -23,7 +23,11 @@ use crate::{
 	},
 };
 use glam::{Mat4, Vec3};
-use std::{cell::RefCell, rc::Rc};
+use std::{
+	cell::RefCell,
+	rc::Rc,
+	time::{Duration, Instant},
+};
 use taffy::{prelude::length, AlignItems, JustifyContent};
 
 pub struct Params<'a> {
@@ -42,6 +46,7 @@ pub struct Params<'a> {
 	/// until "un-clicked". this is visual only.
 	/// set the initial state using `set_sticky_state`
 	pub sticky: bool,
+	pub long_press_time: f32,
 }
 
 impl Default for Params<'_> {
@@ -59,6 +64,7 @@ impl Default for Params<'_> {
 			text_style: TextStyle::default(),
 			tooltip: None,
 			sticky: false,
+			long_press_time: 0.0,
 		}
 	}
 }
@@ -80,6 +86,7 @@ struct State {
 	on_click: Option<ButtonClickCallback>,
 	active_tooltip: Option<Rc<ComponentTooltip>>,
 	colors: Colors,
+	last_pressed: Instant,
 }
 
 struct Data {
@@ -152,6 +159,10 @@ impl ComponentButton {
 		rect.params.color2 = get_color2(&color);
 	}
 
+	pub fn get_time_since_last_pressed(&self) -> Duration {
+		self.state.borrow().last_pressed.elapsed()
+	}
+
 	pub fn on_click(&self, func: ButtonClickCallback) {
 		self.state.borrow_mut().on_click = Some(func);
 	}
@@ -329,6 +340,7 @@ fn register_event_mouse_press(state: Rc<RefCell<State>>, listeners: &mut EventLi
 
 			if state.hovered {
 				state.down = true;
+				state.last_pressed = Instant::now();
 				Ok(EventResult::Consumed)
 			} else {
 				Ok(EventResult::Pass)
@@ -357,7 +369,6 @@ fn register_event_mouse_release(
 
 			if state.down {
 				state.down = false;
-
 				if state.hovered
 					&& let Some(on_click) = &state.on_click
 				{
@@ -507,6 +518,7 @@ pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Resul
 		on_click: None,
 		active_tooltip: None,
 		sticky_down: false,
+		last_pressed: Instant::now(),
 		colors: Colors {
 			color,
 			border_color,
diff --git a/wgui/src/parser/component_button.rs b/wgui/src/parser/component_button.rs
index 02dab0f..51727d1 100644
--- a/wgui/src/parser/component_button.rs
+++ b/wgui/src/parser/component_button.rs
@@ -5,7 +5,7 @@ use crate::{
 	i18n::Translation,
 	layout::WidgetID,
 	parser::{
-		parse_check_f32, parse_check_i32, parse_children, print_invalid_attrib, process_component,
+		parse_check_f32, parse_check_i32, parse_children, parse_f32, print_invalid_attrib, process_component,
 		style::{parse_color_opt, parse_round, parse_style, parse_text_style},
 		AttribPair, ParserContext, ParserFile,
 	},
@@ -28,6 +28,7 @@ pub fn parse_component_button<'a>(
 	let mut tooltip: Option<String> = None;
 	let mut tooltip_side: Option<tooltip::TooltipSide> = None;
 	let mut sticky: bool = false;
+	let mut long_press_time = 0.0;
 	let mut sprite_src: Option<AssetPath> = None;
 
 	let mut translation: Option<Translation> = None;
@@ -92,6 +93,9 @@ pub fn parse_component_button<'a>(
 				let mut sticky_i32 = 0;
 				sticky = parse_check_i32(value, &mut sticky_i32) && sticky_i32 == 1;
 			}
+			"long_press_time" => {
+				long_press_time = parse_f32(value).unwrap_or(long_press_time);
+			}
 			_ => {}
 		}
 	}
@@ -113,6 +117,7 @@ pub fn parse_component_button<'a>(
 				text: Translation::from_translation_key(&t),
 			}),
 			sticky,
+			long_press_time,
 			sprite_src,
 		},
 	)?;
diff --git a/wgui/src/widget/mod.rs b/wgui/src/widget/mod.rs
index 43ad633..f0712a4 100644
--- a/wgui/src/widget/mod.rs
+++ b/wgui/src/widget/mod.rs
@@ -205,7 +205,11 @@ impl EventResult {
 
 	#[must_use]
 	pub fn merge(self, other: Self) -> Self {
-		if self > other { self } else { other }
+		if self > other {
+			self
+		} else {
+			other
+		}
 	}
 }
 
diff --git a/wlx-common/src/config.rs b/wlx-common/src/config.rs
index c064a51..ce87a79 100644
--- a/wlx-common/src/config.rs
+++ b/wlx-common/src/config.rs
@@ -121,6 +121,9 @@ pub struct GeneralConfig {
 	#[serde(default = "def_one")]
 	pub scroll_speed: f32,
 
+	#[serde(default = "def_one")]
+	pub long_press_duration: f32,
+
 	#[serde(default = "def_mouse_move_interval_ms")]
 	pub mouse_move_interval_ms: u32,
 
diff --git a/wlx-overlay-s/src/assets/gui/edit.xml b/wlx-overlay-s/src/assets/gui/edit.xml
index 4582b19..27a44af 100644
--- a/wlx-overlay-s/src/assets/gui/edit.xml
+++ b/wlx-overlay-s/src/assets/gui/edit.xml
@@ -15,7 +15,7 @@
   </template>
 
   <template name="TopButtonDanger">
-    <Button macro="button_style" tooltip="${tooltip}" _press="${press}" _release="${release}" border_color="~color_danger_translucent" color="~color_danger_5" color2="~color_danger_1">
+    <Button macro="button_style" tooltip="${tooltip}" _long_release="${long_release}" border_color="~color_danger_translucent" color="~color_danger_5" color2="~color_danger_1">
       <sprite width="48" height="48" src="${src}" />
     </Button>
   </template>
@@ -48,7 +48,7 @@
                 <TopButton sticky="0" id="top_mouse" src="edit/normal.svg" tooltip="EDIT_MODE.MOUSE.TITLE" press="::EditModeTab mouse" />
                 <!-- TopButton sticky="0" id="top_move" src="edit/move-all.svg" tooltip="EDIT_MODE.MOVE_PRESS_AND_DRAG" / -->
                 <!-- TopButton sticky="0" id="top_resize" src="edit/resize.svg" tooltip="EDIT_MODE.RESIZE_PRESS_AND_DRAG" / -->
-                <TopButtonDanger src="edit/delete.svg" tooltip="EDIT_MODE.DELETE" press="::EditModeDeletePress" release="::EditModeDeleteRelease" />
+                <TopButtonDanger src="edit/delete.svg" tooltip="EDIT_MODE.DELETE" long_release="::EditModeDelete" />
                 <div width="8" height="100%" />
                 <TopButtonFaded src="watch/edit.svg" tooltip="EDIT_MODE.LEAVE" press="::EditToggle" />
               </div>
diff --git a/wlx-overlay-s/src/assets/gui/watch-noset.xml b/wlx-overlay-s/src/assets/gui/watch-noset.xml
index d2faa63..fb5c179 100644
--- a/wlx-overlay-s/src/assets/gui/watch-noset.xml
+++ b/wlx-overlay-s/src/assets/gui/watch-noset.xml
@@ -35,7 +35,7 @@ All overlays are listed on bottom row.
 
   <template name="Overlay">
     <Button macro="button_style" id="overlay_${idx}" 
-      tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::SingleSetOverlayToggle ${idx}"
+      tooltip="WATCH.TOGGLE_FOR_CURRENT_SET" _press="::SingleSetOverlayToggle ${idx}" _long_release="::SingleSetOverlayReset ${idx}"
       align_items="center"
       height="40">
       <sprite id="overlay_${idx}_sprite" src_builtin="${src}" width="32" height="32" />
diff --git a/wlx-overlay-s/src/assets/gui/watch.xml b/wlx-overlay-s/src/assets/gui/watch.xml
index 36d17f7..eb75f2d 100644
--- a/wlx-overlay-s/src/assets/gui/watch.xml
+++ b/wlx-overlay-s/src/assets/gui/watch.xml
@@ -140,7 +140,7 @@
             <sprite color="~set_color" width="40" height="40" src="watch/wayvr_dashboard_mono.svg" />
           </Button>
           <div id="edit_delete" display="none">
-            <Button macro="button_style" _press="::EditModeDeleteDown" _release="::EditModeDeleteUp" tooltip="WATCH.LONG_PRESS_TO_DELETE_SET" tooltip_side="top" border_color="~color_danger_translucent" color="~color_danger_5" color2="~color_danger_1">
+            <Button macro="button_style" _long_release="::EditModeDeleteSet" tooltip="WATCH.LONG_PRESS_TO_DELETE_SET" tooltip_side="top" border_color="~color_danger_translucent" color="~color_danger_5" color2="~color_danger_1">
               <sprite color="~set_color" width="40" height="40" src="edit/delete.svg" />
             </Button>
           </div>
diff --git a/wlx-overlay-s/src/gui/README.md b/wlx-overlay-s/src/gui/README.md
index 029b1f2..23bb465 100644
--- a/wlx-overlay-s/src/gui/README.md
+++ b/wlx-overlay-s/src/gui/README.md
@@ -81,11 +81,17 @@ Supported events:
 <button _press="..." _release="..." />
 ```
 
-Laser-color-specific variants are also available:
+Laser-color-specific variants are also available
 - `_press_left` & `_release_left` for blue laser
 - `_press_right` & `_release_right` for orange laser
 - `_press_middle` & `_release_middle` for purple laser
 
+Release after short/long press (length controlled by config `long_press_duration`)
+- `_short_release` & `_long_release` for any laser
+- `_short_release_left` & `_long_release_left` for blue laser
+- `_short_release_right` & `_long_release_right` for orange laser
+- `_short_release_middle` & `_long_release_middle` for purple laser
+
 #### Supported button actions
 
 ##### `::ShellExec <command> [args ..]`
diff --git a/wlx-overlay-s/src/gui/panel/button.rs b/wlx-overlay-s/src/gui/panel/button.rs
index 5129d19..81f8d1f 100644
--- a/wlx-overlay-s/src/gui/panel/button.rs
+++ b/wlx-overlay-s/src/gui/panel/button.rs
@@ -33,38 +33,115 @@ use crate::{
 #[cfg(feature = "wayvr")]
 use crate::backend::wayvr::WayVRAction;
 
-pub const BUTTON_EVENTS: [(&str, EventListenerKind, fn(&mut CallbackData) -> bool); 8] = [
-    ("_press", EventListenerKind::MousePress, any_button),
-    ("_release", EventListenerKind::MouseRelease, any_button),
-    ("_press_left", EventListenerKind::MousePress, left_button),
+pub const BUTTON_EVENTS: [(
+    &str,
+    EventListenerKind,
+    fn(&mut CallbackData) -> bool,
+    fn(&ComponentButton, &AppState) -> bool,
+); 16] = [
+    (
+        "_press",
+        EventListenerKind::MousePress,
+        button_any,
+        short_duration,
+    ),
+    (
+        "_release",
+        EventListenerKind::MouseRelease,
+        button_any,
+        ignore_duration,
+    ),
+    (
+        "_press_left",
+        EventListenerKind::MousePress,
+        button_left,
+        ignore_duration,
+    ),
     (
         "_release_left",
         EventListenerKind::MouseRelease,
-        left_button,
+        button_left,
+        ignore_duration,
+    ),
+    (
+        "_press_right",
+        EventListenerKind::MousePress,
+        button_right,
+        ignore_duration,
     ),
-    ("_press_right", EventListenerKind::MousePress, right_button),
     (
         "_release_right",
         EventListenerKind::MouseRelease,
-        right_button,
+        button_right,
+        ignore_duration,
     ),
     (
         "_press_middle",
         EventListenerKind::MousePress,
-        middle_button,
+        button_middle,
+        ignore_duration,
     ),
     (
         "_release_middle",
         EventListenerKind::MouseRelease,
-        middle_button,
+        button_middle,
+        ignore_duration,
+    ),
+    (
+        "_short_release",
+        EventListenerKind::MouseRelease,
+        button_any,
+        short_duration,
+    ),
+    (
+        "_short_release_left",
+        EventListenerKind::MouseRelease,
+        button_left,
+        short_duration,
+    ),
+    (
+        "_short_release_right",
+        EventListenerKind::MouseRelease,
+        button_right,
+        short_duration,
+    ),
+    (
+        "_short_release_middle",
+        EventListenerKind::MouseRelease,
+        button_middle,
+        short_duration,
+    ),
+    (
+        "_long_release",
+        EventListenerKind::MouseRelease,
+        button_any,
+        long_duration,
+    ),
+    (
+        "_long_release_left",
+        EventListenerKind::MouseRelease,
+        button_left,
+        long_duration,
+    ),
+    (
+        "_long_release_right",
+        EventListenerKind::MouseRelease,
+        button_right,
+        long_duration,
+    ),
+    (
+        "_long_release_middle",
+        EventListenerKind::MouseRelease,
+        button_middle,
+        long_duration,
     ),
 ];
 
-fn any_button(_: &mut CallbackData) -> bool {
+fn button_any(_: &mut CallbackData) -> bool {
     true
 }
 
-fn left_button(data: &mut CallbackData) -> bool {
+fn button_left(data: &mut CallbackData) -> bool {
     if let CallbackMetadata::MouseButton(b) = data.metadata
         && let MouseButtonIndex::Left = b.index
     {
@@ -73,7 +150,7 @@ fn left_button(data: &mut CallbackData) -> bool {
         false
     }
 }
-fn right_button(data: &mut CallbackData) -> bool {
+fn button_right(data: &mut CallbackData) -> bool {
     if let CallbackMetadata::MouseButton(b) = data.metadata
         && let MouseButtonIndex::Right = b.index
     {
@@ -82,7 +159,7 @@ fn right_button(data: &mut CallbackData) -> bool {
         false
     }
 }
-fn middle_button(data: &mut CallbackData) -> bool {
+fn button_middle(data: &mut CallbackData) -> bool {
     if let CallbackMetadata::MouseButton(b) = data.metadata
         && let MouseButtonIndex::Middle = b.index
     {
@@ -92,13 +169,23 @@ fn middle_button(data: &mut CallbackData) -> bool {
     }
 }
 
+fn ignore_duration(_btn: &ComponentButton, _app: &AppState) -> bool {
+    true
+}
+fn long_duration(btn: &ComponentButton, app: &AppState) -> bool {
+    btn.get_time_since_last_pressed().as_secs_f32() > app.session.config.long_press_duration
+}
+fn short_duration(btn: &ComponentButton, app: &AppState) -> bool {
+    btn.get_time_since_last_pressed().as_secs_f32() < app.session.config.long_press_duration
+}
+
 pub(super) fn setup_custom_button<S: 'static>(
     layout: &mut Layout,
     attribs: &CustomAttribsInfoOwned,
     _app: &AppState,
     button: Rc<ComponentButton>,
 ) {
-    for (name, kind, test_btn) in &BUTTON_EVENTS {
+    for (name, kind, test_button, test_duration) in &BUTTON_EVENTS {
         let Some(action) = attribs.get_value(name) else {
             continue;
         };
@@ -108,10 +195,12 @@ pub(super) fn setup_custom_button<S: 'static>(
             continue;
         };
 
+        let button = button.clone();
+
         let callback: EventCallback<AppState, S> = match command {
             #[cfg(feature = "wayvr")]
             "::DashToggle" => Box::new(move |_common, data, app, _| {
-                if !test_btn(data) {
+                if !test_button(data) || !test_duration(&button, app) {
                     return Ok(EventResult::Pass);
                 }
 
@@ -126,7 +215,7 @@ pub(super) fn setup_custom_button<S: 'static>(
                     return;
                 };
                 Box::new(move |_common, data, app, _| {
-                    if !test_btn(data) {
+                    if !test_button(data) || !test_duration(&button, app) {
                         return Ok(EventResult::Pass);
                     }
 
@@ -142,7 +231,7 @@ pub(super) fn setup_custom_button<S: 'static>(
                 };
 
                 Box::new(move |_common, data, app, _| {
-                    if !test_btn(data) {
+                    if !test_button(data) || !test_duration(&button, app) {
                         return Ok(EventResult::Pass);
                     }
 
@@ -160,7 +249,7 @@ pub(super) fn setup_custom_button<S: 'static>(
                 })
             }
             "::EditToggle" => Box::new(move |_common, data, app, _| {
-                if !test_btn(data) {
+                if !test_button(data) || !test_duration(&button, app) {
                     return Ok(EventResult::Pass);
                 }
 
@@ -170,7 +259,7 @@ pub(super) fn setup_custom_button<S: 'static>(
             }),
             #[cfg(feature = "wayland")]
             "::NewMirror" => Box::new(move |_common, data, app, _| {
-                if !test_btn(data) {
+                if !test_button(data) || !test_duration(&button, app) {
                     return Ok(EventResult::Pass);
                 }
 
@@ -187,7 +276,7 @@ pub(super) fn setup_custom_button<S: 'static>(
                 Ok(EventResult::Consumed)
             }),
             "::CleanupMirrors" => Box::new(move |_common, data, app, _| {
-                if !test_btn(data) {
+                if !test_button(data) || !test_duration(&button, app) {
                     return Ok(EventResult::Pass);
                 }
 
@@ -196,7 +285,7 @@ pub(super) fn setup_custom_button<S: 'static>(
                 Ok(EventResult::Consumed)
             }),
             "::PlayspaceReset" => Box::new(move |_common, data, app, _| {
-                if !test_btn(data) {
+                if !test_button(data) || !test_duration(&button, app) {
                     return Ok(EventResult::Pass);
                 }
 
@@ -204,7 +293,7 @@ pub(super) fn setup_custom_button<S: 'static>(
                 Ok(EventResult::Consumed)
             }),
             "::PlayspaceRecenter" => Box::new(move |_common, data, app, _| {
-                if !test_btn(data) {
+                if !test_button(data) || !test_duration(&button, app) {
                     return Ok(EventResult::Pass);
                 }
 
@@ -213,7 +302,7 @@ pub(super) fn setup_custom_button<S: 'static>(
                 Ok(EventResult::Consumed)
             }),
             "::PlayspaceFixFloor" => Box::new(move |_common, data, app, _| {
-                if !test_btn(data) {
+                if !test_button(data) || !test_duration(&button, app) {
                     return Ok(EventResult::Pass);
                 }
 
@@ -233,8 +322,8 @@ pub(super) fn setup_custom_button<S: 'static>(
                 );
                 Ok(EventResult::Consumed)
             }),
-            "::Shutdown" => Box::new(move |_common, data, _app, _| {
-                if !test_btn(data) {
+            "::Shutdown" => Box::new(move |_common, data, app, _| {
+                if !test_button(data) || !test_duration(&button, app) {
                     return Ok(EventResult::Pass);
                 }
 
@@ -255,7 +344,7 @@ pub(super) fn setup_custom_button<S: 'static>(
                     return;
                 };
                 Box::new(move |_common, data, app, _| {
-                    if !test_btn(data) {
+                    if !test_button(data) || !test_duration(&button, app) {
                         return Ok(EventResult::Pass);
                     }
 
@@ -285,8 +374,8 @@ pub(super) fn setup_custom_button<S: 'static>(
                     }),
                 );
 
-                Box::new(move |_common, data, _app, _| {
-                    if !test_btn(data) {
+                Box::new(move |_common, data, app, _| {
+                    if !test_button(data) || !test_duration(&button, app) {
                         return Ok(EventResult::Pass);
                     }
 
@@ -314,7 +403,7 @@ pub(super) fn setup_custom_button<S: 'static>(
                 }
 
                 Box::new(move |_common, data, app, _| {
-                    if !test_btn(data) {
+                    if !test_button(data) || !test_duration(&button, app) {
                         return Ok(EventResult::Pass);
                     }
 
diff --git a/wlx-overlay-s/src/gui/panel/mod.rs b/wlx-overlay-s/src/gui/panel/mod.rs
index 3cfb4c6..66a4d1f 100644
--- a/wlx-overlay-s/src/gui/panel/mod.rs
+++ b/wlx-overlay-s/src/gui/panel/mod.rs
@@ -70,7 +70,8 @@ pub type OnCustomIdFunc<S> = Box<
     ) -> anyhow::Result<()>,
 >;
 
-pub type OnCustomAttribFunc = Box<dyn Fn(&mut Layout, &CustomAttribsInfoOwned, &AppState)>;
+pub type OnCustomAttribFunc =
+    Box<dyn Fn(&mut Layout, &ParserState, &CustomAttribsInfoOwned, &AppState)>;
 
 pub struct NewGuiPanelParams<S> {
     pub on_custom_id: Option<OnCustomIdFunc<S>>, // used only in `new_from_template`
@@ -155,7 +156,7 @@ impl<S: 'static> GuiPanel<S> {
             }
 
             if let Some(on_custom_attrib) = &params.on_custom_attrib {
-                on_custom_attrib(&mut layout, elem, app);
+                on_custom_attrib(&mut layout, &parser_state, elem, app);
             }
         }
 
diff --git a/wlx-overlay-s/src/overlays/edit/mod.rs b/wlx-overlay-s/src/overlays/edit/mod.rs
index e6581b3..48eb05a 100644
--- a/wlx-overlay-s/src/overlays/edit/mod.rs
+++ b/wlx-overlay-s/src/overlays/edit/mod.rs
@@ -47,21 +47,9 @@ mod sprite_tab;
 mod stereo;
 pub mod tab;
 
-pub(super) struct LongPressButtonState {
-    pub(super) pressed: Instant,
-}
-impl Default for LongPressButtonState {
-    fn default() -> Self {
-        Self {
-            pressed: Instant::now(),
-        }
-    }
-}
-
 struct EditModeState {
     tasks: Rc<RefCell<TaskContainer>>,
     id: Rc<RefCell<OverlayID>>,
-    delete: LongPressButtonState,
     tabs: ButtonPaneTabSwitcher,
     lock: InteractLockHandler,
     pos: SpriteTabHandler<PosTabState>,
@@ -272,9 +260,6 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
     let state = EditModeState {
         id: Rc::new(RefCell::new(OverlayID::null())),
         tasks: Rc::new(RefCell::new(TaskContainer::new())),
-        delete: LongPressButtonState {
-            pressed: Instant::now(),
-        },
         tabs: ButtonPaneTabSwitcher::default(),
         lock: InteractLockHandler::default(),
         pos: SpriteTabHandler::default(),
@@ -284,8 +269,14 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
 
     let anim_mult = app.wgui_globals.defaults().animation_mult;
 
-    let on_custom_attrib: OnCustomAttribFunc = Box::new(move |layout, attribs, _app| {
-        for (name, kind, test_btn) in &BUTTON_EVENTS {
+    let on_custom_attrib: OnCustomAttribFunc = Box::new(move |layout, parser, attribs, _app| {
+        let Ok(button) =
+            parser.fetch_component_from_widget_id_as::<ComponentButton>(attribs.widget_id)
+        else {
+            return;
+        };
+
+        for (name, kind, test_button, test_duration) in &BUTTON_EVENTS {
             let Some(action) = attribs.get_value(name) else {
                 continue;
             };
@@ -295,9 +286,11 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                 continue;
             };
 
+            let button = button.clone();
+
             let callback: EventCallback<AppState, EditModeState> = match command {
                 "::EditModeToggleLock" => Box::new(move |common, data, app, state| {
-                    if !test_btn(data) {
+                    if !test_button(data) || !test_duration(&button, app) {
                         return Ok(EventResult::Pass);
                     }
 
@@ -308,7 +301,7 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                     Ok(EventResult::Consumed)
                 }),
                 "::EditModeToggleGrab" => Box::new(move |_common, data, app, state| {
-                    if !test_btn(data) {
+                    if !test_button(data) || !test_duration(&button, app) {
                         return Ok(EventResult::Pass);
                     }
 
@@ -324,8 +317,8 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                 }),
                 "::EditModeTab" => {
                     let tab_name = args.next().unwrap().to_owned();
-                    Box::new(move |common, data, _app, state| {
-                        if !test_btn(data) {
+                    Box::new(move |common, data, app, state| {
+                        if !test_button(data) || !test_duration(&button, app) {
                             return Ok(EventResult::Pass);
                         }
 
@@ -336,7 +329,7 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                 "::EditModeSetPos" => {
                     let key = args.next().unwrap().to_owned();
                     Box::new(move |common, data, app, state| {
-                        if !test_btn(data) {
+                        if !test_button(data) || !test_duration(&button, app) {
                             return Ok(EventResult::Pass);
                         }
 
@@ -350,7 +343,7 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                 "::EditModeSetStereo" => {
                     let key = args.next().unwrap().to_owned();
                     Box::new(move |common, data, app, state| {
-                        if !test_btn(data) {
+                        if !test_button(data) || !test_duration(&button, app) {
                             return Ok(EventResult::Pass);
                         }
 
@@ -364,7 +357,7 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                 "::EditModeSetMouse" => {
                     let key = args.next().unwrap().to_owned();
                     Box::new(move |common, data, app, state| {
-                        if !test_btn(data) {
+                        if !test_button(data) || !test_duration(&button, app) {
                             return Ok(EventResult::Pass);
                         }
 
@@ -375,23 +368,11 @@ fn make_edit_panel(app: &mut AppState) -> anyhow::Result<EditModeWrapPanel> {
                         Ok(EventResult::Consumed)
                     })
                 }
-                "::EditModeDeletePress" => Box::new(move |_common, data, _app, state| {
-                    if !test_btn(data) {
+                "::EditModeDelete" => Box::new(move |_common, data, app, state| {
+                    if !test_button(data) || !test_duration(&button, app) {
                         return Ok(EventResult::Pass);
                     }
 
-                    state.delete.pressed = Instant::now();
-                    // TODO: animate to light up button after 2s
-                    Ok(EventResult::Consumed)
-                }),
-                "::EditModeDeleteRelease" => Box::new(move |_common, data, app, state| {
-                    if !test_btn(data) {
-                        return Ok(EventResult::Pass);
-                    }
-
-                    if state.delete.pressed.elapsed() < Duration::from_secs(1) {
-                        return Ok(EventResult::Pass);
-                    }
                     app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
                         OverlaySelector::Id(*state.id.borrow()),
                         Box::new(move |_app, owc| {
diff --git a/wlx-overlay-s/src/overlays/watch.rs b/wlx-overlay-s/src/overlays/watch.rs
index 2095505..0071d44 100644
--- a/wlx-overlay-s/src/overlays/watch.rs
+++ b/wlx-overlay-s/src/overlays/watch.rs
@@ -1,8 +1,4 @@
-use std::{
-    collections::HashMap,
-    rc::Rc,
-    time::{Duration, Instant},
-};
+use std::{collections::HashMap, rc::Rc, time::Duration};
 
 use glam::{Affine3A, Quat, Vec3, Vec3A, vec3};
 use idmap::DirectIdMap;
@@ -31,7 +27,6 @@ use crate::{
         panel::{GuiPanel, NewGuiPanelParams, OnCustomAttribFunc, button::BUTTON_EVENTS},
         timer::GuiTimer,
     },
-    overlays::edit::LongPressButtonState,
     state::AppState,
     windowing::{
         OverlayID, OverlaySelector, Z_ORDER_WATCH,
@@ -70,7 +65,6 @@ struct WatchState {
     keyboard_oid: OverlayID,
     dashboard_oid: OverlayID,
     num_sets: usize,
-    delete: LongPressButtonState,
 }
 
 #[allow(clippy::significant_drop_tightening)]
@@ -78,8 +72,14 @@ struct WatchState {
 pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
     let state = WatchState::default();
 
-    let on_custom_attrib: OnCustomAttribFunc = Box::new(move |layout, attribs, _app| {
-        for (name, kind, test_btn) in &BUTTON_EVENTS {
+    let on_custom_attrib: OnCustomAttribFunc = Box::new(move |layout, parser, attribs, _app| {
+        let Ok(button) =
+            parser.fetch_component_from_widget_id_as::<ComponentButton>(attribs.widget_id)
+        else {
+            return;
+        };
+
+        for (name, kind, test_button, test_duration) in &BUTTON_EVENTS {
             let Some(action) = attribs.get_value(name) else {
                 continue;
             };
@@ -89,29 +89,20 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
                 continue;
             };
 
+            let button = button.clone();
+
             let callback: EventCallback<AppState, WatchState> = match command {
-                "::EditModeDeleteDown" => Box::new(move |_common, data, _app, state| {
-                    if !test_btn(data) {
+                "::EditModeDeleteSet" => Box::new(move |_common, data, app, _state| {
+                    if !test_button(data) || !test_duration(&button, app) {
                         return Ok(EventResult::Pass);
                     }
 
-                    state.delete.pressed = Instant::now();
-                    Ok(EventResult::Consumed)
-                }),
-                "::EditModeDeleteUp" => Box::new(move |_common, data, app, state| {
-                    if !test_btn(data) {
-                        return Ok(EventResult::Pass);
-                    }
-
-                    if state.delete.pressed.elapsed() < Duration::from_secs(1) {
-                        return Ok(EventResult::Consumed);
-                    }
                     app.tasks
                         .enqueue(TaskType::Overlay(OverlayTask::DeleteActiveSet));
                     Ok(EventResult::Consumed)
                 }),
                 "::EditModeAddSet" => Box::new(move |_common, data, app, _state| {
-                    if !test_btn(data) {
+                    if !test_button(data) || !test_duration(&button, app) {
                         return Ok(EventResult::Pass);
                     }
 
@@ -125,7 +116,7 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
                         return;
                     };
                     Box::new(move |_common, data, app, state| {
-                        if !test_btn(data) {
+                        if !test_button(data) || !test_duration(&button, app) {
                             return Ok(EventResult::Pass);
                         }
 
@@ -154,7 +145,7 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
                         return;
                     };
                     Box::new(move |_common, data, app, state| {
-                        if !test_btn(data) {
+                        if !test_button(data) || !test_duration(&button, app) {
                             return Ok(EventResult::Pass);
                         }
 
@@ -170,6 +161,29 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
                         Ok(EventResult::Consumed)
                     })
                 }
+                "::SingleSetOverlayReset" => {
+                    let arg = args.next().unwrap_or_default();
+                    let Ok(idx) = arg.parse::<usize>() else {
+                        log::error!("{command} has invalid argument: \"{arg}\"");
+                        return;
+                    };
+                    Box::new(move |_common, data, app, state| {
+                        if !test_button(data) || !test_duration(&button, app) {
+                            return Ok(EventResult::Pass);
+                        }
+
+                        let Some(overlay) = state.overlay_metas.get(idx) else {
+                            log::error!("No overlay at index {idx}.");
+                            return Ok(EventResult::Consumed);
+                        };
+
+                        app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
+                            OverlaySelector::Id(overlay.id),
+                            Box::new(|app, owc| owc.activate(app)),
+                        )));
+                        Ok(EventResult::Consumed)
+                    })
+                }
                 _ => return,
             };
 
diff --git a/wlx-overlay-s/src/res/config.yaml b/wlx-overlay-s/src/res/config.yaml
index 77624eb..b58fe17 100644
--- a/wlx-overlay-s/src/res/config.yaml
+++ b/wlx-overlay-s/src/res/config.yaml
@@ -95,7 +95,7 @@
 #color_accent: "#008cff"
 #color_danger: "#ff3300"
 #color_faded: "#668299"
-#color_background: "#010206",
+#color_background: "#010206"
 
 ## Multiplier for animation speed. 2.0 → double speed, 0.5 → half speed
 #animation_speed: 1.0
@@ -175,6 +175,10 @@
 #xr_click_sensitivity: 0.7
 #xr_click_sensitivity_release: 0.5
 
+## How many seconds to buttons need to be held
+## before it's considered a long press
+#long_press_duration: 1.0
+
 ## Change speed of scrolling
 # 0.5 → half the speed
 # 2.0 → twice the speed

From 9e6d4379b87ca38137f586eed2f486b2e2b00fd8 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Mon, 22 Dec 2025 20:22:21 +0900
Subject: [PATCH 12/29] add bgr8-unorm to supported dds

---
 wlx-overlay-s/src/graphics/dds.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wlx-overlay-s/src/graphics/dds.rs b/wlx-overlay-s/src/graphics/dds.rs
index f309ac8..cfacee0 100644
--- a/wlx-overlay-s/src/graphics/dds.rs
+++ b/wlx-overlay-s/src/graphics/dds.rs
@@ -75,6 +75,7 @@ pub fn dds_to_vk(dds_fmt: ImageFormat) -> anyhow::Result<Format> {
         ImageFormat::Rgba8UnormSrgb => Ok(Format::R8G8B8A8_SRGB),
         ImageFormat::Rgba16Float => Ok(Format::R16G16B16A16_SFLOAT),
         ImageFormat::Rgba32Float => Ok(Format::R32G32B32A32_SFLOAT),
+        ImageFormat::Bgr8Unorm => Ok(Format::B8G8R8_UNORM),
         ImageFormat::Bgra8Unorm => Ok(Format::B8G8R8A8_UNORM),
         ImageFormat::Bgra8UnormSrgb => Ok(Format::B8G8R8A8_SRGB),
         // DXT1

From 4e770586181c7dc15ecb224163af78c5323a22a4 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Mon, 22 Dec 2025 20:50:00 +0900
Subject: [PATCH 13/29] toast translations, empty set warning

---
 wlx-common/src/overlays.rs                    |  1 +
 wlx-overlay-s/src/assets/lang/en.json         | 11 ++++++
 wlx-overlay-s/src/backend/openxr/playspace.rs |  2 +-
 wlx-overlay-s/src/gui/panel/button.rs         | 19 +++++-----
 wlx-overlay-s/src/overlays/toast.rs           | 37 ++++++++-----------
 wlx-overlay-s/src/state.rs                    |  1 +
 wlx-overlay-s/src/windowing/manager.rs        | 31 ++++++++++++++--
 7 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/wlx-common/src/overlays.rs b/wlx-common/src/overlays.rs
index 150f16b..1b82d44 100644
--- a/wlx-common/src/overlays.rs
+++ b/wlx-common/src/overlays.rs
@@ -4,6 +4,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Clone, Copy, PartialEq, Eq, IntegerId, Serialize, Deserialize)]
 pub enum ToastTopic {
 	System,
+	Error,
 	DesktopNotification,
 	XSNotification,
 	IpdChange,
diff --git a/wlx-overlay-s/src/assets/lang/en.json b/wlx-overlay-s/src/assets/lang/en.json
index 0bdb704..bf683c8 100644
--- a/wlx-overlay-s/src/assets/lang/en.json
+++ b/wlx-overlay-s/src/assets/lang/en.json
@@ -58,6 +58,17 @@
 		"GRABBING_FLOATING": "This overlay is Floating and will stay in place, unless recentered.",
 		"GRABBING_FOLLOW": "This overlay will follow the device it is attached to."
 	},
+	"TOAST": {
+		"DEFAULT_TITLE": "Notification",
+		"ERROR": "Error",
+		"CANNOT_REMOVE_SET": "Cannot remove set!",
+		"NO_SET_SELECTED": "No set is selected.",
+		"LAST_EXISTING_SET": "This is the last existing set.",
+		"EMPTY_SET": "Empty set!",
+		"LETS_ADD_OVERLAYS": "Let's add some overlays from the watch!",
+		"FIXING_FLOOR": "Fixing floor in 5 seconds...",
+		"ONE_CONTROLLER_ON_FLOOR": "Place one controller on the floor!"
+	},
 	"WATCH": {
 		"ADD_NEW_SET": "Add a new set",
 		"CLEANUP_MIRRORS": "Remove mirrors that are\nnot currently visible",
diff --git a/wlx-overlay-s/src/backend/openxr/playspace.rs b/wlx-overlay-s/src/backend/openxr/playspace.rs
index 8c0bdaf..1c402ca 100644
--- a/wlx-overlay-s/src/backend/openxr/playspace.rs
+++ b/wlx-overlay-s/src/backend/openxr/playspace.rs
@@ -238,7 +238,7 @@ impl PlayspaceMover {
 
         let y1 = input.pointers[0].raw_pose.translation.y;
         let y2 = input.pointers[1].raw_pose.translation.y;
-        let delta = y1.min(y2) - 0.03;
+        let delta = y1.min(y2) - 0.05;
 
         pose.position.y += delta;
 
diff --git a/wlx-overlay-s/src/gui/panel/button.rs b/wlx-overlay-s/src/gui/panel/button.rs
index 81f8d1f..578b902 100644
--- a/wlx-overlay-s/src/gui/panel/button.rs
+++ b/wlx-overlay-s/src/gui/panel/button.rs
@@ -306,16 +306,15 @@ pub(super) fn setup_custom_button<S: 'static>(
                     return Ok(EventResult::Pass);
                 }
 
-                for i in 0..5 {
-                    Toast::new(
-                        ToastTopic::System,
-                        format!("Fixing floor in {}", 5 - i),
-                        "Touch your controller to the floor!".into(),
-                    )
-                    .with_timeout(1.)
-                    .with_sound(true)
-                    .submit_at(app, Instant::now() + Duration::from_secs(i));
-                }
+                Toast::new(
+                    ToastTopic::System,
+                    "TOAST.FIXING_FLOOR".into(),
+                    "TOAST.ONE_CONTROLLER_ON_FLOOR".into(),
+                )
+                .with_timeout(5.)
+                .with_sound(true)
+                .submit(app);
+
                 app.tasks.enqueue_at(
                     TaskType::Playspace(PlayspaceTask::FixFloor),
                     Instant::now() + Duration::from_secs(5),
diff --git a/wlx-overlay-s/src/overlays/toast.rs b/wlx-overlay-s/src/overlays/toast.rs
index a2bb58f..7ad73a4 100644
--- a/wlx-overlay-s/src/overlays/toast.rs
+++ b/wlx-overlay-s/src/overlays/toast.rs
@@ -16,7 +16,6 @@ use wlx_common::{
 use crate::{
     backend::task::{OverlayTask, TaskType},
     gui::panel::{GuiPanel, NewGuiPanelParams, OnCustomIdFunc},
-    overlays::watch::{WATCH_POS, WATCH_ROT},
     state::AppState,
     windowing::{OverlaySelector, Z_ORDER_TOAST, window::OverlayWindowConfig},
 };
@@ -121,35 +120,29 @@ fn new_toast(toast: Toast, app: &mut AppState) -> Option<OverlayWindowConfig> {
             Positioning::FollowHead { lerp: 0.1 },
         ),
         ToastDisplayMethod::Watch => {
-            //FIXME: properly follow watch
-            let watch_pos = WATCH_POS + vec3(-0.005, -0.05, 0.02);
-            let watch_rot = WATCH_ROT;
-            let relative_to = /*match app.session.config.watch_hand {
-                LeftRight::Left =>*/ Positioning::FollowHand {
-                    hand: LeftRight::Left,
-                    lerp: 1.0,
-                    align_to_hmd: true,
-                /*
-                },
-                LeftRight::Right => {
-                    watch_pos.x = -watch_pos.x;
-                    watch_rot = watch_rot * Quat::from_rotation_x(PI) * Quat::from_rotation_z(PI);
-                    Positioning::FollowHand {
-                        hand: LeftRight::Right,
-                        lerp: 1.0,
-                    }
-                }*/
+            let relative_to = Positioning::FollowHand {
+                hand: LeftRight::Left,
+                lerp: 0.1,
+                align_to_hmd: true,
             };
-            (watch_pos, watch_rot, relative_to)
+            (vec3(0., 0., 0.), Quat::IDENTITY, relative_to)
         }
     };
 
     let title = if toast.title.is_empty() {
         Translation::from_translation_key("TOAST.DEFAULT_TITLE")
+    } else if matches!(toast.topic, ToastTopic::System | ToastTopic::Error) {
+        Translation::from_translation_key(&toast.title)
     } else {
         Translation::from_raw_text(&toast.title)
     };
 
+    let body = if matches!(toast.topic, ToastTopic::System) {
+        Translation::from_translation_key(&toast.body)
+    } else {
+        Translation::from_raw_text(&toast.body)
+    };
+
     let on_custom_id: OnCustomIdFunc<()> =
         Box::new(move |id, widget, _doc_params, layout, _parser_state, ()| {
             if &*id == "toast_title" {
@@ -168,7 +161,7 @@ fn new_toast(toast: Toast, app: &mut AppState) -> Option<OverlayWindowConfig> {
                     .get_as::<WidgetLabel>(widget)
                     .context("toast.xml: missing element with id: toast_body")?;
                 let mut globals = layout.state.globals.get();
-                label.set_text_simple(&mut globals, Translation::from_raw_text(&toast.body));
+                label.set_text_simple(&mut globals, body.clone());
             }
             Ok(())
         });
@@ -206,7 +199,7 @@ fn new_toast(toast: Toast, app: &mut AppState) -> Option<OverlayWindowConfig> {
 }
 
 fn msg_err(app: &mut AppState, message: &str) {
-    Toast::new(ToastTopic::System, "Error".into(), message.into())
+    Toast::new(ToastTopic::Error, "TOAST.ERROR".into(), message.into())
         .with_timeout(3.)
         .submit(app);
 }
diff --git a/wlx-overlay-s/src/state.rs b/wlx-overlay-s/src/state.rs
index 072e463..0c083f1 100644
--- a/wlx-overlay-s/src/state.rs
+++ b/wlx-overlay-s/src/state.rs
@@ -200,6 +200,7 @@ impl AppSession {
 
         let mut toast_topics = IdMap::new();
         toast_topics.insert(ToastTopic::System, ToastDisplayMethod::Center);
+        toast_topics.insert(ToastTopic::Error, ToastDisplayMethod::Center);
         toast_topics.insert(ToastTopic::DesktopNotification, ToastDisplayMethod::Center);
         toast_topics.insert(ToastTopic::XSNotification, ToastDisplayMethod::Center);
 
diff --git a/wlx-overlay-s/src/windowing/manager.rs b/wlx-overlay-s/src/windowing/manager.rs
index 95de2f7..76373ed 100644
--- a/wlx-overlay-s/src/windowing/manager.rs
+++ b/wlx-overlay-s/src/windowing/manager.rs
@@ -49,6 +49,7 @@ pub struct OverlayWindowManager<T> {
     watch_id: OverlayID,
     edit_mode: bool,
     dropped_overlays: VecDeque<OverlayWindowData<T>>,
+    initialized: bool,
 }
 
 impl<T> OverlayWindowManager<T>
@@ -66,6 +67,7 @@ where
             watch_id: OverlayID::null(), // set down below
             edit_mode: false,
             dropped_overlays: VecDeque::with_capacity(8),
+            initialized: false,
         };
 
         let mut wayland = false;
@@ -148,6 +150,8 @@ where
                 .notify(app, ev)?;
         }
 
+        me.initialized = true;
+
         Ok(me)
     }
 
@@ -199,8 +203,8 @@ where
                 let Some(set) = self.current_set else {
                     Toast::new(
                         ToastTopic::System,
-                        "Can't remove set".into(),
-                        "No set is selected!".into(),
+                        "TOAST.CANNOT_REMOVE_SET".into(),
+                        "TOAST.NO_SET_SELECTED".into(),
                     )
                     .with_timeout(5.)
                     .with_sound(true)
@@ -211,8 +215,8 @@ where
                 if self.sets.len() <= 1 {
                     Toast::new(
                         ToastTopic::System,
-                        "Can't remove set".into(),
-                        "This is the last existing set!".into(),
+                        "TOAST.CANNOT_REMOVE_SET".into(),
+                        "TOAST.LAST_EXISTING_SET".into(),
                     )
                     .with_timeout(5.)
                     .with_sound(true)
@@ -658,6 +662,7 @@ impl<T> OverlayWindowManager<T> {
                 return;
             }
 
+            let mut num_overlays = 0;
             let ws = &mut self.sets[new_set];
             for (id, data) in self.overlays.iter_mut().filter(|(_, d)| !d.config.global) {
                 if let Some(state) = ws.overlays.remove(id) {
@@ -666,10 +671,28 @@ impl<T> OverlayWindowManager<T> {
                     if !keep_transforms {
                         data.config.reset(app, false);
                     }
+                    if !matches!(
+                        data.config.category,
+                        OverlayCategory::Internal
+                            | OverlayCategory::Keyboard
+                            | OverlayCategory::Dashboard
+                    ) {
+                        num_overlays += 1;
+                    }
                 }
             }
             ws.overlays.clear();
             self.restore_set = new_set;
+
+            if !self.edit_mode && self.initialized && num_overlays < 1 {
+                Toast::new(
+                    ToastTopic::System,
+                    "TOAST.EMPTY_SET".into(),
+                    "TOAST.LETS_ADD_OVERLAYS".into(),
+                )
+                .with_timeout(3.)
+                .submit(app);
+            }
         }
         self.current_set = new_set;
 

From ff33657959b20f4f5c88bf0a494f1a3281ec6e15 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Mon, 22 Dec 2025 21:23:32 +0900
Subject: [PATCH 14/29] fix keycap scaling anim

---
 .../src/overlays/keyboard/builder.rs          | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/wlx-overlay-s/src/overlays/keyboard/builder.rs b/wlx-overlay-s/src/overlays/keyboard/builder.rs
index 5974e42..83ba4c9 100644
--- a/wlx-overlay-s/src/overlays/keyboard/builder.rs
+++ b/wlx-overlay-s/src/overlays/keyboard/builder.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashMap, rc::Rc};
 
 use crate::{gui::panel::GuiPanel, state::AppState, subsystem::hid::XkbKeymap};
-use glam::{FloatExt, Mat4, Vec2, Vec3, vec2};
+use glam::{FloatExt, Mat4, Vec2, vec2, vec3};
 use wgui::{
     animation::{Animation, AnimationEasing},
     assets::AssetPath,
@@ -171,6 +171,8 @@ pub(super) fn create_keyboard_panel(
                     })
                 };
 
+                let width_mul = 1. / my_size_f32;
+
                 panel.add_event_listener(
                     widget_id,
                     EventListenerKind::MouseEnter,
@@ -178,7 +180,14 @@ pub(super) fn create_keyboard_panel(
                         let k = key_state.clone();
                         move |common, data, _app, _state| {
                             common.alterables.trigger_haptics();
-                            on_enter_anim(k.clone(), common, data, accent_color, anim_mult);
+                            on_enter_anim(
+                                k.clone(),
+                                common,
+                                data,
+                                accent_color,
+                                anim_mult,
+                                width_mul,
+                            );
                             Ok(EventResult::Pass)
                         }
                     }),
@@ -190,7 +199,14 @@ pub(super) fn create_keyboard_panel(
                         let k = key_state.clone();
                         move |common, data, _app, _state| {
                             common.alterables.trigger_haptics();
-                            on_leave_anim(k.clone(), common, data, accent_color, anim_mult);
+                            on_leave_anim(
+                                k.clone(),
+                                common,
+                                data,
+                                accent_color,
+                                anim_mult,
+                                width_mul,
+                            );
                             Ok(EventResult::Pass)
                         }
                     }),
@@ -256,11 +272,14 @@ pub(super) fn create_keyboard_panel(
 
 const BUTTON_HOVER_SCALE: f32 = 0.1;
 
-fn get_anim_transform(pos: f32, widget_size: Vec2) -> Mat4 {
-    util::centered_matrix(
-        widget_size,
-        &Mat4::from_scale(Vec3::splat(BUTTON_HOVER_SCALE.mul_add(pos, 1.0))),
-    )
+fn get_anim_transform(pos: f32, widget_size: Vec2, width_mult: f32) -> Mat4 {
+    let scale = vec3(
+        (BUTTON_HOVER_SCALE * width_mult).mul_add(pos, 1.0),
+        BUTTON_HOVER_SCALE.mul_add(pos, 1.0),
+        1.0,
+    );
+
+    util::centered_matrix(widget_size, &Mat4::from_scale(scale))
 }
 
 fn set_anim_color(
@@ -294,6 +313,7 @@ fn on_enter_anim(
     data: &event::CallbackData,
     accent_color: drawing::Color,
     anim_mult: f32,
+    width_mult: f32,
 ) {
     common.alterables.animate(Animation::new(
         data.widget_id,
@@ -302,7 +322,8 @@ fn on_enter_anim(
         Box::new(move |common, data| {
             let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
             set_anim_color(&key_state, rect, data.pos, accent_color);
-            data.data.transform = get_anim_transform(data.pos, data.widget_boundary.size);
+            data.data.transform =
+                get_anim_transform(data.pos, data.widget_boundary.size, width_mult);
             common.alterables.mark_redraw();
         }),
     ));
@@ -314,6 +335,7 @@ fn on_leave_anim(
     data: &event::CallbackData,
     accent_color: drawing::Color,
     anim_mult: f32,
+    width_mult: f32,
 ) {
     common.alterables.animate(Animation::new(
         data.widget_id,
@@ -322,7 +344,8 @@ fn on_leave_anim(
         Box::new(move |common, data| {
             let rect = data.obj.get_as_mut::<WidgetRectangle>().unwrap();
             set_anim_color(&key_state, rect, 1.0 - data.pos, accent_color);
-            data.data.transform = get_anim_transform(1.0 - data.pos, data.widget_boundary.size);
+            data.data.transform =
+                get_anim_transform(1.0 - data.pos, data.widget_boundary.size, width_mult);
             common.alterables.mark_redraw();
         }),
     ));

From 30fd56402ad3e71564b258702ed9397c4445cf2e Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Tue, 23 Dec 2025 00:10:02 +0900
Subject: [PATCH 15/29] fix openxr line colors

---
 wlx-overlay-s/src/backend/openxr/lines.rs | 37 +++++++++++------------
 wlx-overlay-s/src/backend/openxr/mod.rs   |  4 +--
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/wlx-overlay-s/src/backend/openxr/lines.rs b/wlx-overlay-s/src/backend/openxr/lines.rs
index 49439bd..40f1420 100644
--- a/wlx-overlay-s/src/backend/openxr/lines.rs
+++ b/wlx-overlay-s/src/backend/openxr/lines.rs
@@ -11,7 +11,6 @@ use std::{
 };
 
 use wgui::gfx::{
-    WGfx,
     cmd::WGfxClearMode,
     pass::WGfxPass,
     pipeline::{WGfxPipeline, WPipelineCreateInfo},
@@ -49,8 +48,6 @@ static COLORS: [[f32; 6]; 5] = {
 pub(super) struct LinePool {
     lines: IdMap<usize, LineContainer>,
     pipeline: Arc<WGfxPipeline<Vert2Uv>>,
-    pass: WGfxPass<Vert2Uv>,
-    buf_color: Subbuffer<[f32]>,
 }
 
 impl LinePool {
@@ -61,13 +58,22 @@ impl LinePool {
             WPipelineCreateInfo::new(app.gfx.surface_format),
         )?;
 
+        Ok(Self {
+            lines: IdMap::new(),
+            pipeline,
+        })
+    }
+
+    pub(super) fn allocate(&mut self, xr: &XrState, app: &AppState) -> anyhow::Result<usize> {
+        let id = LINE_AUTO_INCREMENT.fetch_add(1, Ordering::Relaxed);
+
         let buf_color = app
             .gfx
             .empty_buffer(BufferUsage::TRANSFER_DST | BufferUsage::UNIFORM_BUFFER, 6)?;
 
-        let set0 = pipeline.buffer(0, buf_color.clone())?;
+        let set0 = self.pipeline.buffer(0, buf_color.clone())?;
 
-        let pass = pipeline.create_pass(
+        let pass = self.pipeline.create_pass(
             [1.0, 1.0],
             app.gfx_extras.quad_verts.clone(),
             0..4,
@@ -76,22 +82,13 @@ impl LinePool {
             &Default::default(),
         )?;
 
-        Ok(Self {
-            lines: IdMap::new(),
-            pipeline,
-            pass,
-            buf_color,
-        })
-    }
-
-    pub(super) fn allocate(&mut self, xr: &XrState, gfx: Arc<WGfx>) -> anyhow::Result<usize> {
-        let id = LINE_AUTO_INCREMENT.fetch_add(1, Ordering::Relaxed);
-
-        let srd = create_swapchain(xr, gfx, [1, 1, 1], SwapchainOpts::new())?;
+        let srd = create_swapchain(xr, app.gfx.clone(), [1, 1, 1], SwapchainOpts::new())?;
         self.lines.insert(
             id,
             LineContainer {
                 swapchain: srd,
+                buf_color,
+                pass,
                 maybe_line: None,
             },
         );
@@ -165,13 +162,13 @@ impl LinePool {
                     .next()
                     .unwrap();
 
-                self.buf_color.write()?[0..6].copy_from_slice(&COLORS[inner.color]);
+                line.buf_color.write()?[0..6].copy_from_slice(&COLORS[inner.color]);
 
                 let mut cmd_buffer = app
                     .gfx
                     .create_gfx_command_buffer(CommandBufferUsage::OneTimeSubmit)?;
                 cmd_buffer.begin_rendering(tgt, WGfxClearMode::DontCare)?;
-                cmd_buffer.run_ref(&self.pass)?;
+                cmd_buffer.run_ref(&line.pass)?;
                 cmd_buffer.end_rendering()?;
 
                 futures.execute(cmd_buffer.queue.clone(), cmd_buffer.build()?)?;
@@ -217,5 +214,7 @@ pub(super) struct Line {
 
 struct LineContainer {
     swapchain: WlxSwapchain,
+    buf_color: Subbuffer<[f32]>,
+    pass: WGfxPass<Vert2Uv>,
     maybe_line: Option<Line>,
 }
diff --git a/wlx-overlay-s/src/backend/openxr/mod.rs b/wlx-overlay-s/src/backend/openxr/mod.rs
index e6fe762..27fc268 100644
--- a/wlx-overlay-s/src/backend/openxr/mod.rs
+++ b/wlx-overlay-s/src/backend/openxr/mod.rs
@@ -149,8 +149,8 @@ pub fn openxr_run(show_by_default: bool, headless: bool) -> Result<(), BackendEr
     };
 
     let pointer_lines = [
-        lines.allocate(&xr_state, app.gfx.clone())?,
-        lines.allocate(&xr_state, app.gfx.clone())?,
+        lines.allocate(&xr_state, &mut app)?,
+        lines.allocate(&xr_state, &mut app)?,
     ];
 
     let watch_id = overlays.lookup(WATCH_NAME).unwrap(); // want panic

From a20ca4cc2b51b112398358e00a28231fe60f8bb9 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Tue, 23 Dec 2025 00:44:32 +0900
Subject: [PATCH 16/29] dont apply round multiplier to percentage values

---
 wgui/src/parser/style.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wgui/src/parser/style.rs b/wgui/src/parser/style.rs
index 46a8cb0..8ae92aa 100644
--- a/wgui/src/parser/style.rs
+++ b/wgui/src/parser/style.rs
@@ -16,7 +16,7 @@ use crate::{
 pub fn parse_round(value: &str, round: &mut WLength, multiplier: f32) {
 	if is_percent(value) {
 		if let Some(val) = parse_percent(value) {
-			*round = WLength::Percent((val * multiplier).clamp(0., 1.));
+			*round = WLength::Percent(val);
 		} else {
 			print_invalid_value(value);
 		}

From 4ea58298242d3b9880244bf13e265ae9ddbca799 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Tue, 23 Dec 2025 01:06:16 +0900
Subject: [PATCH 17/29] fix sticky state on Lock Interaction

---
 wlx-overlay-s/src/assets/gui/edit.xml   |  2 +-
 wlx-overlay-s/src/overlays/edit/lock.rs | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/wlx-overlay-s/src/assets/gui/edit.xml b/wlx-overlay-s/src/assets/gui/edit.xml
index 27a44af..3a2da94 100644
--- a/wlx-overlay-s/src/assets/gui/edit.xml
+++ b/wlx-overlay-s/src/assets/gui/edit.xml
@@ -39,7 +39,7 @@
           <rectangle padding="16" gap="8" round="32" color="~color_bg" border="2" border_color="~color_accent" justify_content="center">
             <div flex_direction="column" gap="8">
               <div flex_direction="row" gap="4">
-                <TopButton sticky="1" id="top_lock" src="edit/lock_open.svg" tooltip="EDIT_MODE.LOCK_INTERACTION" press="::EditModeToggleLock" />
+                <TopButton sticky="0" id="top_lock" src="edit/lock_open.svg" tooltip="EDIT_MODE.LOCK_INTERACTION" press="::EditModeToggleLock" />
                 <TopButton sticky="1" id="top_grab" src="edit/disable-grab.svg" tooltip="EDIT_MODE.DISABLE_GRAB" press="::EditModeToggleGrab" />
                 <TopButton sticky="0" id="top_pos" src="edit/anchor.svg" tooltip="EDIT_MODE.POSITIONING" press="::EditModeTab pos" />
                 <TopButton sticky="0" id="top_alpha" src="edit/fade.svg" tooltip="EDIT_MODE.OPACITY" press="::EditModeTab alpha" />
diff --git a/wlx-overlay-s/src/overlays/edit/lock.rs b/wlx-overlay-s/src/overlays/edit/lock.rs
index 0825095..6be7fa2 100644
--- a/wlx-overlay-s/src/overlays/edit/lock.rs
+++ b/wlx-overlay-s/src/overlays/edit/lock.rs
@@ -1,7 +1,10 @@
+use std::rc::Rc;
+
 use anyhow::Context;
 use glam::FloatExt;
 use wgui::{
     animation::{Animation, AnimationEasing},
+    components::button::ComponentButton,
     event::CallbackDataCommon,
     layout::WidgetID,
     parser::Fetchable,
@@ -15,6 +18,7 @@ pub(super) struct InteractLockHandler {
     id: WidgetID,
     color: wgui::drawing::Color,
     interactable: bool,
+    button: Option<Rc<ComponentButton>>,
 }
 
 impl InteractLockHandler {
@@ -27,10 +31,13 @@ impl InteractLockHandler {
             .get_as::<WidgetRectangle>(id)
             .context("Element with id=\"shadow\" must be a <rectangle>")?;
 
+        let button = panel.parser_state.fetch_component_as("top_lock")?;
+
         Ok(Self {
             id,
             color: shadow_rect.params.color,
             interactable: true,
+            button: Some(button),
         })
     }
 
@@ -42,6 +49,10 @@ impl InteractLockHandler {
             .get_as::<WidgetRectangle>(self.id)
             .unwrap(); // can only fail if set_up_rect has issues
 
+        if let Some(button) = self.button.as_ref() {
+            button.set_sticky_state(common, !interactable);
+        }
+
         let globals = common.state.globals.get();
         if interactable {
             set_anim_color(&mut rect, 0.0, self.color, globals.defaults.danger_color);
@@ -60,6 +71,9 @@ impl InteractLockHandler {
         let rect_color = self.color;
 
         self.interactable = !self.interactable;
+        if let Some(button) = self.button.as_ref() {
+            button.set_sticky_state(common, !self.interactable);
+        }
 
         let anim = if self.interactable {
             Animation::new(

From 9ea9da18f59c23fd0681fe660ad81421e6760a7d Mon Sep 17 00:00:00 2001
From: Aleksander <aleksander@oo8.dev>
Date: Mon, 22 Dec 2025 17:35:03 +0100
Subject: [PATCH 18/29] update translations, use gemma3:27b instead

[skip ci]
---
 scripts/translator/run.sh             |  2 +-
 wlx-overlay-s/src/assets/lang/de.json | 11 +++++++++++
 wlx-overlay-s/src/assets/lang/es.json | 11 +++++++++++
 wlx-overlay-s/src/assets/lang/ja.json | 13 ++++++++++++-
 wlx-overlay-s/src/assets/lang/pl.json | 11 +++++++++++
 5 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/scripts/translator/run.sh b/scripts/translator/run.sh
index 93261e6..ce09323 100755
--- a/scripts/translator/run.sh
+++ b/scripts/translator/run.sh
@@ -4,7 +4,7 @@ cd "$(dirname "$0")"
 
 bun install
 
-export MODEL="gemma3:12b"
+export MODEL="gemma3:27b"
 
 TEMPLATE="pl" bun main.ts
 TEMPLATE="de" bun main.ts
diff --git a/wlx-overlay-s/src/assets/lang/de.json b/wlx-overlay-s/src/assets/lang/de.json
index 6e5cd4f..a0c07bb 100644
--- a/wlx-overlay-s/src/assets/lang/de.json
+++ b/wlx-overlay-s/src/assets/lang/de.json
@@ -72,5 +72,16 @@
     "GRABBING_ANCHORED_EDIT": "Diese Overlay-Darstellung bleibt an der Mittelmarkierung verankert.",
     "GRABBING_FLOATING": "Diese Overlay-Darstellung ist frei schwebend und bleibt an Ort und Stelle, es sei denn, sie wird neu zentriert.",
     "GRABBING_FOLLOW": "Dieses Overlay wird dem Gerät folgen, an das es angehängt ist."
+  },
+  "TOAST": {
+    "DEFAULT_TITLE": "Benachrichtigung",
+    "ERROR": "Fehler",
+    "CANNOT_REMOVE_SET": "Satz kann nicht entfernt werden!",
+    "NO_SET_SELECTED": "Kein Set ausgewählt.",
+    "LAST_EXISTING_SET": "Dies ist das letzte vorhandene Set.",
+    "EMPTY_SET": "Leeres Set!",
+    "LETS_ADD_OVERLAYS": "Lass uns ein paar Overlays von der Uhr hinzufügen!",
+    "FIXING_FLOOR": "Boden wird in 5 Sekunden fixiert...",
+    "ONE_CONTROLLER_ON_FLOOR": "Lege einen Controller auf den Boden!"
   }
 }
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/lang/es.json b/wlx-overlay-s/src/assets/lang/es.json
index 0a5ef4a..9864e7e 100644
--- a/wlx-overlay-s/src/assets/lang/es.json
+++ b/wlx-overlay-s/src/assets/lang/es.json
@@ -72,5 +72,16 @@
     "GRABBING_ANCHORED_EDIT": "Esta superposición permanecerá anclada al marcador central.",
     "GRABBING_FLOATING": "Esta superposición es flotante y permanecerá en su lugar a menos que se recentre.",
     "GRABBING_FOLLOW": "Esta superposición seguirá el dispositivo al que está adjunta."
+  },
+  "TOAST": {
+    "DEFAULT_TITLE": "Notificación",
+    "ERROR": "Error",
+    "CANNOT_REMOVE_SET": "¡No se puede eliminar el conjunto!",
+    "NO_SET_SELECTED": "No se ha seleccionado ningún conjunto.",
+    "LAST_EXISTING_SET": "Este es el último conjunto existente.",
+    "EMPTY_SET": "¡Conjunto vacío!",
+    "LETS_ADD_OVERLAYS": "¡Añadamos algunos overlays desde el reloj!",
+    "FIXING_FLOOR": "Fijando el suelo en 5 segundos...",
+    "ONE_CONTROLLER_ON_FLOOR": "¡Coloca un mando en el suelo!"
   }
 }
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/lang/ja.json b/wlx-overlay-s/src/assets/lang/ja.json
index 777e11f..3a90773 100644
--- a/wlx-overlay-s/src/assets/lang/ja.json
+++ b/wlx-overlay-s/src/assets/lang/ja.json
@@ -70,5 +70,16 @@
     "GRABBING_ANCHORED_EDIT": "このオーバーレイは、センター・マーカーに固定されます。",
     "GRABBING_FLOATING": "このオーバーレイはフローティングのため、リセンターまではその場所に留まります。",
     "GRABBING_FOLLOW": "このオーバーレイは、接続されているデバイスに追従します。"
+  },
+  "TOAST": {
+    "DEFAULT_TITLE": "通知",
+    "ERROR": "エラー",
+    "CANNOT_REMOVE_SET": "セットを削除できません！",
+    "NO_SET_SELECTED": "セットが選択されていません。",
+    "LAST_EXISTING_SET": "これが最後の設定です。",
+    "EMPTY_SET": "空のセットです！",
+    "LETS_ADD_OVERLAYS": "ウォッチからオーバーレイを追加しましょう！",
+    "FIXING_FLOOR": "5秒後にフロアを固定します...",
+    "ONE_CONTROLLER_ON_FLOOR": "コントローラーを床に置いてください！"
   }
-}
+}
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/lang/pl.json b/wlx-overlay-s/src/assets/lang/pl.json
index 9f1775b..9e7f341 100644
--- a/wlx-overlay-s/src/assets/lang/pl.json
+++ b/wlx-overlay-s/src/assets/lang/pl.json
@@ -70,5 +70,16 @@
     "GRABBING_ANCHORED_EDIT": "Ta nakładka pozostanie zakotwiczona do znacznika centralnego.",
     "GRABBING_FLOATING": "Ta nakładka jest zawieszony i pozostanie na miejscu, chyba że zostanie wycentrowany.",
     "GRABBING_FOLLOW": "Ta nakładka będzie śledzić urządzenie, do którego jest dołączona."
+  },
+  "TOAST": {
+    "DEFAULT_TITLE": "Powiadomienie",
+    "ERROR": "Błąd",
+    "CANNOT_REMOVE_SET": "Nie można usunąć zestawu!",
+    "NO_SET_SELECTED": "Nie wybrano żadnego zestawu.",
+    "LAST_EXISTING_SET": "To jest ostatni istniejący zestaw.",
+    "EMPTY_SET": "Pusty zestaw!",
+    "LETS_ADD_OVERLAYS": "Dodajmy kilka nakładek z zegarka!",
+    "FIXING_FLOOR": "Naprawianie podłogi za 5 sekund...",
+    "ONE_CONTROLLER_ON_FLOOR": "Umieść jeden kontroler na podłodze!"
   }
 }
\ No newline at end of file

From ccd75c047cda9867ea9b583f9221265ef20d2bf2 Mon Sep 17 00:00:00 2001
From: Aleksander <aleksander@oo8.dev>
Date: Tue, 23 Dec 2025 03:50:03 +0100
Subject: [PATCH 19/29] Move wayvr-ipc to our workspace (#324)

---
 Cargo.lock                     | 146 +++++++++-
 Cargo.toml                     |   1 +
 wayvr-ipc/Cargo.lock           | 390 ++++++++++++++++++++++++++
 wayvr-ipc/Cargo.toml           |  21 ++
 wayvr-ipc/LICENSE.txt          |  21 ++
 wayvr-ipc/README.md            |   9 +
 wayvr-ipc/rustfmt.toml         |   2 +
 wayvr-ipc/src/client.rs        | 496 +++++++++++++++++++++++++++++++++
 wayvr-ipc/src/ipc.rs           |  42 +++
 wayvr-ipc/src/lib.rs           |   7 +
 wayvr-ipc/src/packet_client.rs |  71 +++++
 wayvr-ipc/src/packet_server.rs | 163 +++++++++++
 wayvr-ipc/src/util/handle.rs   | 173 ++++++++++++
 wayvr-ipc/src/util/mod.rs      |   4 +
 wayvr-ipc/src/util/notifier.rs |  25 ++
 wlx-overlay-s/Cargo.lock       |  15 +-
 wlx-overlay-s/Cargo.toml       |   4 +-
 17 files changed, 1570 insertions(+), 20 deletions(-)
 create mode 100644 wayvr-ipc/Cargo.lock
 create mode 100644 wayvr-ipc/Cargo.toml
 create mode 100644 wayvr-ipc/LICENSE.txt
 create mode 100644 wayvr-ipc/README.md
 create mode 100644 wayvr-ipc/rustfmt.toml
 create mode 100644 wayvr-ipc/src/client.rs
 create mode 100644 wayvr-ipc/src/ipc.rs
 create mode 100644 wayvr-ipc/src/lib.rs
 create mode 100644 wayvr-ipc/src/packet_client.rs
 create mode 100644 wayvr-ipc/src/packet_server.rs
 create mode 100644 wayvr-ipc/src/util/handle.rs
 create mode 100644 wayvr-ipc/src/util/mod.rs
 create mode 100644 wayvr-ipc/src/util/notifier.rs

diff --git a/Cargo.lock b/Cargo.lock
index a2e6a7d..aceb10d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2889,8 +2889,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d941b405bd2322993887859a8ee6ac9134945a24ec5ec763a8a962fc64dfec2d"
 dependencies = [
  "doctest-file",
+ "futures-core",
  "libc",
  "recvmsg",
+ "tokio",
  "widestring",
  "windows-sys 0.52.0",
 ]
@@ -3342,6 +3344,17 @@ version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
 
+[[package]]
+name = "mio"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "moveit"
 version = "0.6.0"
@@ -5235,6 +5248,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
@@ -5638,6 +5661,45 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
+[[package]]
+name = "tokio"
+version = "1.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.111",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "toml"
 version = "0.8.2"
@@ -6297,16 +6359,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "wayvr_ipc"
+name = "wayvr-ipc"
 version = "0.1.0"
-source = "git+https://github.com/olekolek1000/wayvr-ipc.git?rev=a72587d23f3bb8624d9aeb1f13c0a21e65350f51#a72587d23f3bb8624d9aeb1f13c0a21e65350f51"
 dependencies = [
  "anyhow",
  "bytes",
+ "interprocess",
  "log",
  "serde",
  "serde_json",
  "smallvec",
+ "tokio",
+ "tokio-util",
 ]
 
 [[package]]
@@ -6606,6 +6670,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.61.2"
@@ -6639,13 +6712,30 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link 0.2.1",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
+]
+
 [[package]]
 name = "windows-threading"
 version = "0.1.0"
@@ -6667,6 +6757,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -6679,6 +6775,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -6691,12 +6793,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -6709,6 +6823,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -6721,6 +6841,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -6733,6 +6859,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -6745,6 +6877,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
 [[package]]
 name = "winit"
 version = "0.30.12"
@@ -6899,7 +7037,7 @@ dependencies = [
  "vulkano-shaders",
  "wayland-client",
  "wayland-egl",
- "wayvr_ipc",
+ "wayvr-ipc",
  "wgui",
  "winit",
  "wlx-capture",
diff --git a/Cargo.toml b/Cargo.toml
index 5c89cda..dd28db1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,6 +17,7 @@ members = [
   "wlx-overlay-s",
   "wlx-capture",
   "dash-frontend",
+  "wayvr-ipc",
 ]
 resolver = "3"
 
diff --git a/wayvr-ipc/Cargo.lock b/wayvr-ipc/Cargo.lock
new file mode 100644
index 0000000..59143c9
--- /dev/null
+++ b/wayvr-ipc/Cargo.lock
@@ -0,0 +1,390 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "anyhow"
+version = "1.0.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+
+[[package]]
+name = "backtrace"
+version = "0.3.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets",
+]
+
+[[package]]
+name = "bytes"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "doctest-file"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562"
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "interprocess"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "894148491d817cb36b6f778017b8ac46b17408d522dd90f539d677ea938362eb"
+dependencies = [
+ "doctest-file",
+ "futures-core",
+ "libc",
+ "recvmsg",
+ "tokio",
+ "widestring",
+ "windows-sys",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+
+[[package]]
+name = "libc"
+version = "0.2.169"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "object"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "recvmsg"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "serde"
+version = "1.0.217"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.217"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.135"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.96"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tokio"
+version = "1.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "socket2",
+ "tokio-macros",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wayvr-ipc"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "interprocess",
+ "log",
+ "serde",
+ "serde_json",
+ "smallvec",
+ "tokio",
+ "tokio-util",
+]
+
+[[package]]
+name = "widestring"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
diff --git a/wayvr-ipc/Cargo.toml b/wayvr-ipc/Cargo.toml
new file mode 100644
index 0000000..392a6f0
--- /dev/null
+++ b/wayvr-ipc/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "wayvr-ipc"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+bytes = "1.9.0"
+smallvec = "1.13.2"
+serde = { version = "1", features = ["derive"] }
+anyhow = "1.0.93"
+log = "0.4.22"
+
+# client-only deps
+interprocess = { version = "2.2.2", features = ["tokio"], optional = true }
+tokio = { version = "1.42.0", features = ["macros"], optional = true }
+tokio-util = { version = "0.7.13", optional = true }
+serde_json = "1.0.135"
+
+[features]
+default = ["client"]
+client = ["dep:tokio", "dep:tokio-util", "dep:interprocess"]
diff --git a/wayvr-ipc/LICENSE.txt b/wayvr-ipc/LICENSE.txt
new file mode 100644
index 0000000..de54ca7
--- /dev/null
+++ b/wayvr-ipc/LICENSE.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Aleksander <aleksander@oo8.dev>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/wayvr-ipc/README.md b/wayvr-ipc/README.md
new file mode 100644
index 0000000..1b26803
--- /dev/null
+++ b/wayvr-ipc/README.md
@@ -0,0 +1,9 @@
+# WayVR Protocol Specification & Client Implementation
+
+This repository contains the IPC specification and client implementation for the WayVR Server protocol (which is used in wlx-overlay-s). The primary purpose is to enable communication between applications and the WayVR server, offering a range of API functions.
+
+[WayVR Server README](https://github.com/galister/wlx-overlay-s/tree/main/contrib/wayvr)
+
+## Usage
+
+[Example WayVR IPC Client usage in WayVR Dashboard](https://github.com/olekolek1000/wayvr-dashboard/blob/master/src-tauri/src/frontend_ipc.rs)
diff --git a/wayvr-ipc/rustfmt.toml b/wayvr-ipc/rustfmt.toml
new file mode 100644
index 0000000..39694dc
--- /dev/null
+++ b/wayvr-ipc/rustfmt.toml
@@ -0,0 +1,2 @@
+tab_spaces = 2
+hard_tabs = true
\ No newline at end of file
diff --git a/wayvr-ipc/src/client.rs b/wayvr-ipc/src/client.rs
new file mode 100644
index 0000000..46cd0d2
--- /dev/null
+++ b/wayvr-ipc/src/client.rs
@@ -0,0 +1,496 @@
+use bytes::BufMut;
+use interprocess::local_socket::{
+	self,
+	tokio::{prelude::*, Stream},
+	GenericNamespaced,
+};
+use serde::Serialize;
+use smallvec::SmallVec;
+use std::sync::{Arc, Weak};
+use tokio::{
+	io::{AsyncReadExt, AsyncWriteExt},
+	sync::Mutex,
+};
+use tokio_util::sync::CancellationToken;
+
+use crate::{
+	gen_id,
+	ipc::{self, Serial},
+	packet_client::{self, PacketClient},
+	packet_server::{self, PacketServer},
+	util::notifier::Notifier,
+};
+
+pub struct QueuedPacket {
+	notifier: Notifier,
+	serial: Serial,
+	packet: Option<PacketServer>,
+}
+
+gen_id!(
+	QueuedPacketVec,
+	QueuedPacket,
+	QueuedPacketCell,
+	QueuedPacketHandle
+);
+
+#[derive(Debug, Serialize, Clone)]
+pub struct AuthInfo {
+	pub runtime: String,
+}
+
+type SignalFunc = Box<dyn FnMut(&packet_server::PacketServer) -> bool + Send>;
+
+pub struct WayVRClient {
+	receiver: ReceiverMutex,
+	sender: SenderMutex,
+	cancel_token: CancellationToken,
+	exiting: bool,
+	queued_packets: QueuedPacketVec,
+	pub auth: Option<AuthInfo>, // Some if authenticated
+	pub on_signal: Option<SignalFunc>,
+}
+
+pub async fn send_packet(sender: &SenderMutex, data: &[u8]) -> anyhow::Result<()> {
+	let mut bytes = bytes::BytesMut::new();
+
+	// packet size
+	bytes.put_u32(data.len() as u32);
+
+	// packet data
+	bytes.put_slice(data);
+
+	sender.lock().await.write_all(&bytes).await?;
+
+	Ok(())
+}
+
+pub type WayVRClientMutex = Arc<Mutex<WayVRClient>>;
+pub type WayVRClientWeak = Weak<Mutex<WayVRClient>>;
+
+type ReceiverMutex = Arc<Mutex<local_socket::tokio::RecvHalf>>;
+type SenderMutex = Arc<Mutex<local_socket::tokio::SendHalf>>;
+
+async fn client_runner(client: WayVRClientMutex) -> anyhow::Result<()> {
+	loop {
+		WayVRClient::tick(client.clone()).await?;
+	}
+}
+
+type Payload = SmallVec<[u8; 64]>;
+
+async fn read_payload(
+	conn: &mut local_socket::tokio::RecvHalf,
+	size: u32,
+) -> anyhow::Result<Payload> {
+	let mut payload = Payload::new();
+	payload.resize(size as usize, 0);
+	conn.read_exact(&mut payload).await?;
+	Ok(payload)
+}
+
+macro_rules! bail_unexpected_response {
+	() => {
+		anyhow::bail!("unexpected response");
+	};
+}
+
+// Send and wait for a response from the server
+macro_rules! send_and_wait {
+	($client_mtx:expr, $serial:expr, $packet_to_send:expr, $expected_response_type:ident) => {{
+		let result =
+			WayVRClient::queue_wait_packet($client_mtx, $serial, &ipc::data_encode($packet_to_send))
+				.await?;
+		if let PacketServer::$expected_response_type(_, res) = result {
+			res
+		} else {
+			bail_unexpected_response!();
+		}
+	}};
+}
+
+// Send without expecting any response
+macro_rules! send_only {
+	($client_mtx:expr, $packet_to_send:expr) => {{
+		WayVRClient::send_payload($client_mtx, &ipc::data_encode($packet_to_send)).await?;
+	}};
+}
+
+impl WayVRClient {
+	pub fn set_signal_handler(&mut self, on_signal: SignalFunc) {
+		self.on_signal = Some(on_signal);
+	}
+
+	pub async fn new(client_name: &str) -> anyhow::Result<WayVRClientMutex> {
+		let printname = "/tmp/wayvr_ipc.sock";
+		let name = printname.to_ns_name::<GenericNamespaced>()?;
+
+		let stream = match Stream::connect(name).await {
+			Ok(c) => c,
+			Err(e) => {
+				anyhow::bail!("Failed to connect to the WayVR IPC: {}", e)
+			}
+		};
+		let (receiver, sender) = stream.split();
+
+		let receiver = Arc::new(Mutex::new(receiver));
+		let sender = Arc::new(Mutex::new(sender));
+
+		let cancel_token = CancellationToken::new();
+
+		let client = Arc::new(Mutex::new(Self {
+			receiver,
+			sender: sender.clone(),
+			exiting: false,
+			cancel_token: cancel_token.clone(),
+			queued_packets: QueuedPacketVec::new(),
+			auth: None,
+			on_signal: None,
+		}));
+
+		WayVRClient::start_runner(client.clone(), cancel_token);
+
+		// Send handshake to the server
+		send_packet(
+			&sender,
+			&ipc::data_encode(&PacketClient::Handshake(packet_client::Handshake {
+				client_name: String::from(client_name),
+				magic: String::from(ipc::CONNECTION_MAGIC),
+				protocol_version: ipc::PROTOCOL_VERSION,
+			})),
+		)
+		.await?;
+
+		Ok(client)
+	}
+
+	fn start_runner(client: WayVRClientMutex, cancel_token: CancellationToken) {
+		tokio::spawn(async move {
+			tokio::select! {
+					_ = cancel_token.cancelled() => {
+							log::info!("Exiting IPC runner gracefully");
+					}
+					e = client_runner(client.clone()) => {
+							log::info!("IPC Runner failed: {:?}", e);
+					}
+			}
+		});
+	}
+
+	async fn tick(client_mtx: WayVRClientMutex) -> anyhow::Result<()> {
+		let receiver = {
+			let client = client_mtx.lock().await;
+			client.receiver.clone()
+		};
+
+		// read packet
+		let packet = {
+			let mut receiver = receiver.lock().await;
+			let packet_size = receiver.read_u32().await?;
+			log::trace!("packet size {}", packet_size);
+			if packet_size > 128 * 1024 {
+				anyhow::bail!("packet size too large (> 128 KiB)");
+			}
+			let payload = read_payload(&mut receiver, packet_size).await?;
+			let packet: PacketServer = ipc::data_decode(&payload)?;
+			packet
+		};
+
+		{
+			let mut client = client_mtx.lock().await;
+
+			if let PacketServer::HandshakeSuccess(success) = &packet {
+				if client.auth.is_some() {
+					anyhow::bail!("Got handshake response twice");
+				}
+
+				client.auth = Some(AuthInfo {
+					runtime: success.runtime.clone(),
+				});
+
+				log::info!(
+					"Authenticated. Server runtime name: \"{}\"",
+					success.runtime
+				);
+			}
+
+			if let PacketServer::Disconnect(disconnect) = &packet {
+				anyhow::bail!("Server disconnected us. Reason: {}", disconnect.reason);
+			}
+
+			if client.auth.is_none() {
+				anyhow::bail!(
+					"Server tried to send us a packet which is not a HandshakeSuccess or Disconnect"
+				);
+			}
+
+			if let PacketServer::WvrStateChanged(_) = &packet {
+				if let Some(on_signal) = &mut client.on_signal {
+					if (*on_signal)(&packet) {
+						// Signal consumed
+						return Ok(());
+					}
+				}
+			}
+
+			// queue packet to read if it contains a serial response
+			if let Some(serial) = packet.serial() {
+				for qpacket in &mut client.queued_packets.vec {
+					let Some(qpacket) = qpacket else {
+						continue;
+					};
+
+					let qpacket = &mut qpacket.obj;
+					if qpacket.serial != *serial {
+						continue; //skip
+					}
+
+					// found response serial, fill it and notify the receiver
+					qpacket.packet = Some(packet);
+					let notifier = qpacket.notifier.clone();
+
+					drop(client);
+					notifier.notify();
+					break;
+				}
+			}
+		}
+
+		Ok(())
+	}
+
+	// Send packet without feedback
+	async fn send_payload(client_mtx: WayVRClientMutex, payload: &[u8]) -> anyhow::Result<()> {
+		let client = client_mtx.lock().await;
+		let sender = client.sender.clone();
+		drop(client);
+		send_packet(&sender, payload).await?;
+		Ok(())
+	}
+
+	async fn queue_wait_packet(
+		client_mtx: WayVRClientMutex,
+		serial: Serial,
+		payload: &[u8],
+	) -> anyhow::Result<PacketServer> {
+		let notifier = Notifier::new();
+
+		// Send packet to the server
+		let queued_packet_handle = {
+			let mut client = client_mtx.lock().await;
+			let handle = client.queued_packets.add(QueuedPacket {
+				notifier: notifier.clone(),
+				packet: None, // will be filled after notify
+				serial,
+			});
+
+			let sender = client.sender.clone();
+
+			drop(client);
+
+			send_packet(&sender, payload).await?;
+			handle
+		};
+
+		// Wait for response message
+		notifier.wait().await;
+
+		// Fetch response packet
+		{
+			let mut client = client_mtx.lock().await;
+
+			let cell = client
+				.queued_packets
+				.get_mut(&queued_packet_handle)
+				.ok_or(anyhow::anyhow!(
+					"missing packet cell, this shouldn't happen"
+				))?;
+
+			let Some(packet) = cell.packet.take() else {
+				anyhow::bail!("packet is None, this shouldn't happen");
+			};
+
+			client.queued_packets.remove(&queued_packet_handle);
+
+			Ok(packet)
+		}
+	}
+
+	pub async fn fn_wvr_display_list(
+		client: WayVRClientMutex,
+		serial: Serial,
+	) -> anyhow::Result<Vec<packet_server::WvrDisplay>> {
+		Ok(
+			send_and_wait!(
+				client,
+				serial,
+				&PacketClient::WvrDisplayList(serial),
+				WvrDisplayListResponse
+			)
+			.list,
+		)
+	}
+
+	pub async fn fn_wvr_display_get(
+		client: WayVRClientMutex,
+		serial: Serial,
+		handle: packet_server::WvrDisplayHandle,
+	) -> anyhow::Result<Option<packet_server::WvrDisplay>> {
+		Ok(send_and_wait!(
+			client,
+			serial,
+			&PacketClient::WvrDisplayGet(serial, handle),
+			WvrDisplayGetResponse
+		))
+	}
+
+	pub async fn fn_wvr_display_remove(
+		client: WayVRClientMutex,
+		serial: Serial,
+		handle: packet_server::WvrDisplayHandle,
+	) -> anyhow::Result<()> {
+		send_and_wait!(
+			client,
+			serial,
+			&PacketClient::WvrDisplayRemove(serial, handle),
+			WvrDisplayRemoveResponse
+		)
+		.map_err(|e| anyhow::anyhow!("{}", e))
+	}
+
+	pub async fn fn_wvr_display_create(
+		client: WayVRClientMutex,
+		serial: Serial,
+		params: packet_client::WvrDisplayCreateParams,
+	) -> anyhow::Result<packet_server::WvrDisplayHandle> {
+		Ok(send_and_wait!(
+			client,
+			serial,
+			&PacketClient::WvrDisplayCreate(serial, params),
+			WvrDisplayCreateResponse
+		))
+	}
+
+	pub async fn fn_wvr_display_set_visible(
+		client: WayVRClientMutex,
+		handle: packet_server::WvrDisplayHandle,
+		visible: bool,
+	) -> anyhow::Result<()> {
+		send_only!(client, &PacketClient::WvrDisplaySetVisible(handle, visible));
+		Ok(())
+	}
+
+	pub async fn fn_wvr_display_set_layout(
+		client: WayVRClientMutex,
+		handle: packet_server::WvrDisplayHandle,
+		layout: packet_server::WvrDisplayWindowLayout,
+	) -> anyhow::Result<()> {
+		send_only!(
+			client,
+			&PacketClient::WvrDisplaySetWindowLayout(handle, layout)
+		);
+		Ok(())
+	}
+
+	pub async fn fn_wvr_display_window_list(
+		client: WayVRClientMutex,
+		serial: Serial,
+		handle: packet_server::WvrDisplayHandle,
+	) -> anyhow::Result<Option<Vec<packet_server::WvrWindow>>> {
+		Ok(
+			send_and_wait!(
+				client,
+				serial,
+				&PacketClient::WvrDisplayWindowList(serial, handle),
+				WvrDisplayWindowListResponse
+			)
+			.map(|res| res.list),
+		)
+	}
+
+	pub async fn fn_wvr_window_set_visible(
+		client: WayVRClientMutex,
+		handle: packet_server::WvrWindowHandle,
+		visible: bool,
+	) -> anyhow::Result<()> {
+		send_only!(client, &PacketClient::WvrWindowSetVisible(handle, visible));
+		Ok(())
+	}
+
+	pub async fn fn_wvr_process_list(
+		client: WayVRClientMutex,
+		serial: Serial,
+	) -> anyhow::Result<Vec<packet_server::WvrProcess>> {
+		Ok(
+			send_and_wait!(
+				client,
+				serial,
+				&PacketClient::WvrProcessList(serial),
+				WvrProcessListResponse
+			)
+			.list,
+		)
+	}
+
+	pub async fn fn_wvr_process_get(
+		client: WayVRClientMutex,
+		serial: Serial,
+		handle: packet_server::WvrProcessHandle,
+	) -> anyhow::Result<Option<packet_server::WvrProcess>> {
+		Ok(send_and_wait!(
+			client,
+			serial,
+			&PacketClient::WvrProcessGet(serial, handle),
+			WvrProcessGetResponse
+		))
+	}
+
+	pub async fn fn_wvr_process_terminate(
+		client: WayVRClientMutex,
+		handle: packet_server::WvrProcessHandle,
+	) -> anyhow::Result<()> {
+		send_only!(client, &PacketClient::WvrProcessTerminate(handle));
+		Ok(())
+	}
+
+	pub async fn fn_wvr_process_launch(
+		client: WayVRClientMutex,
+		serial: Serial,
+		params: packet_client::WvrProcessLaunchParams,
+	) -> anyhow::Result<packet_server::WvrProcessHandle> {
+		send_and_wait!(
+			client,
+			serial,
+			&PacketClient::WvrProcessLaunch(serial, params),
+			WvrProcessLaunchResponse
+		)
+		.map_err(|e| anyhow::anyhow!("{}", e))
+	}
+
+	pub async fn fn_wlx_input_state(
+		client: WayVRClientMutex,
+		serial: Serial,
+	) -> anyhow::Result<packet_server::WlxInputState> {
+		Ok(send_and_wait!(
+			client,
+			serial,
+			&PacketClient::WlxInputState(serial),
+			WlxInputStateResponse
+		))
+	}
+
+	pub async fn fn_wlx_haptics(
+		client: WayVRClientMutex,
+		params: packet_client::WlxHapticsParams,
+	) -> anyhow::Result<()> {
+		send_only!(client, &PacketClient::WlxHaptics(params));
+		Ok(())
+	}
+}
+
+impl Drop for WayVRClient {
+	fn drop(&mut self) {
+		self.exiting = true;
+		self.cancel_token.cancel();
+	}
+}
diff --git a/wayvr-ipc/src/ipc.rs b/wayvr-ipc/src/ipc.rs
new file mode 100644
index 0000000..4a29e4f
--- /dev/null
+++ b/wayvr-ipc/src/ipc.rs
@@ -0,0 +1,42 @@
+use std::sync::{Arc, Mutex as SyncMutex};
+
+pub type Serial = u64;
+
+#[derive(Clone, Default)]
+pub struct SerialGenerator {
+	serial: Arc<SyncMutex<u64>>,
+}
+
+impl SerialGenerator {
+	pub fn new() -> SerialGenerator {
+		Self {
+			serial: Arc::new(SyncMutex::new(0)),
+		}
+	}
+
+	pub fn increment_get(&self) -> Serial {
+		let mut serial = self.serial.lock().unwrap();
+		let cur = *serial;
+		*serial += 1;
+		cur
+	}
+}
+
+pub const PROTOCOL_VERSION: u32 = 3;
+pub const CONNECTION_MAGIC: &str = "wayvr_ipc";
+
+pub fn data_encode<T>(data: &T) -> Vec<u8>
+where
+	T: serde::Serialize,
+{
+	let str = serde_json::to_string(&data).unwrap();
+	log::debug!("serialized data: {}", str);
+	str.into_bytes()
+}
+
+pub fn data_decode<T>(data: &[u8]) -> anyhow::Result<T>
+where
+	T: for<'a> serde::Deserialize<'a>,
+{
+	Ok(serde_json::from_str::<T>(std::str::from_utf8(data)?)?)
+}
diff --git a/wayvr-ipc/src/lib.rs b/wayvr-ipc/src/lib.rs
new file mode 100644
index 0000000..b7ccffb
--- /dev/null
+++ b/wayvr-ipc/src/lib.rs
@@ -0,0 +1,7 @@
+pub mod ipc;
+pub mod packet_client;
+pub mod packet_server;
+mod util;
+
+#[cfg(feature = "client")]
+pub mod client;
diff --git a/wayvr-ipc/src/packet_client.rs b/wayvr-ipc/src/packet_client.rs
new file mode 100644
index 0000000..5378f93
--- /dev/null
+++ b/wayvr-ipc/src/packet_client.rs
@@ -0,0 +1,71 @@
+// Contents of this file should be the same as on wlx-overlay-s.
+
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
+
+use super::{ipc::Serial, packet_server};
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Handshake {
+	pub protocol_version: u32, // always set to PROTOCOL_VERSION
+	pub magic: String,         // always set to CONNECTION_MAGIC
+	pub client_name: String,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub enum AttachTo {
+	None,
+	HandLeft,
+	HandRight,
+	Head,
+	Stage,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WvrProcessLaunchParams {
+	pub name: String,
+	pub exec: String,
+	pub target_display: packet_server::WvrDisplayHandle,
+	pub env: Vec<String>,
+	pub args: String,
+	pub userdata: HashMap<String, String>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct WvrDisplayCreateParams {
+	pub width: u16,
+	pub height: u16,
+	pub name: String,
+	pub scale: Option<f32>,
+	pub attach_to: AttachTo,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct WlxHapticsParams {
+	pub intensity: f32,
+	pub duration: f32,
+	pub frequency: f32,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub enum PacketClient {
+	Handshake(Handshake),
+	WvrDisplayCreate(Serial, WvrDisplayCreateParams),
+	WvrDisplayGet(Serial, packet_server::WvrDisplayHandle),
+	WvrDisplayList(Serial),
+	WvrDisplayRemove(Serial, packet_server::WvrDisplayHandle),
+	WvrDisplaySetVisible(packet_server::WvrDisplayHandle, bool),
+	WvrDisplayWindowList(Serial, packet_server::WvrDisplayHandle),
+	WvrDisplaySetWindowLayout(
+		packet_server::WvrDisplayHandle,
+		packet_server::WvrDisplayWindowLayout,
+	),
+	WvrWindowSetVisible(packet_server::WvrWindowHandle, bool),
+	WvrProcessGet(Serial, packet_server::WvrProcessHandle),
+	WvrProcessLaunch(Serial, WvrProcessLaunchParams),
+	WvrProcessList(Serial),
+	WvrProcessTerminate(packet_server::WvrProcessHandle),
+	WlxHaptics(WlxHapticsParams),
+	WlxInputState(Serial),
+}
diff --git a/wayvr-ipc/src/packet_server.rs b/wayvr-ipc/src/packet_server.rs
new file mode 100644
index 0000000..f25ae8e
--- /dev/null
+++ b/wayvr-ipc/src/packet_server.rs
@@ -0,0 +1,163 @@
+// Contents of this file should be the same as on wlx-overlay-s.
+
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
+
+use super::ipc::Serial;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ServerInfo {}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct HandshakeSuccess {
+	pub runtime: String, // Runtime name, for example "wlx-overlay-s"
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Disconnect {
+	pub reason: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
+pub struct WvrDisplayHandle {
+	pub idx: u32,
+	pub generation: u64,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
+pub struct WvrProcessHandle {
+	pub idx: u32,
+	pub generation: u64,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
+pub struct WvrWindowHandle {
+	pub idx: u32,
+	pub generation: u64,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct WvrDisplay {
+	pub width: u16,
+	pub height: u16,
+	pub name: String,
+	pub visible: bool,
+	pub handle: WvrDisplayHandle,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct WvrWindow {
+	pub pos_x: i32,
+	pub pos_y: i32,
+	pub size_x: u32,
+	pub size_y: u32,
+	pub visible: bool,
+	pub handle: WvrWindowHandle,
+	pub process_handle: WvrProcessHandle,
+	pub display_handle: WvrDisplayHandle,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct WvrDisplayList {
+	pub list: Vec<WvrDisplay>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct WvrWindowList {
+	pub list: Vec<WvrWindow>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct WvrProcess {
+	pub name: String,
+	pub display_handle: WvrDisplayHandle,
+	pub handle: WvrProcessHandle,
+	pub userdata: HashMap<String, String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct WvrProcessList {
+	pub list: Vec<WvrProcess>,
+}
+
+#[derive(Default, Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub struct Margins {
+	pub left: u16,
+	pub right: u16,
+	pub top: u16,
+	pub bottom: u16,
+}
+
+#[derive(Default, Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub struct StackingOptions {
+	pub margins_first: Margins,
+	pub margins_rest: Margins,
+}
+
+#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub enum WvrDisplayWindowLayout {
+	Tiling,
+	Stacking(StackingOptions),
+}
+
+#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub enum WvrStateChanged {
+	DisplayCreated,
+	DisplayRemoved,
+	ProcessCreated,
+	ProcessRemoved,
+	WindowCreated,
+	WindowRemoved,
+	DashboardShown,
+	DashboardHidden,
+}
+
+#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub struct WlxInputStatePointer {
+	pub pos: [f32; 3],
+}
+
+#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub struct WlxInputState {
+	pub hmd_pos: [f32; 3],
+	pub left: WlxInputStatePointer,
+	pub right: WlxInputStatePointer,
+}
+
+// "Wvr" prefixes are WayVR-specific
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum PacketServer {
+	Disconnect(Disconnect),
+	HandshakeSuccess(HandshakeSuccess),
+	WlxInputStateResponse(Serial, WlxInputState),
+	WvrDisplayCreateResponse(Serial, WvrDisplayHandle),
+	WvrDisplayGetResponse(Serial, Option<WvrDisplay>),
+	WvrDisplayListResponse(Serial, WvrDisplayList),
+	WvrDisplayRemoveResponse(Serial, Result<(), String>),
+	WvrDisplayWindowListResponse(Serial, Option<WvrWindowList>),
+	WvrProcessGetResponse(Serial, Option<WvrProcess>),
+	WvrProcessLaunchResponse(Serial, Result<WvrProcessHandle, String>),
+	WvrProcessListResponse(Serial, WvrProcessList),
+	WvrStateChanged(WvrStateChanged),
+}
+
+impl PacketServer {
+	pub fn serial(&self) -> Option<&Serial> {
+		match self {
+			PacketServer::Disconnect(_) => None,
+			PacketServer::HandshakeSuccess(_) => None,
+			PacketServer::WlxInputStateResponse(serial, _) => Some(serial),
+			PacketServer::WvrDisplayCreateResponse(serial, _) => Some(serial),
+			PacketServer::WvrDisplayGetResponse(serial, _) => Some(serial),
+			PacketServer::WvrDisplayListResponse(serial, _) => Some(serial),
+			PacketServer::WvrDisplayRemoveResponse(serial, _) => Some(serial),
+			PacketServer::WvrDisplayWindowListResponse(serial, _) => Some(serial),
+			PacketServer::WvrProcessGetResponse(serial, _) => Some(serial),
+			PacketServer::WvrProcessLaunchResponse(serial, _) => Some(serial),
+			PacketServer::WvrProcessListResponse(serial, _) => Some(serial),
+			PacketServer::WvrStateChanged(_) => None,
+		}
+	}
+}
diff --git a/wayvr-ipc/src/util/handle.rs b/wayvr-ipc/src/util/handle.rs
new file mode 100644
index 0000000..a408d41
--- /dev/null
+++ b/wayvr-ipc/src/util/handle.rs
@@ -0,0 +1,173 @@
+#[macro_export]
+macro_rules! gen_id {
+    (
+		$container_name:ident,
+		$instance_name:ident,
+		$cell_name:ident,
+		$handle_name:ident) => {
+        //ThingCell
+        pub struct $cell_name {
+            pub obj: $instance_name,
+            pub generation: u64,
+        }
+
+        //ThingVec
+        pub struct $container_name {
+            // Vec<Option<ThingCell>>
+            pub vec: Vec<Option<$cell_name>>,
+
+            cur_generation: u64,
+        }
+
+        //ThingHandle
+        #[derive(Default, Clone, Copy, PartialEq, Hash, Eq)]
+        pub struct $handle_name {
+            idx: u32,
+            generation: u64,
+        }
+
+        #[allow(dead_code)]
+        impl $handle_name {
+            pub fn reset(&mut self) {
+                self.generation = 0;
+            }
+
+            pub fn is_set(&self) -> bool {
+                self.generation > 0
+            }
+
+            pub fn id(&self) -> u32 {
+                self.idx
+            }
+
+            pub fn new(idx: u32, generation: u64) -> Self {
+                Self { idx, generation }
+            }
+        }
+
+        //ThingVec
+        #[allow(dead_code)]
+        impl $container_name {
+            pub fn new() -> Self {
+                Self {
+                    vec: Vec::new(),
+                    cur_generation: 0,
+                }
+            }
+
+            pub fn iter(&self, callback: &dyn Fn($handle_name, &$instance_name)) {
+                for (idx, opt_cell) in self.vec.iter().enumerate() {
+                    if let Some(cell) = opt_cell {
+                        let handle = $container_name::get_handle(&cell, idx);
+                        callback(handle, &cell.obj);
+                    }
+                }
+            }
+
+            pub fn iter_mut(
+                &mut self,
+                callback: &mut dyn FnMut($handle_name, &mut $instance_name),
+            ) {
+                for (idx, opt_cell) in self.vec.iter_mut().enumerate() {
+                    if let Some(cell) = opt_cell {
+                        let handle = $container_name::get_handle(&cell, idx);
+                        callback(handle, &mut cell.obj);
+                    }
+                }
+            }
+
+            pub fn get_handle(cell: &$cell_name, idx: usize) -> $handle_name {
+                $handle_name {
+                    idx: idx as u32,
+                    generation: cell.generation,
+                }
+            }
+
+            fn find_unused_idx(&mut self) -> Option<u32> {
+                for (num, obj) in self.vec.iter().enumerate() {
+                    if obj.is_none() {
+                        return Some(num as u32);
+                    }
+                }
+                None
+            }
+
+            pub fn add(&mut self, obj: $instance_name) -> $handle_name {
+                self.cur_generation += 1;
+                let generation = self.cur_generation;
+
+                let unused_idx = self.find_unused_idx();
+
+                let idx = if let Some(idx) = unused_idx {
+                    idx
+                } else {
+                    self.vec.len() as u32
+                };
+
+                let handle = $handle_name { idx, generation };
+
+                let cell = $cell_name { obj, generation };
+
+                if let Some(idx) = unused_idx {
+                    self.vec[idx as usize] = Some(cell);
+                } else {
+                    self.vec.push(Some(cell))
+                }
+
+                handle
+            }
+
+            pub fn remove(&mut self, handle: &$handle_name) {
+                // Out of bounds, ignore
+                if handle.idx as usize >= self.vec.len() {
+                    return;
+                }
+
+                // Remove only if the generation matches
+                if let Some(cell) = &self.vec[handle.idx as usize] {
+                    if cell.generation == handle.generation {
+                        self.vec[handle.idx as usize] = None;
+                    }
+                }
+            }
+
+            pub fn get(&self, handle: &$handle_name) -> Option<&$instance_name> {
+                // Out of bounds, ignore
+                if handle.idx as usize >= self.vec.len() {
+                    return None;
+                }
+
+                if let Some(cell) = &self.vec[handle.idx as usize] {
+                    if cell.generation == handle.generation {
+                        return Some(&cell.obj);
+                    }
+                }
+
+                None
+            }
+
+            pub fn get_mut(&mut self, handle: &$handle_name) -> Option<&mut $instance_name> {
+                // Out of bounds, ignore
+                if handle.idx as usize >= self.vec.len() {
+                    return None;
+                }
+
+                if let Some(cell) = &mut self.vec[handle.idx as usize] {
+                    if cell.generation == handle.generation {
+                        return Some(&mut cell.obj);
+                    }
+                }
+
+                None
+            }
+        }
+    };
+}
+
+/* Example usage:
+gen_id!(ThingVec, ThingInstance, ThingCell, ThingHandle);
+
+struct ThingInstance {}
+
+impl ThingInstance {}
+ */
diff --git a/wayvr-ipc/src/util/mod.rs b/wayvr-ipc/src/util/mod.rs
new file mode 100644
index 0000000..cf2f06f
--- /dev/null
+++ b/wayvr-ipc/src/util/mod.rs
@@ -0,0 +1,4 @@
+pub mod handle;
+
+#[cfg(feature = "client")]
+pub mod notifier;
diff --git a/wayvr-ipc/src/util/notifier.rs b/wayvr-ipc/src/util/notifier.rs
new file mode 100644
index 0000000..b985cc5
--- /dev/null
+++ b/wayvr-ipc/src/util/notifier.rs
@@ -0,0 +1,25 @@
+use std::sync::Arc;
+
+use tokio::sync::Notify;
+
+// Copyable wrapped Notify struct for easier usage
+#[derive(Default, Clone)]
+pub struct Notifier {
+	notifier: Arc<Notify>,
+}
+
+impl Notifier {
+	pub fn new() -> Self {
+		Self {
+			notifier: Arc::new(Notify::new()),
+		}
+	}
+
+	pub fn notify(&self) {
+		self.notifier.notify_waiters();
+	}
+
+	pub async fn wait(&self) {
+		self.notifier.notified().await;
+	}
+}
diff --git a/wlx-overlay-s/Cargo.lock b/wlx-overlay-s/Cargo.lock
index 75dcea5..553ade9 100644
--- a/wlx-overlay-s/Cargo.lock
+++ b/wlx-overlay-s/Cargo.lock
@@ -5551,19 +5551,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "wayvr_ipc"
-version = "0.1.0"
-source = "git+https://github.com/olekolek1000/wayvr-ipc.git?rev=a72587d23f3bb8624d9aeb1f13c0a21e65350f51#a72587d23f3bb8624d9aeb1f13c0a21e65350f51"
-dependencies = [
- "anyhow",
- "bytes",
- "log",
- "serde",
- "serde_json",
- "smallvec",
-]
-
 [[package]]
 name = "web-sys"
 version = "0.3.77"
@@ -6206,7 +6193,7 @@ dependencies = [
  "uuid",
  "wayland-client",
  "wayland-egl",
- "wayvr_ipc",
+ "wayvr-ipc",
  "wgui",
  "winit",
  "wlx-capture",
diff --git a/wlx-overlay-s/Cargo.toml b/wlx-overlay-s/Cargo.toml
index 0e41aaf..b78667a 100644
--- a/wlx-overlay-s/Cargo.toml
+++ b/wlx-overlay-s/Cargo.toml
@@ -96,7 +96,7 @@ uuid = { version = "1.19.0", features = ["v4", "fast-rng"], optional = true }
 wayland-client = { workspace = true, optional = true }
 wayland-egl = { version = "0.32.8", optional = true }
 bytes = { version = "1.11.0", optional = true }
-wayvr_ipc = { git = "https://github.com/olekolek1000/wayvr-ipc.git", rev = "a72587d23f3bb8624d9aeb1f13c0a21e65350f51", default-features = false, optional = true }
+wayvr-ipc = { path = "../wayvr-ipc", default-features = false, optional = true }
 rust-embed = { workspace = true }
 signal-hook = "0.3.18"
 ################################
@@ -121,6 +121,6 @@ wayvr = [
   "dep:wayland-client",
   "dep:wayland-egl",
   "dep:bytes",
-  "dep:wayvr_ipc",
+  "dep:wayvr-ipc",
 ]
 as-raw-xcb-connection = []

From 8f9f057c973a79103751fb0014ebdbf2399816ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Dec 2025 03:25:52 +0000
Subject: [PATCH 20/29] Bump tokio from 1.43.0 to 1.43.1 in /wayvr-ipc (#325)

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.43.0 to 1.43.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.43.0...tokio-1.43.1)

---
updated-dependencies:
- dependency-name: tokio
  dependency-version: 1.43.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 wayvr-ipc/Cargo.lock | 4 ++--
 wayvr-ipc/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wayvr-ipc/Cargo.lock b/wayvr-ipc/Cargo.lock
index 59143c9..42d0d32 100644
--- a/wayvr-ipc/Cargo.lock
+++ b/wayvr-ipc/Cargo.lock
@@ -245,9 +245,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.43.0"
+version = "1.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+checksum = "492a604e2fd7f814268a378409e6c92b5525d747d10db9a229723f55a417958c"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/wayvr-ipc/Cargo.toml b/wayvr-ipc/Cargo.toml
index 392a6f0..20e9928 100644
--- a/wayvr-ipc/Cargo.toml
+++ b/wayvr-ipc/Cargo.toml
@@ -12,7 +12,7 @@ log = "0.4.22"
 
 # client-only deps
 interprocess = { version = "2.2.2", features = ["tokio"], optional = true }
-tokio = { version = "1.42.0", features = ["macros"], optional = true }
+tokio = { version = "1.43.1", features = ["macros"], optional = true }
 tokio-util = { version = "0.7.13", optional = true }
 serde_json = "1.0.135"
 

From 5287b659e8b47ec00c55dac34a0eaeeb63add568 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Tue, 23 Dec 2025 13:29:01 +0900
Subject: [PATCH 21/29] customization via wayvr_ipc

---
 wayvr-ipc/src/packet_client.rs                |  17 +++
 wgui/src/renderer_vk/text/custom_glyph.rs     |   2 +-
 wgui/src/widget/rectangle.rs                  |   7 +-
 wgui/src/widget/sprite.rs                     |   9 +-
 wlx-overlay-s/src/backend/task.rs             |  17 +++
 wlx-overlay-s/src/backend/wayvr/mod.rs        |   6 +-
 wlx-overlay-s/src/backend/wayvr/server_ipc.rs |  32 +++++
 wlx-overlay-s/src/overlays/custom.rs          | 128 +++++++++++++++++-
 wlx-overlay-s/src/overlays/edit/sprite_tab.rs |   2 +-
 wlx-overlay-s/src/overlays/watch.rs           |   4 +-
 wlx-overlay-s/src/overlays/wayvr.rs           |   4 +
 wlx-overlay-s/src/windowing/backend.rs        |   9 +-
 wlx-overlay-s/src/windowing/manager.rs        |  21 +++
 13 files changed, 247 insertions(+), 11 deletions(-)

diff --git a/wayvr-ipc/src/packet_client.rs b/wayvr-ipc/src/packet_client.rs
index 5378f93..6f8a81f 100644
--- a/wayvr-ipc/src/packet_client.rs
+++ b/wayvr-ipc/src/packet_client.rs
@@ -48,6 +48,22 @@ pub struct WlxHapticsParams {
 	pub frequency: f32,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum WlxCustomCommand {
+	SetText(String),
+	SetColor(String),
+	SetSprite(String),
+	SetVisible(bool),
+	SetStickyState(bool),
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct WlxCustomParams {
+	pub overlay: String,
+	pub element: String,
+	pub command: WlxCustomCommand,
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub enum PacketClient {
 	Handshake(Handshake),
@@ -68,4 +84,5 @@ pub enum PacketClient {
 	WvrProcessTerminate(packet_server::WvrProcessHandle),
 	WlxHaptics(WlxHapticsParams),
 	WlxInputState(Serial),
+	WlxCustom(WlxCustomParams),
 }
diff --git a/wgui/src/renderer_vk/text/custom_glyph.rs b/wgui/src/renderer_vk/text/custom_glyph.rs
index 4f3412c..ed4fd57 100644
--- a/wgui/src/renderer_vk/text/custom_glyph.rs
+++ b/wgui/src/renderer_vk/text/custom_glyph.rs
@@ -1,8 +1,8 @@
 use std::{
 	f32,
 	sync::{
-		Arc,
 		atomic::{AtomicUsize, Ordering},
+		Arc,
 	},
 };
 
diff --git a/wgui/src/widget/rectangle.rs b/wgui/src/widget/rectangle.rs
index e10778f..aae553e 100644
--- a/wgui/src/widget/rectangle.rs
+++ b/wgui/src/widget/rectangle.rs
@@ -2,8 +2,9 @@ use slotmap::Key;
 
 use crate::{
 	drawing::{self, GradientMode, PrimitiveExtent},
+	event::CallbackDataCommon,
 	layout::WidgetID,
-	widget::{WidgetStateFlags, util::WLength},
+	widget::{util::WLength, WidgetStateFlags},
 };
 
 use super::{WidgetObj, WidgetState};
@@ -35,6 +36,10 @@ impl WidgetRectangle {
 			}),
 		)
 	}
+	pub fn set_color(&mut self, common: &mut CallbackDataCommon, color: drawing::Color) {
+		self.params.color = color;
+		common.mark_widget_dirty(self.id);
+	}
 }
 
 impl WidgetObj for WidgetRectangle {
diff --git a/wgui/src/widget/sprite.rs b/wgui/src/widget/sprite.rs
index c344b28..f64f947 100644
--- a/wgui/src/widget/sprite.rs
+++ b/wgui/src/widget/sprite.rs
@@ -5,11 +5,12 @@ use slotmap::Key;
 
 use crate::{
 	drawing::{self, PrimitiveExtent},
+	event::CallbackDataCommon,
 	globals::Globals,
 	layout::WidgetID,
 	renderer_vk::text::{
-		DEFAULT_METRICS,
 		custom_glyph::{CustomGlyph, CustomGlyphData},
+		DEFAULT_METRICS,
 	},
 	widget::WidgetStateFlags,
 };
@@ -39,16 +40,18 @@ impl WidgetSprite {
 		)
 	}
 
-	pub fn set_color(&mut self, color: drawing::Color) {
+	pub fn set_color(&mut self, common: &mut CallbackDataCommon, color: drawing::Color) {
 		self.params.color = Some(color);
+		common.mark_widget_dirty(self.id);
 	}
 
 	pub fn get_color(&self) -> Option<drawing::Color> {
 		self.params.color
 	}
 
-	pub fn set_content(&mut self, content: Option<CustomGlyphData>) {
+	pub fn set_content(&mut self, common: &mut CallbackDataCommon, content: Option<CustomGlyphData>) {
 		self.params.glyph_data = content;
+		common.mark_widget_dirty(self.id);
 	}
 
 	pub fn get_content(&self) -> Option<CustomGlyphData> {
diff --git a/wlx-overlay-s/src/backend/task.rs b/wlx-overlay-s/src/backend/task.rs
index 1a82d51..7a13451 100644
--- a/wlx-overlay-s/src/backend/task.rs
+++ b/wlx-overlay-s/src/backend/task.rs
@@ -54,6 +54,22 @@ pub enum PlayspaceTask {
     FixFloor,
 }
 
+#[derive(Debug, Clone)]
+pub enum OverlayCustomCommand {
+    SetText(String),
+    SetColor(String),
+    SetSprite(String),
+    SetVisible(bool),
+    SetStickyState(bool),
+}
+
+#[derive(Debug, Clone)]
+pub struct OverlayCustomTask {
+    pub overlay: String,
+    pub element: String,
+    pub command: OverlayCustomCommand,
+}
+
 pub type ModifyOverlayTask = dyn FnOnce(&mut AppState, &mut OverlayWindowConfig) + Send;
 pub type CreateOverlayTask = dyn FnOnce(&mut AppState) -> Option<OverlayWindowConfig> + Send;
 pub enum OverlayTask {
@@ -66,6 +82,7 @@ pub enum OverlayTask {
     CleanupMirrors,
     Modify(OverlaySelector, Box<ModifyOverlayTask>),
     Create(OverlaySelector, Box<CreateOverlayTask>),
+    Custom(OverlayCustomTask),
     Drop(OverlaySelector),
 }
 
diff --git a/wlx-overlay-s/src/backend/wayvr/mod.rs b/wlx-overlay-s/src/backend/wayvr/mod.rs
index 66919a4..bde633b 100644
--- a/wlx-overlay-s/src/backend/wayvr/mod.rs
+++ b/wlx-overlay-s/src/backend/wayvr/mod.rs
@@ -41,7 +41,10 @@ use std::{
     sync::Arc,
 };
 use time::get_millis;
-use wayvr_ipc::{packet_client, packet_server};
+use wayvr_ipc::{
+    packet_client::{self},
+    packet_server,
+};
 use xkbcommon::xkb;
 
 use crate::{
@@ -94,6 +97,7 @@ pub enum WayVRSignal {
     BroadcastStateChanged(packet_server::WvrStateChanged),
     DropOverlay(crate::windowing::OverlayID),
     Haptics(super::input::Haptics),
+    CustomTask(crate::backend::task::OverlayCustomTask),
 }
 
 pub enum BlitMethod {
diff --git a/wlx-overlay-s/src/backend/wayvr/server_ipc.rs b/wlx-overlay-s/src/backend/wayvr/server_ipc.rs
index 5fdf463..9ead83a 100644
--- a/wlx-overlay-s/src/backend/wayvr/server_ipc.rs
+++ b/wlx-overlay-s/src/backend/wayvr/server_ipc.rs
@@ -479,6 +479,35 @@ impl Connection {
         ));
     }
 
+    fn handle_wlx_custom(params: &mut TickParams, custom_params: packet_client::WlxCustomParams) {
+        use crate::backend::task::{OverlayCustomCommand, OverlayCustomTask};
+
+        params
+            .state
+            .signals
+            .send(super::WayVRSignal::CustomTask(OverlayCustomTask {
+                overlay: custom_params.overlay,
+                element: custom_params.element,
+                command: match custom_params.command {
+                    packet_client::WlxCustomCommand::SetText(text) => {
+                        OverlayCustomCommand::SetText(text)
+                    }
+                    packet_client::WlxCustomCommand::SetSprite(sprite) => {
+                        OverlayCustomCommand::SetSprite(sprite)
+                    }
+                    packet_client::WlxCustomCommand::SetStickyState(sticky) => {
+                        OverlayCustomCommand::SetStickyState(sticky)
+                    }
+                    packet_client::WlxCustomCommand::SetVisible(visible) => {
+                        OverlayCustomCommand::SetVisible(visible)
+                    }
+                    packet_client::WlxCustomCommand::SetColor(color) => {
+                        OverlayCustomCommand::SetColor(color)
+                    }
+                },
+            }));
+    }
+
     fn process_payload(&mut self, params: &mut TickParams, payload: Payload) -> anyhow::Result<()> {
         let packet: PacketClient = ipc::data_decode(&payload)?;
 
@@ -531,6 +560,9 @@ impl Connection {
             PacketClient::WlxHaptics(haptics_params) => {
                 Self::handle_wlx_haptics(params, haptics_params);
             }
+            PacketClient::WlxCustom(custom_params) => {
+                Self::handle_wlx_custom(params, custom_params);
+            }
         }
 
         Ok(())
diff --git a/wlx-overlay-s/src/overlays/custom.rs b/wlx-overlay-s/src/overlays/custom.rs
index 1a6a592..da842f4 100644
--- a/wlx-overlay-s/src/overlays/custom.rs
+++ b/wlx-overlay-s/src/overlays/custom.rs
@@ -1,15 +1,29 @@
 use std::{sync::Arc, time::Duration};
 
+use anyhow::Context;
 use glam::{Affine3A, Quat, Vec3, vec3};
+use wgui::{
+    components::button::ComponentButton,
+    event::{CallbackDataCommon, EventAlterables},
+    i18n::Translation,
+    parser::{Fetchable, parse_color_hex},
+    renderer_vk::text::custom_glyph::{CustomGlyphContent, CustomGlyphData},
+    taffy,
+    widget::{label::WidgetLabel, rectangle::WidgetRectangle, sprite::WidgetSprite},
+};
 use wlx_common::windowing::OverlayWindowState;
 
 use crate::{
+    backend::task::OverlayCustomCommand,
     gui::{
         panel::{GuiPanel, NewGuiPanelParams},
         timer::GuiTimer,
     },
     state::AppState,
-    windowing::window::{OverlayCategory, OverlayWindowConfig},
+    windowing::{
+        backend::OverlayEventData,
+        window::{OverlayCategory, OverlayWindowConfig},
+    },
 };
 
 struct CustomPanelState {}
@@ -36,6 +50,21 @@ pub fn create_custom(app: &mut AppState, name: Arc<str>) -> Option<OverlayWindow
 
     let scale = panel.layout.content_size.x / 40.0 * 0.05;
 
+    panel.on_notify = Some(Box::new({
+        let name = name.clone();
+        move |panel, app, event_data| {
+            let OverlayEventData::CustomCommand { element, command } = event_data else {
+                return Ok(());
+            };
+
+            if let Err(e) = apply_custom_command(panel, app, &element, &command) {
+                log::warn!("Could not apply {command:?} on {name}/{element}: {e:?}");
+            };
+
+            Ok(())
+        }
+    }));
+
     Some(OverlayWindowConfig {
         name,
         category: OverlayCategory::Panel,
@@ -52,3 +81,100 @@ pub fn create_custom(app: &mut AppState, name: Arc<str>) -> Option<OverlayWindow
         ..OverlayWindowConfig::from_backend(Box::new(panel))
     })
 }
+
+fn apply_custom_command(
+    panel: &mut GuiPanel<CustomPanelState>,
+    app: &mut AppState,
+    element: &str,
+    command: &OverlayCustomCommand,
+) -> anyhow::Result<()> {
+    let mut alterables = EventAlterables::default();
+    let mut com = CallbackDataCommon {
+        alterables: &mut alterables,
+        state: &panel.layout.state,
+    };
+
+    match command {
+        OverlayCustomCommand::SetText(text) => {
+            if let Ok(mut label) = panel
+                .parser_state
+                .fetch_widget_as::<WidgetLabel>(&panel.layout.state, element)
+            {
+                label.set_text(&mut com, Translation::from_raw_text(text));
+            } else if let Ok(button) = panel
+                .parser_state
+                .fetch_component_as::<ComponentButton>(&element)
+            {
+                button.set_text(&mut com, Translation::from_raw_text(text));
+            } else {
+                anyhow::bail!("No <label> or <Button> with such id.");
+            }
+        }
+        OverlayCustomCommand::SetSprite(path) => {
+            let mut widget = panel
+                .parser_state
+                .fetch_widget_as::<WidgetSprite>(&panel.layout.state, element)
+                .context("No <sprite> with such id.")?;
+
+            if path == "none" {
+                widget.set_content(&mut com, None);
+            } else {
+                let content = CustomGlyphContent::from_assets(
+                    &mut app.wgui_globals,
+                    wgui::assets::AssetPath::File(&path),
+                )
+                .context("Could not load content from supplied path.")?;
+
+                let data = CustomGlyphData::new(content);
+
+                widget.set_content(&mut com, Some(data));
+            }
+        }
+        OverlayCustomCommand::SetColor(color) => {
+            let color = parse_color_hex(&color)
+                .context("Invalid color format, must be a html hex color!")?;
+
+            if let Ok(pair) = panel
+                .parser_state
+                .fetch_widget(&panel.layout.state, element)
+            {
+                if let Some(mut rect) = pair.widget.get_as_mut::<WidgetRectangle>() {
+                    rect.set_color(&mut com, color);
+                } else if let Some(mut label) = pair.widget.get_as_mut::<WidgetLabel>() {
+                    label.set_color(&mut com, color, true);
+                } else if let Some(mut sprite) = pair.widget.get_as_mut::<WidgetSprite>() {
+                    sprite.set_color(&mut com, color);
+                } else {
+                    anyhow::bail!("No <rectangle> or <label> or <sprite> with such id.");
+                }
+            } else {
+                anyhow::bail!("No <rectangle> or <label> or <sprite> with such id.");
+            }
+        }
+        OverlayCustomCommand::SetVisible(visible) => {
+            let wid = panel
+                .parser_state
+                .get_widget_id(&element)
+                .context("No widget with such id.")?;
+
+            let display = if *visible {
+                taffy::Display::Flex
+            } else {
+                taffy::Display::None
+            };
+
+            com.alterables
+                .set_style(wid, wgui::event::StyleSetRequest::Display(display));
+        }
+        OverlayCustomCommand::SetStickyState(sticky_down) => {
+            let button = panel
+                .parser_state
+                .fetch_component_as::<ComponentButton>(element)
+                .context("No <Button> with such id.")?;
+            button.set_sticky_state(&mut com, *sticky_down);
+        }
+    }
+
+    panel.layout.process_alterables(alterables)?;
+    Ok(())
+}
diff --git a/wlx-overlay-s/src/overlays/edit/sprite_tab.rs b/wlx-overlay-s/src/overlays/edit/sprite_tab.rs
index 0e93492..bfbb636 100644
--- a/wlx-overlay-s/src/overlays/edit/sprite_tab.rs
+++ b/wlx-overlay-s/src/overlays/edit/sprite_tab.rs
@@ -107,7 +107,7 @@ where
             .widgets
             .get_as::<WidgetSprite>(self.top_sprite_id)
         {
-            sprite.set_content(Some(new.sprite.clone()));
+            sprite.set_content(common, Some(new.sprite.clone()));
         }
     }
 
diff --git a/wlx-overlay-s/src/overlays/watch.rs b/wlx-overlay-s/src/overlays/watch.rs
index 0071d44..6fde7a8 100644
--- a/wlx-overlay-s/src/overlays/watch.rs
+++ b/wlx-overlay-s/src/overlays/watch.rs
@@ -473,7 +473,7 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
                             .get_as::<WidgetSprite>(btn.sprite)
                             && let Some(glyph) = panel.state.overlay_cat_icons.get(meta.category)
                         {
-                            sprite.set_content(Some(glyph.clone()));
+                            sprite.set_content(&mut com, Some(glyph.clone()));
                         }
 
                         btn.button.set_sticky_state(&mut com, meta.visible);
@@ -525,7 +525,7 @@ pub fn create_watch(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig> {
                         && let Some(glyph) = panel.state.device_role_icons.get(dev.role)
                         && let Some(mut s) = panel.layout.state.widgets.get_as::<WidgetSprite>(*s)
                     {
-                        s.set_content(Some(glyph.clone()));
+                        s.set_content(&mut com, Some(glyph.clone()));
                         com.alterables
                             .set_style(*div, StyleSetRequest::Display(taffy::Display::Flex));
                     } else {
diff --git a/wlx-overlay-s/src/overlays/wayvr.rs b/wlx-overlay-s/src/overlays/wayvr.rs
index 4caaf28..7fc55ca 100644
--- a/wlx-overlay-s/src/overlays/wayvr.rs
+++ b/wlx-overlay-s/src/overlays/wayvr.rs
@@ -461,6 +461,10 @@ where
             wayvr::WayVRSignal::Haptics(haptics) => {
                 wayvr.pending_haptics = Some(haptics);
             }
+            wayvr::WayVRSignal::CustomTask(custom_task) => {
+                app.tasks
+                    .enqueue(TaskType::Overlay(OverlayTask::Custom(custom_task)));
+            }
         }
     }
 
diff --git a/wlx-overlay-s/src/windowing/backend.rs b/wlx-overlay-s/src/windowing/backend.rs
index e9af14c..1bb6e25 100644
--- a/wlx-overlay-s/src/windowing/backend.rs
+++ b/wlx-overlay-s/src/windowing/backend.rs
@@ -12,7 +12,10 @@ use wlx_common::{
 };
 
 use crate::{
-    backend::input::{HoverResult, PointerHit},
+    backend::{
+        input::{HoverResult, PointerHit},
+        task::OverlayCustomCommand,
+    },
     graphics::{ExtentExt, RenderResult},
     state::AppState,
     subsystem::hid::WheelDelta,
@@ -123,6 +126,10 @@ pub enum OverlayEventData {
         pos: Positioning,
         editing: bool,
     },
+    CustomCommand {
+        element: String,
+        command: OverlayCustomCommand,
+    },
 }
 
 pub trait OverlayBackend: Any {
diff --git a/wlx-overlay-s/src/windowing/manager.rs b/wlx-overlay-s/src/windowing/manager.rs
index 76373ed..704217e 100644
--- a/wlx-overlay-s/src/windowing/manager.rs
+++ b/wlx-overlay-s/src/windowing/manager.rs
@@ -290,6 +290,27 @@ where
                     self.dropped_overlays.push_back(o);
                 }
             }
+            OverlayTask::Custom(task) => {
+                if let Some(oid) = self.lookup(&task.overlay)
+                    && let Some(o) = self.mut_by_id(oid)
+                {
+                    if !matches!(o.config.category, OverlayCategory::Panel) {
+                        log::warn!(
+                            "Received command for '{}', but this overlay does not support commands",
+                            &task.overlay
+                        );
+                        return Ok(());
+                    }
+
+                    o.config.backend.notify(
+                        app,
+                        OverlayEventData::CustomCommand {
+                            element: task.element,
+                            command: task.command,
+                        },
+                    )?;
+                }
+            }
         }
         Ok(())
     }

From f038ad8a8793d3de4395b782bd58f5933820094e Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Tue, 23 Dec 2025 18:20:27 +0900
Subject: [PATCH 22/29] wayvrctl + panel-modify ipc

---
 Cargo.lock                                    |  85 +++++-
 Cargo.toml                                    |   5 +-
 dash-frontend/Cargo.toml                      |   8 +-
 wayvr-ipc/Cargo.toml                          |   4 +-
 wayvr-ipc/src/client.rs                       |   8 +
 wayvr-ipc/src/packet_client.rs                |   8 +-
 wayvrctl/Cargo.toml                           |  15 +
 wayvrctl/src/helper.rs                        | 246 +++++++++++++++
 wayvrctl/src/main.rs                          | 279 ++++++++++++++++++
 wgui/Cargo.toml                               |  18 +-
 wlx-common/Cargo.toml                         |   2 +-
 wlx-overlay-s/Cargo.toml                      |  13 +-
 wlx-overlay-s/src/backend/task.rs             |   8 +-
 wlx-overlay-s/src/backend/wayvr/mod.rs        |   2 +-
 wlx-overlay-s/src/backend/wayvr/server_ipc.rs |  33 ++-
 wlx-overlay-s/src/overlays/custom.rs          |  14 +-
 wlx-overlay-s/src/overlays/wayvr.rs           |   2 +-
 wlx-overlay-s/src/windowing/backend.rs        |   4 +-
 wlx-overlay-s/src/windowing/manager.rs        |   2 +-
 19 files changed, 697 insertions(+), 59 deletions(-)
 create mode 100644 wayvrctl/Cargo.toml
 create mode 100644 wayvrctl/src/helper.rs
 create mode 100644 wayvrctl/src/main.rs

diff --git a/Cargo.lock b/Cargo.lock
index aceb10d..44ed0f6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -557,7 +557,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d123397e75f904758fef490775a00b0ada545ab409cb0163d919799e5a30119b"
 dependencies = [
  "autocxx-engine",
- "env_logger",
+ "env_logger 0.9.3",
  "indexmap 1.9.3",
  "syn 2.0.111",
 ]
@@ -1750,6 +1750,16 @@ dependencies = [
  "syn 2.0.111",
 ]
 
+[[package]]
+name = "env_filter"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2"
+dependencies = [
+ "log",
+ "regex",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.9.3"
@@ -1763,6 +1773,19 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
 [[package]]
 name = "equator"
 version = "0.4.2"
@@ -2954,6 +2977,30 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
+[[package]]
+name = "jiff"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde_core",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.111",
+]
+
 [[package]]
 name = "jni"
 version = "0.21.1"
@@ -4271,6 +4318,21 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f59e70c4aef1e55797c2e8fd94a4f2a973fc972cfde0e0b05f683667b0cd39dd"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
 [[package]]
 name = "potential_utf"
 version = "0.1.4"
@@ -5047,6 +5109,12 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shell-words"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77"
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -6373,6 +6441,21 @@ dependencies = [
  "tokio-util",
 ]
 
+[[package]]
+name = "wayvrctl"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "env_logger 0.11.8",
+ "log",
+ "serde",
+ "serde_json",
+ "shell-words",
+ "tokio",
+ "wayvr-ipc",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.83"
diff --git a/Cargo.toml b/Cargo.toml
index dd28db1..40ec14d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,18 +17,21 @@ members = [
   "wlx-overlay-s",
   "wlx-capture",
   "dash-frontend",
-  "wayvr-ipc",
+  "wayvr-ipc", "wayvrctl",
 ]
 resolver = "3"
 
 [workspace.dependencies]
 anyhow = "1.0.100"
 glam = { version = "0.30.9", features = ["mint", "serde"] }
+clap = { version = "4.5.53", features = ["derive"] }
 idmap = "0.2.2"
 idmap-derive = "0.2.22"
 log = "0.4.29"
 regex = "1.12.2"
 rust-embed = "8.9.0"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1.0.145"
 slotmap = "1.1.1"
 vulkano = { version = "0.35.2", default-features = false, features = [
   "macros",
diff --git a/dash-frontend/Cargo.toml b/dash-frontend/Cargo.toml
index 5bd23d7..48bb73e 100644
--- a/dash-frontend/Cargo.toml
+++ b/dash-frontend/Cargo.toml
@@ -7,11 +7,11 @@ edition = "2024"
 anyhow.workspace = true
 wgui = { path = "../wgui/" }
 glam = { workspace = true, features = ["mint", "serde"] }
-log = { workspace = true }
-rust-embed = { workspace = true }
+log.workspace = true
+rust-embed.workspace = true
 chrono = "0.4.42"
 gio = "0.21.5"
 gtk = "0.18.2"
-serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.145"
+serde.workspace = true
+serde_json.workspace = true
 wlx-common = { path = "../wlx-common" }
diff --git a/wayvr-ipc/Cargo.toml b/wayvr-ipc/Cargo.toml
index 20e9928..b392eb4 100644
--- a/wayvr-ipc/Cargo.toml
+++ b/wayvr-ipc/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2024"
 [dependencies]
 bytes = "1.9.0"
 smallvec = "1.13.2"
-serde = { version = "1", features = ["derive"] }
+serde.workspace = true
 anyhow = "1.0.93"
 log = "0.4.22"
 
@@ -14,7 +14,7 @@ log = "0.4.22"
 interprocess = { version = "2.2.2", features = ["tokio"], optional = true }
 tokio = { version = "1.43.1", features = ["macros"], optional = true }
 tokio-util = { version = "0.7.13", optional = true }
-serde_json = "1.0.135"
+serde_json.workspace = true
 
 [features]
 default = ["client"]
diff --git a/wayvr-ipc/src/client.rs b/wayvr-ipc/src/client.rs
index 46cd0d2..db4c287 100644
--- a/wayvr-ipc/src/client.rs
+++ b/wayvr-ipc/src/client.rs
@@ -486,6 +486,14 @@ impl WayVRClient {
 		send_only!(client, &PacketClient::WlxHaptics(params));
 		Ok(())
 	}
+
+	pub async fn fn_wlx_modify_panel(
+		client: WayVRClientMutex,
+		params: packet_client::WlxModifyPanelParams,
+	) -> anyhow::Result<()> {
+		send_only!(client, &PacketClient::WlxModifyPanel(params));
+		Ok(())
+	}
 }
 
 impl Drop for WayVRClient {
diff --git a/wayvr-ipc/src/packet_client.rs b/wayvr-ipc/src/packet_client.rs
index 6f8a81f..0ed09ed 100644
--- a/wayvr-ipc/src/packet_client.rs
+++ b/wayvr-ipc/src/packet_client.rs
@@ -49,7 +49,7 @@ pub struct WlxHapticsParams {
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum WlxCustomCommand {
+pub enum WlxModifyPanelCommand {
 	SetText(String),
 	SetColor(String),
 	SetSprite(String),
@@ -58,10 +58,10 @@ pub enum WlxCustomCommand {
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct WlxCustomParams {
+pub struct WlxModifyPanelParams {
 	pub overlay: String,
 	pub element: String,
-	pub command: WlxCustomCommand,
+	pub command: WlxModifyPanelCommand,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -84,5 +84,5 @@ pub enum PacketClient {
 	WvrProcessTerminate(packet_server::WvrProcessHandle),
 	WlxHaptics(WlxHapticsParams),
 	WlxInputState(Serial),
-	WlxCustom(WlxCustomParams),
+	WlxModifyPanel(WlxModifyPanelParams),
 }
diff --git a/wayvrctl/Cargo.toml b/wayvrctl/Cargo.toml
new file mode 100644
index 0000000..69b520b
--- /dev/null
+++ b/wayvrctl/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "wayvrctl"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+anyhow.workspace = true
+log.workspace = true
+clap.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+env_logger = "0.11.8"
+tokio = "1.48.0"
+wayvr-ipc = { path = "../wayvr-ipc" }
+shell-words = "1.1.1"
diff --git a/wayvrctl/src/helper.rs b/wayvrctl/src/helper.rs
new file mode 100644
index 0000000..9fb7420
--- /dev/null
+++ b/wayvrctl/src/helper.rs
@@ -0,0 +1,246 @@
+use std::{collections::HashMap};
+
+use anyhow::Context;
+use serde::Serialize;
+use wayvr_ipc::{client::{WayVRClient, WayVRClientMutex}, ipc, packet_client, packet_server};
+
+pub struct WayVRClientState {
+	pub wayvr_client: WayVRClientMutex,
+	pub serial_generator: ipc::SerialGenerator,
+	pub pretty_print: bool,
+}
+
+fn handle_empty_result(result: anyhow::Result<()>) {
+	if let Err(e) = result {
+		log::error!("{e:?}");
+	}
+}
+
+fn handle_result<T: Serialize>(pretty_print: bool, result: anyhow::Result<T>) {
+	match result {
+		Ok(t) => {
+			
+			let maybe_json = if pretty_print {
+				serde_json::to_string_pretty(&t)
+			} else {
+				serde_json::to_string(&t)
+			};
+
+			match maybe_json {
+				Ok(json_string) => println!("{}", json_string),
+				Err(e) => log::error!("Failed to serialize JSON: {e:?}")
+			}
+		}
+		Err(e) => log::error!("{e:?}")
+	}
+}
+
+pub async fn wvr_display_create(
+	state: &mut WayVRClientState,
+	width: u16,
+	height: u16,
+	name: String,
+	scale: Option<f32>,
+	attach_to: packet_client::AttachTo,
+) {
+	handle_result(state.pretty_print,
+		WayVRClient::fn_wvr_display_create(
+			state.wayvr_client.clone(),
+ 			state.serial_generator.increment_get(),
+			packet_client::WvrDisplayCreateParams {
+				width,
+				height,
+				name,
+				scale,
+				attach_to,
+			},
+		)
+		.await.context("failed to create display")
+	);
+}
+
+pub async fn wvr_display_list(
+	state: &mut WayVRClientState,
+) {
+	handle_result(state.pretty_print,
+		WayVRClient::fn_wvr_display_list(
+			state.wayvr_client.clone(),
+ 			state.serial_generator.increment_get(),
+		)
+		.await.context("failed to fetch displays")
+);
+}
+
+pub async fn wvr_display_get(
+	state: &mut WayVRClientState,
+	handle: packet_server::WvrDisplayHandle,
+) {
+	handle_result(state.pretty_print,
+		WayVRClient::fn_wvr_display_get(
+			state.wayvr_client.clone(),
+ 			state.serial_generator.increment_get(),
+			handle,
+		)
+		.await.context("failed to fetch display")
+);
+}
+
+pub async fn wvr_display_window_list(
+	state: &mut WayVRClientState,
+	handle: packet_server::WvrDisplayHandle,
+) {
+	handle_result(state.pretty_print,
+		WayVRClient::fn_wvr_display_window_list(
+			state.wayvr_client.clone(),
+ 			state.serial_generator.increment_get(),
+			handle,
+		)
+		.await.context("failed to list window displays")
+	);
+}
+
+pub async fn wvr_display_remove(
+	state: &mut WayVRClientState,
+	handle: packet_server::WvrDisplayHandle,
+) {
+	handle_result(state.pretty_print,
+		WayVRClient::fn_wvr_display_remove(
+			state.wayvr_client.clone(),
+ 			state.serial_generator.increment_get(),
+			handle,
+		)
+		.await.context("failed to remove display")
+	);
+}
+
+pub async fn wvr_display_set_visible(
+	state: &mut WayVRClientState,
+	handle: packet_server::WvrDisplayHandle,
+	visible: bool,
+) {
+	handle_empty_result(
+		WayVRClient::fn_wvr_display_set_visible(state.wayvr_client.clone(), handle, visible).await.context("failed to set display visibility"),
+	)
+}
+
+pub async fn wvr_window_set_visible(
+	state: &mut WayVRClientState,
+	handle: packet_server::WvrWindowHandle,
+	visible: bool,
+) {
+	handle_empty_result(
+		WayVRClient::fn_wvr_window_set_visible(state.wayvr_client.clone(), handle, visible).await.context("failed to set window visibility"),
+	)
+}
+
+pub async fn wvr_process_get(
+	state: &mut WayVRClientState,
+	handle: packet_server::WvrProcessHandle,
+) {
+	handle_result(state.pretty_print,
+		WayVRClient::fn_wvr_process_get(
+			state.wayvr_client.clone(),
+ 			state.serial_generator.increment_get(),
+			handle,
+		)
+		.await.context("failed to get process"),
+	);
+}
+
+pub async fn wvr_process_list(
+	state: &mut WayVRClientState,
+) {
+	handle_result(state.pretty_print,
+		WayVRClient::fn_wvr_process_list(
+			state.wayvr_client.clone(),
+ 			state.serial_generator.increment_get(),
+		)
+		.await.context("failed to list processes"),
+	)
+}
+
+pub async fn wvr_process_terminate(
+	state: &mut WayVRClientState,
+	handle: packet_server::WvrProcessHandle,
+) {
+	handle_empty_result(
+		WayVRClient::fn_wvr_process_terminate(state.wayvr_client.clone(), handle).await.context("failed to terminate process"),
+	)
+}
+
+pub async fn wvr_process_launch(
+	state: &mut WayVRClientState,
+	exec: String,
+	name: String,
+	env: Vec<String>,
+	target_display: packet_server::WvrDisplayHandle,
+	args: String,
+	userdata: HashMap<String, String>,
+) {
+	handle_result(state.pretty_print,
+		WayVRClient::fn_wvr_process_launch(
+			state.wayvr_client.clone(),
+			state.serial_generator.increment_get(),
+			packet_client::WvrProcessLaunchParams {
+				env,
+				exec,
+				name,
+				target_display,
+				args,
+				userdata,
+			},
+		)
+		.await.context("failed to launch process"),
+	)
+}
+
+pub async fn wlx_haptics(
+	state: &mut WayVRClientState,
+	intensity: f32,
+	duration: f32,
+	frequency: f32,
+) {
+	handle_empty_result(
+		WayVRClient::fn_wlx_haptics(
+			state.wayvr_client.clone(),
+			packet_client::WlxHapticsParams {
+				intensity,
+				duration,
+				frequency,
+			},
+		)
+		.await.context("failed to trigger haptics"),
+	)
+}
+
+pub async fn wlx_panel_modify(
+	state: &mut WayVRClientState,
+	overlay: String,
+	element: String,
+	command: packet_client::WlxModifyPanelCommand,
+) {
+	handle_empty_result(
+		WayVRClient::fn_wlx_modify_panel(
+			state.wayvr_client.clone(),
+			packet_client::WlxModifyPanelParams {
+				overlay,
+				element,
+				command,
+			},
+		)
+		.await.context("failed to modify panel"),
+	)
+}
+
+pub async fn wlx_input_state(
+	state: &mut WayVRClientState,
+) {
+	handle_result(state.pretty_print,
+		WayVRClient::fn_wlx_input_state(
+			state.wayvr_client.clone(),
+ 			state.serial_generator.increment_get(),
+		)
+		.await.context("failed to get input state"),
+	)
+}
+
diff --git a/wayvrctl/src/main.rs b/wayvrctl/src/main.rs
new file mode 100644
index 0000000..0db8dc5
--- /dev/null
+++ b/wayvrctl/src/main.rs
@@ -0,0 +1,279 @@
+use std::{collections::HashMap, process::{self, ExitCode}};
+
+use anyhow::Context;
+use clap::Parser;
+use env_logger::Env;
+use wayvr_ipc::{client::WayVRClient, ipc, packet_client, };
+
+use crate::helper::{wlx_haptics, wlx_input_state, wlx_panel_modify, wvr_display_create, wvr_display_get, wvr_display_list, wvr_display_remove, wvr_display_set_visible, wvr_display_window_list, wvr_process_get, wvr_process_launch, wvr_process_list, wvr_process_terminate, wvr_window_set_visible, WayVRClientState};
+
+mod helper;
+
+
+#[tokio::main(flavor = "current_thread")]
+async fn main() -> ExitCode {
+    env_logger::init_from_env(Env::default().default_filter_or("info"));
+    let args = Args::parse();
+
+    let mut state = WayVRClientState {
+        wayvr_client : WayVRClient::new(&format!("wayvrctl-{}", process::id())).await.inspect_err(|e| {
+            log::error!("Failed to initialize WayVR connection: {e:?}");
+            process::exit(1);
+        }).unwrap(),
+        serial_generator: ipc::SerialGenerator::new(),
+        pretty_print: args.pretty,
+    };
+
+    let maybe_err = if let Subcommands::Batch {fail_fast} = args.command {
+        run_batch(&mut state, fail_fast).await
+    } else {
+        run_once(&mut state, args).await
+     };
+
+    if let Err(e) = maybe_err{
+        log::error!("{e:?}");
+        return ExitCode::FAILURE;
+    }
+
+    ExitCode::SUCCESS
+}
+
+async fn run_batch(state: &mut WayVRClientState, fail_fast: bool) -> anyhow::Result<()> {
+    let stdin = std::io::stdin();
+
+    for (line_no, line) in stdin.lines().enumerate() {
+        let line = line.context("error reading stdin")?;
+
+        if line.trim().is_empty() || line.trim_start().starts_with('#') {
+            continue;
+        }
+
+        if let Err(e) = parse_run_line(state, &line).await.with_context(|| format!("error on line {}", line_no + 1)) {
+            if fail_fast {
+                return Err(e)
+            } else {
+                log::error!("{e:?}");
+            }
+        }
+
+    }
+    Ok(())
+}
+
+async fn parse_run_line(state: &mut WayVRClientState, line: &str) -> anyhow::Result<()> {
+            let mut argv = shell_words::split(&line)
+            .with_context(|| format!("parse error"))
+            ?;
+
+        // clap expects argv[0] to be the binary name
+        argv.insert(0, env!("CARGO_PKG_NAME").to_string());
+
+        let args = Args::try_parse_from(argv).with_context(|| format!("invalid arguments"))?;
+        run_once(state, args).await?;
+
+        Ok(())
+}
+
+async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()> {
+    match args.command {
+        Subcommands::Batch { .. } => {
+            log::warn!("Ignoring recursive batch command");
+        }
+        Subcommands::InputState => {
+            wlx_input_state(state).await;
+        }
+        Subcommands::DisplayCreate { width, height, name, scale } => {
+            wvr_display_create(state, width, height, name, scale, packet_client::AttachTo::None).await;
+        }
+        Subcommands::DisplayList => {
+            wvr_display_list(state).await;
+        }
+        Subcommands::DisplayGet { handle } => {
+            let handle = serde_json::from_str(&handle).context("Invalid handle")?;
+            wvr_display_get(state, handle).await;
+        }
+        Subcommands::DisplayWindowList { handle } => {
+            let handle = serde_json::from_str(&handle).context("Invalid handle")?;
+            wvr_display_window_list(state, handle).await;
+        }
+        Subcommands::DisplayRemove { handle } => {
+            let handle = serde_json::from_str(&handle).context("Invalid handle")?;
+            wvr_display_remove(state, handle).await;
+        }
+        Subcommands::DisplaySetVisible { handle, visible_0_or_1 } => {
+            let handle = serde_json::from_str(&handle).context("Invalid handle")?;
+            wvr_display_set_visible(state, handle, visible_0_or_1 != 0).await;
+        }
+        Subcommands::WindowSetVisible { handle, visible_0_or_1 } => {
+            let handle = serde_json::from_str(&handle).context("Invalid handle")?;
+            wvr_window_set_visible(state, handle, visible_0_or_1 != 0).await;
+        }
+        Subcommands::ProcessGet { handle } => {
+            let handle = serde_json::from_str(&handle).context("Invalid handle")?;
+            wvr_process_get(state, handle).await;
+        }
+        Subcommands::ProcessList => {
+            wvr_process_list(state).await;
+        }
+        Subcommands::ProcessTerminate { handle } => {
+            let handle = serde_json::from_str(&handle).context("Invalid handle")?;
+            wvr_process_terminate(state, handle).await;
+        }
+        Subcommands::ProcessLaunch { exec, name, env, target_display, args } => {
+            let handle = serde_json::from_str(&target_display).context("Invalid target_display")?;
+            wvr_process_launch(state, exec, name, env, handle, args, HashMap::new()).await;
+        }
+        Subcommands::Haptics { intensity, duration, frequency } => {
+            wlx_haptics(state, intensity, duration, frequency).await;
+        }
+        Subcommands::PanelModify { overlay, element, command } => {
+            let command = match command {
+                SubcommandPanelModify::SetText { text } => packet_client::WlxModifyPanelCommand::SetText(text),
+                SubcommandPanelModify::SetColor { hex_color } => packet_client::WlxModifyPanelCommand::SetColor(hex_color),
+                SubcommandPanelModify::SetSprite { absolute_path } => packet_client::WlxModifyPanelCommand::SetSprite(absolute_path),
+                SubcommandPanelModify::SetVisible { visible_0_or_1 } => packet_client::WlxModifyPanelCommand::SetVisible(visible_0_or_1 != 0),
+                SubcommandPanelModify::SetStickyState { sticky_state_0_or_1 } => packet_client::WlxModifyPanelCommand::SetStickyState(sticky_state_0_or_1 != 0),
+            };
+            
+            wlx_panel_modify(state, overlay, element, command).await;
+        }
+    }
+    Ok(())
+}
+
+
+/// A command-line interface for WayVR IPC
+#[derive(clap::Parser, Debug)]
+#[command(version, about, long_about = None)]
+struct Args {
+    /// The command to run
+    #[command(subcommand)]
+    command: Subcommands,
+
+    /// Pretty-print JSON output
+    #[arg(short, long)]
+    pretty: bool,
+}
+
+#[derive(clap::Parser, Debug)]
+enum Subcommands {
+    /// Read commands from stdout, one per line.
+    Batch {
+    /// Stop on the first error
+    #[arg(short, long)]
+      fail_fast: bool,  
+    },
+    /// Get the positions of HMD & controllers
+    InputState,
+    /// Create a new WayVR display
+    DisplayCreate{
+    	width: u16,
+    	height: u16,
+    	name: String,
+        #[arg(short, long)]
+    	scale: Option<f32>,
+
+    	//attach_to: packet_client::AttachTo,
+    },
+    /// List WayVR displays
+    DisplayList,
+    /// Retrieve information about a single WayVR display
+    DisplayGet {
+        /// A display handle JSON returned by DisplayList or DisplayCreate
+    	handle: String,
+    },
+    /// List windows attached to a WayVR display
+    DisplayWindowList {
+        /// A display handle JSON returned by DisplayList or DisplayCreate
+    	handle: String,
+    },
+    /// Delete a WayVR display
+    DisplayRemove {
+        /// A display handle JSON returned by DisplayList or DisplayCreate
+    	handle: String,
+    },
+    /// Change the visibility of a WayVR display
+    DisplaySetVisible {
+        /// A display handle JSON returned by DisplayList or DisplayCreate
+    	handle: String,
+    	visible_0_or_1: u8,
+    },
+
+    // DisplaySetLayout skipped
+ 
+    /// Change the visibility of a window on a WayVR display
+    WindowSetVisible {
+        /// A JSON window handle returned by DisplayWindowList
+    	handle: String,
+    	visible_0_or_1: u8,
+    },
+    /// Retrieve information about a WayVR-managed process
+    ProcessGet {
+    /// A JSON process handle returned by ProcessList or ProcessLaunch
+	handle: String,
+
+    },
+    /// List all processes managed by WayVR
+    ProcessList,
+    /// Terminate a WayVR-managed process
+    ProcessTerminate {
+        /// A JSON process handle returned by ProcessList or ProcessLaunch
+    	handle: String,
+    },
+    /// Launch a new process inside WayVR
+    ProcessLaunch {
+    	exec: String,
+    	name: String,
+    	env: Vec<String>,
+        /// A display handle JSON returned by DisplayList or DisplayCreate
+    	target_display: String,
+    	args: String,
+    },
+    /// Trigger haptics on the user's controller
+    Haptics {
+        #[arg(short, long, default_value = "0.25")]
+    	intensity: f32,
+        #[arg(short, long , default_value = "0.1")]
+    	duration: f32,
+        #[arg(short, long, default_value = "0.1")]
+    	frequency: f32,
+    },
+    /// Apply a modification to a panel element
+    PanelModify {
+        /// The name of the overlay (XML file name without extension)
+    	overlay: String,
+        /// The id of the element to modify, as set in the XML
+    	element: String,
+        /// Command to execute
+        #[command(subcommand)]
+    	command: SubcommandPanelModify,
+    }
+
+}
+
+#[derive(clap::Parser, Debug)]
+enum SubcommandPanelModify {
+    /// Set the text of a <label> or <Button>
+    SetText {
+        /// Text that needs to be set
+        text: String,
+    },
+    /// Set the color of a <rectangle> or <label> or monochrome <sprite>
+    SetColor {
+        /// Color in HTML hex format (#rrggbb or #rrggbbaa)
+        hex_color: String,
+    },
+    /// Set the content of a sprite
+    SetSprite {
+        /// Absolute path to a svg, gif, png, jpeg or webp image.
+        absolute_path: String,
+    },
+    /// Set the visibility of a <div>, <rectangle>, <label> or <sprite>
+    SetVisible {
+        visible_0_or_1: u8,
+    },
+    /// Set the sticky state of a <Button>. Intended for buttons without `sticky="1"`.
+    SetStickyState {
+        sticky_state_0_or_1: u8,
+    }
+}
diff --git a/wgui/Cargo.toml b/wgui/Cargo.toml
index d5ff3c6..7d8c542 100644
--- a/wgui/Cargo.toml
+++ b/wgui/Cargo.toml
@@ -4,10 +4,10 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-anyhow = { workspace = true }
+anyhow.workspace = true
 cosmic-text = "0.15.0"
 etagere = "0.2.15"
-glam = { workspace = true }
+glam.workspace = true
 image = { version = "0.25.9", default-features = false, features = [
   "gif",
   "jpeg",
@@ -15,19 +15,19 @@ image = { version = "0.25.9", default-features = false, features = [
   "rayon",
   "webp",
 ] }
-log = { workspace = true }
+log.workspace = true
 lru = "0.16.2"
 ouroboros = "0.18.5"
 parking_lot = "0.12.5"
-regex = { workspace = true }
+regex.workspace = true
 resvg = { version = "0.45.1", default-features = false }
 roxmltree = "0.21.1"
 rustc-hash = "2.1.1"
-serde_json = "1.0.145"
-slotmap = { workspace = true }
+serde_json.workspace = true
+slotmap.workspace = true
 smallvec = "1.15.1"
 taffy = "0.9.2"
-vulkano = { workspace = true }
-vulkano-shaders = { workspace = true }
-rust-embed = { workspace = true }
+vulkano.workspace = true
+vulkano-shaders.workspace = true
+rust-embed.workspace = true
 flate2 = "1.1.5"
diff --git a/wlx-common/Cargo.toml b/wlx-common/Cargo.toml
index 88768e5..a1cac1a 100644
--- a/wlx-common/Cargo.toml
+++ b/wlx-common/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2024"
 
 
 [dependencies]
-serde = { version = "1.0.228", features = ["derive", "rc"] }
+serde = { workspace = true, features = ["rc"] }
 glam = { workspace = true }
 chrono = "0.4.42"
 idmap = { workspace = true, features = ["serde"] }
diff --git a/wlx-overlay-s/Cargo.toml b/wlx-overlay-s/Cargo.toml
index b78667a..99551c3 100644
--- a/wlx-overlay-s/Cargo.toml
+++ b/wlx-overlay-s/Cargo.toml
@@ -20,11 +20,16 @@ categories = ["games"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = { workspace = true }
+anyhow.workspace = true
+clap.workspace = true
+log.workspace = true
+slotmap.workspace = true
+serde = { workspace = true, features = ["rc"] }
+serde_json.workspace = true
+
 ash = "^0.38.0" # must match vulkano
 chrono = "0.4.42"
 chrono-tz = "0.10.4"
-clap = { version = "4.5.53", features = ["derive"] }
 config = "0.15.19"
 dbus = { version = "0.9.9" }
 futures = "0.3.31"
@@ -35,7 +40,6 @@ input-linux = "0.7.1"
 json = { version = "0.12.4", optional = true }
 json5 = "1.3.0"
 libc = "0.2.178"
-log = { workspace = true }
 openxr = { git = "https://github.com/Ralith/openxrs", rev = "d0afdd3365bc1e14de28f6a3a21f457e788a702e", features = [
   "linked",
   "mint",
@@ -51,10 +55,7 @@ rodio = { version = "0.21.1", default-features = false, features = [
   "hound",
 ] }
 rosc = { version = "0.11.4", optional = true }
-serde = { version = "1.0.228", features = ["derive", "rc"] }
-serde_json = "1.0.145"
 serde_yaml = "0.9.34"
-slotmap = { workspace = true }
 smallvec = "1.15.1"
 strum = { version = "0.27.2", features = ["derive"] }
 sysinfo = { version = "0.37" }
diff --git a/wlx-overlay-s/src/backend/task.rs b/wlx-overlay-s/src/backend/task.rs
index 7a13451..37cf321 100644
--- a/wlx-overlay-s/src/backend/task.rs
+++ b/wlx-overlay-s/src/backend/task.rs
@@ -55,7 +55,7 @@ pub enum PlayspaceTask {
 }
 
 #[derive(Debug, Clone)]
-pub enum OverlayCustomCommand {
+pub enum ModifyPanelCommand {
     SetText(String),
     SetColor(String),
     SetSprite(String),
@@ -64,10 +64,10 @@ pub enum OverlayCustomCommand {
 }
 
 #[derive(Debug, Clone)]
-pub struct OverlayCustomTask {
+pub struct ModifyPanelTask {
     pub overlay: String,
     pub element: String,
-    pub command: OverlayCustomCommand,
+    pub command: ModifyPanelCommand,
 }
 
 pub type ModifyOverlayTask = dyn FnOnce(&mut AppState, &mut OverlayWindowConfig) + Send;
@@ -82,7 +82,7 @@ pub enum OverlayTask {
     CleanupMirrors,
     Modify(OverlaySelector, Box<ModifyOverlayTask>),
     Create(OverlaySelector, Box<CreateOverlayTask>),
-    Custom(OverlayCustomTask),
+    ModifyPanel(ModifyPanelTask),
     Drop(OverlaySelector),
 }
 
diff --git a/wlx-overlay-s/src/backend/wayvr/mod.rs b/wlx-overlay-s/src/backend/wayvr/mod.rs
index bde633b..2c2b511 100644
--- a/wlx-overlay-s/src/backend/wayvr/mod.rs
+++ b/wlx-overlay-s/src/backend/wayvr/mod.rs
@@ -97,7 +97,7 @@ pub enum WayVRSignal {
     BroadcastStateChanged(packet_server::WvrStateChanged),
     DropOverlay(crate::windowing::OverlayID),
     Haptics(super::input::Haptics),
-    CustomTask(crate::backend::task::OverlayCustomTask),
+    CustomTask(crate::backend::task::ModifyPanelTask),
 }
 
 pub enum BlitMethod {
diff --git a/wlx-overlay-s/src/backend/wayvr/server_ipc.rs b/wlx-overlay-s/src/backend/wayvr/server_ipc.rs
index 9ead83a..bd17b20 100644
--- a/wlx-overlay-s/src/backend/wayvr/server_ipc.rs
+++ b/wlx-overlay-s/src/backend/wayvr/server_ipc.rs
@@ -479,30 +479,33 @@ impl Connection {
         ));
     }
 
-    fn handle_wlx_custom(params: &mut TickParams, custom_params: packet_client::WlxCustomParams) {
-        use crate::backend::task::{OverlayCustomCommand, OverlayCustomTask};
+    fn handle_wlx_panel(
+        params: &mut TickParams,
+        custom_params: packet_client::WlxModifyPanelParams,
+    ) {
+        use crate::backend::task::{ModifyPanelCommand, ModifyPanelTask};
 
         params
             .state
             .signals
-            .send(super::WayVRSignal::CustomTask(OverlayCustomTask {
+            .send(super::WayVRSignal::CustomTask(ModifyPanelTask {
                 overlay: custom_params.overlay,
                 element: custom_params.element,
                 command: match custom_params.command {
-                    packet_client::WlxCustomCommand::SetText(text) => {
-                        OverlayCustomCommand::SetText(text)
+                    packet_client::WlxModifyPanelCommand::SetText(text) => {
+                        ModifyPanelCommand::SetText(text)
                     }
-                    packet_client::WlxCustomCommand::SetSprite(sprite) => {
-                        OverlayCustomCommand::SetSprite(sprite)
+                    packet_client::WlxModifyPanelCommand::SetSprite(sprite) => {
+                        ModifyPanelCommand::SetSprite(sprite)
                     }
-                    packet_client::WlxCustomCommand::SetStickyState(sticky) => {
-                        OverlayCustomCommand::SetStickyState(sticky)
+                    packet_client::WlxModifyPanelCommand::SetStickyState(sticky) => {
+                        ModifyPanelCommand::SetStickyState(sticky)
                     }
-                    packet_client::WlxCustomCommand::SetVisible(visible) => {
-                        OverlayCustomCommand::SetVisible(visible)
+                    packet_client::WlxModifyPanelCommand::SetVisible(visible) => {
+                        ModifyPanelCommand::SetVisible(visible)
                     }
-                    packet_client::WlxCustomCommand::SetColor(color) => {
-                        OverlayCustomCommand::SetColor(color)
+                    packet_client::WlxModifyPanelCommand::SetColor(color) => {
+                        ModifyPanelCommand::SetColor(color)
                     }
                 },
             }));
@@ -560,8 +563,8 @@ impl Connection {
             PacketClient::WlxHaptics(haptics_params) => {
                 Self::handle_wlx_haptics(params, haptics_params);
             }
-            PacketClient::WlxCustom(custom_params) => {
-                Self::handle_wlx_custom(params, custom_params);
+            PacketClient::WlxModifyPanel(custom_params) => {
+                Self::handle_wlx_panel(params, custom_params);
             }
         }
 
diff --git a/wlx-overlay-s/src/overlays/custom.rs b/wlx-overlay-s/src/overlays/custom.rs
index da842f4..3637fe4 100644
--- a/wlx-overlay-s/src/overlays/custom.rs
+++ b/wlx-overlay-s/src/overlays/custom.rs
@@ -14,7 +14,7 @@ use wgui::{
 use wlx_common::windowing::OverlayWindowState;
 
 use crate::{
-    backend::task::OverlayCustomCommand,
+    backend::task::ModifyPanelCommand,
     gui::{
         panel::{GuiPanel, NewGuiPanelParams},
         timer::GuiTimer,
@@ -86,7 +86,7 @@ fn apply_custom_command(
     panel: &mut GuiPanel<CustomPanelState>,
     app: &mut AppState,
     element: &str,
-    command: &OverlayCustomCommand,
+    command: &ModifyPanelCommand,
 ) -> anyhow::Result<()> {
     let mut alterables = EventAlterables::default();
     let mut com = CallbackDataCommon {
@@ -95,7 +95,7 @@ fn apply_custom_command(
     };
 
     match command {
-        OverlayCustomCommand::SetText(text) => {
+        ModifyPanelCommand::SetText(text) => {
             if let Ok(mut label) = panel
                 .parser_state
                 .fetch_widget_as::<WidgetLabel>(&panel.layout.state, element)
@@ -110,7 +110,7 @@ fn apply_custom_command(
                 anyhow::bail!("No <label> or <Button> with such id.");
             }
         }
-        OverlayCustomCommand::SetSprite(path) => {
+        ModifyPanelCommand::SetSprite(path) => {
             let mut widget = panel
                 .parser_state
                 .fetch_widget_as::<WidgetSprite>(&panel.layout.state, element)
@@ -130,7 +130,7 @@ fn apply_custom_command(
                 widget.set_content(&mut com, Some(data));
             }
         }
-        OverlayCustomCommand::SetColor(color) => {
+        ModifyPanelCommand::SetColor(color) => {
             let color = parse_color_hex(&color)
                 .context("Invalid color format, must be a html hex color!")?;
 
@@ -151,7 +151,7 @@ fn apply_custom_command(
                 anyhow::bail!("No <rectangle> or <label> or <sprite> with such id.");
             }
         }
-        OverlayCustomCommand::SetVisible(visible) => {
+        ModifyPanelCommand::SetVisible(visible) => {
             let wid = panel
                 .parser_state
                 .get_widget_id(&element)
@@ -166,7 +166,7 @@ fn apply_custom_command(
             com.alterables
                 .set_style(wid, wgui::event::StyleSetRequest::Display(display));
         }
-        OverlayCustomCommand::SetStickyState(sticky_down) => {
+        ModifyPanelCommand::SetStickyState(sticky_down) => {
             let button = panel
                 .parser_state
                 .fetch_component_as::<ComponentButton>(element)
diff --git a/wlx-overlay-s/src/overlays/wayvr.rs b/wlx-overlay-s/src/overlays/wayvr.rs
index 7fc55ca..f5e6d69 100644
--- a/wlx-overlay-s/src/overlays/wayvr.rs
+++ b/wlx-overlay-s/src/overlays/wayvr.rs
@@ -463,7 +463,7 @@ where
             }
             wayvr::WayVRSignal::CustomTask(custom_task) => {
                 app.tasks
-                    .enqueue(TaskType::Overlay(OverlayTask::Custom(custom_task)));
+                    .enqueue(TaskType::Overlay(OverlayTask::ModifyPanel(custom_task)));
             }
         }
     }
diff --git a/wlx-overlay-s/src/windowing/backend.rs b/wlx-overlay-s/src/windowing/backend.rs
index 1bb6e25..14771d0 100644
--- a/wlx-overlay-s/src/windowing/backend.rs
+++ b/wlx-overlay-s/src/windowing/backend.rs
@@ -14,7 +14,7 @@ use wlx_common::{
 use crate::{
     backend::{
         input::{HoverResult, PointerHit},
-        task::OverlayCustomCommand,
+        task::ModifyPanelCommand,
     },
     graphics::{ExtentExt, RenderResult},
     state::AppState,
@@ -128,7 +128,7 @@ pub enum OverlayEventData {
     },
     CustomCommand {
         element: String,
-        command: OverlayCustomCommand,
+        command: ModifyPanelCommand,
     },
 }
 
diff --git a/wlx-overlay-s/src/windowing/manager.rs b/wlx-overlay-s/src/windowing/manager.rs
index 704217e..29ef5f6 100644
--- a/wlx-overlay-s/src/windowing/manager.rs
+++ b/wlx-overlay-s/src/windowing/manager.rs
@@ -290,7 +290,7 @@ where
                     self.dropped_overlays.push_back(o);
                 }
             }
-            OverlayTask::Custom(task) => {
+            OverlayTask::ModifyPanel(task) => {
                 if let Some(oid) = self.lookup(&task.overlay)
                     && let Some(o) = self.mut_by_id(oid)
                 {

From 17453ae1d935ee48775461b8c52375f671fa5b33 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Tue, 23 Dec 2025 19:17:57 +0900
Subject: [PATCH 23/29] wayvrctl: sleep to workaround sigbus from proto error

---
 wayvrctl/src/main.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wayvrctl/src/main.rs b/wayvrctl/src/main.rs
index 0db8dc5..d29583f 100644
--- a/wayvrctl/src/main.rs
+++ b/wayvrctl/src/main.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, process::{self, ExitCode}};
+use std::{collections::HashMap, process::{self, ExitCode}, time::Duration};
 
 use anyhow::Context;
 use clap::Parser;
@@ -33,6 +33,8 @@ async fn main() -> ExitCode {
     if let Err(e) = maybe_err{
         log::error!("{e:?}");
         return ExitCode::FAILURE;
+    } else {
+        std::thread::sleep(Duration::from_millis(20));
     }
 
     ExitCode::SUCCESS

From b3522695564ae1d5dd939b5ab2e76d49a99c5127 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Tue, 23 Dec 2025 22:10:46 +0900
Subject: [PATCH 24/29] add <image> widget

---
 wayvrctl/src/main.rs                      |   2 +-
 wgui/doc/widgets.md                       |  50 ++++-
 wgui/src/drawing.rs                       |  17 +-
 wgui/src/parser/mod.rs                    |   8 +-
 wgui/src/parser/widget_image.rs           |  78 +++++++
 wgui/src/parser/widget_sprite.rs          |   2 +-
 wgui/src/renderer_vk/context.rs           |  21 +-
 wgui/src/renderer_vk/image.rs             | 244 ++++++++++++++++++++++
 wgui/src/renderer_vk/mod.rs               |   1 +
 wgui/src/renderer_vk/model_buffer.rs      |  15 +-
 wgui/src/renderer_vk/rect.rs              |   2 +-
 wgui/src/renderer_vk/shaders/image.frag   |  55 +++++
 wgui/src/renderer_vk/shaders/image.vert   |  52 +++++
 wgui/src/renderer_vk/text/custom_glyph.rs |   6 +-
 wgui/src/renderer_vk/viewport.rs          |  16 +-
 wgui/src/widget/image.rs                  | 113 ++++++++++
 wgui/src/widget/mod.rs                    |   1 +
 wgui/src/widget/sprite.rs                 |   4 +
 wlx-overlay-s/src/overlays/custom.rs      |  25 ++-
 19 files changed, 686 insertions(+), 26 deletions(-)
 create mode 100644 wgui/src/parser/widget_image.rs
 create mode 100644 wgui/src/renderer_vk/image.rs
 create mode 100644 wgui/src/renderer_vk/shaders/image.frag
 create mode 100644 wgui/src/renderer_vk/shaders/image.vert
 create mode 100644 wgui/src/widget/image.rs

diff --git a/wayvrctl/src/main.rs b/wayvrctl/src/main.rs
index d29583f..7ecf454 100644
--- a/wayvrctl/src/main.rs
+++ b/wayvrctl/src/main.rs
@@ -265,7 +265,7 @@ enum SubcommandPanelModify {
         /// Color in HTML hex format (#rrggbb or #rrggbbaa)
         hex_color: String,
     },
-    /// Set the content of a sprite
+    /// Set the content of a <sprite> or <image>. Max size for <sprite> is 256x256.
     SetSprite {
         /// Absolute path to a svg, gif, png, jpeg or webp image.
         absolute_path: String,
diff --git a/wgui/doc/widgets.md b/wgui/doc/widgets.md
index 2c10d3c..f9e8ef7 100644
--- a/wgui/doc/widgets.md
+++ b/wgui/doc/widgets.md
@@ -160,7 +160,17 @@ _2nd gradient color_
 
 ### `<sprite>`
 
-### Image widget, supports raster and svg vector
+### Image widget for small images,
+
+Supported formats: svg, png, jpeg, gif, webp
+
+Maximum image size: 256x256 pixels
+
+For large or frequently changing images (e.g. album art), or if borders/rounding is desired, consider the `<image>` tag instead.
+
+Sprite images are atlassed, making them very efficient to render.
+
+Adding large sprites permanently increases the atlas size (and thus VRAM usage) for the session. (Atlas space can be re-used, but the atlas won't shrink back.)
 
 #### Parameters
 
@@ -180,6 +190,44 @@ _Internal (assets) image path_
 
 _wgui internal image path. Do not use directly unless it's related to the core wgui assets._
 
+## image widget
+
+### `<image>`
+
+### Image widget for large images
+
+Supported formats: svg, png, jpeg, gif, webp
+
+Maximum image size: Max texture size for the GPU (usually 8K+)
+
+For small images such as icons, consider using the `<sprite>` tag instead.
+
+`<image>` requires a single draw call per widget, while `<sprite>` widgets all share a single draw call per panel.
+
+#### Parameters
+
+`src`: **string**
+
+_External (filesystem) image path. Falls back to Internal (assets) if not found._
+
+`src_ext`: **string**
+
+_External (filesystem) image path_
+
+`src_builtin`: **string**
+
+_Internal (assets) image path_
+
+`src_internal`: **string**
+
+_wgui internal image path. Do not use directly unless it's related to the core wgui assets._
+
+`round`: **float** (default: 0) | **percent** (0-100%)
+
+`border`: **float**
+
+`border_color`: #FFAABB | #FFAABBCC
+
 ---
 
 # Components
diff --git a/wgui/src/drawing.rs b/wgui/src/drawing.rs
index 5d0c900..e439d8c 100644
--- a/wgui/src/drawing.rs
+++ b/wgui/src/drawing.rs
@@ -9,7 +9,10 @@ use crate::{
 	event::EventAlterables,
 	globals::Globals,
 	layout::Widget,
-	renderer_vk::text::{TextShadow, custom_glyph::CustomGlyph},
+	renderer_vk::text::{
+		custom_glyph::{CustomGlyph, CustomGlyphData},
+		TextShadow,
+	},
 	stack::{self, ScissorBoundary, ScissorStack, TransformStack},
 	widget::{self, ScrollbarInfo, WidgetState},
 };
@@ -175,6 +178,17 @@ pub struct Rectangle {
 	pub round_units: u8,
 }
 
+#[derive(Clone)]
+pub struct ImagePrimitive {
+	pub content: CustomGlyphData,
+	pub content_key: usize,
+
+	pub border: f32, // width in pixels
+	pub border_color: Color,
+
+	pub round_units: u8,
+}
+
 pub struct PrimitiveExtent {
 	pub(super) boundary: Boundary,
 	pub(super) transform: Mat4,
@@ -185,6 +199,7 @@ pub enum RenderPrimitive {
 	Rectangle(PrimitiveExtent, Rectangle),
 	Text(PrimitiveExtent, Rc<RefCell<Buffer>>, Option<TextShadow>),
 	Sprite(PrimitiveExtent, Option<CustomGlyph>), //option because we want as_slice
+	Image(PrimitiveExtent, ImagePrimitive),
 	ScissorSet(ScissorBoundary),
 }
 
diff --git a/wgui/src/parser/mod.rs b/wgui/src/parser/mod.rs
index 92fb89f..2d1220c 100644
--- a/wgui/src/parser/mod.rs
+++ b/wgui/src/parser/mod.rs
@@ -3,6 +3,7 @@ mod component_checkbox;
 mod component_slider;
 mod style;
 mod widget_div;
+mod widget_image;
 mod widget_label;
 mod widget_rectangle;
 mod widget_sprite;
@@ -15,8 +16,8 @@ use crate::{
 	layout::{Layout, LayoutParams, LayoutState, Widget, WidgetID, WidgetMap, WidgetPair},
 	parser::{
 		component_button::parse_component_button, component_checkbox::parse_component_checkbox,
-		component_slider::parse_component_slider, widget_div::parse_widget_div, widget_label::parse_widget_label,
-		widget_rectangle::parse_widget_rectangle, widget_sprite::parse_widget_sprite,
+		component_slider::parse_component_slider, widget_div::parse_widget_div, widget_image::parse_widget_image,
+		widget_label::parse_widget_label, widget_rectangle::parse_widget_rectangle, widget_sprite::parse_widget_sprite,
 	},
 	widget::ConstructEssentials,
 };
@@ -898,6 +899,9 @@ fn parse_child<'a>(
 		"sprite" => {
 			new_widget_id = Some(parse_widget_sprite(file, ctx, child_node, parent_id, &attribs)?);
 		}
+		"image" => {
+			new_widget_id = Some(parse_widget_image(file, ctx, child_node, parent_id, &attribs)?);
+		}
 		"Button" => {
 			new_widget_id = Some(parse_component_button(file, ctx, child_node, parent_id, &attribs)?);
 		}
diff --git a/wgui/src/parser/widget_image.rs b/wgui/src/parser/widget_image.rs
new file mode 100644
index 0000000..0b4b44a
--- /dev/null
+++ b/wgui/src/parser/widget_image.rs
@@ -0,0 +1,78 @@
+use crate::{
+	assets::AssetPath,
+	layout::WidgetID,
+	parser::{
+		parse_children, parse_widget_universal, print_invalid_attrib,
+		style::{parse_color, parse_round, parse_style},
+		AttribPair, ParserContext, ParserFile,
+	},
+	renderer_vk::text::custom_glyph::{CustomGlyphContent, CustomGlyphData},
+	widget::image::{WidgetImage, WidgetImageParams},
+};
+
+pub fn parse_widget_image<'a>(
+	file: &ParserFile,
+	ctx: &mut ParserContext,
+	node: roxmltree::Node<'a, 'a>,
+	parent_id: WidgetID,
+	attribs: &[AttribPair],
+) -> anyhow::Result<WidgetID> {
+	let mut params = WidgetImageParams::default();
+	let style = parse_style(attribs);
+	let mut glyph = None;
+
+	for pair in attribs {
+		let (key, value) = (pair.attrib.as_ref(), pair.value.as_ref());
+		match key {
+			"src" | "src_ext" | "src_builtin" | "src_internal" => {
+				let asset_path = match key {
+					"src" => AssetPath::FileOrBuiltIn(value),
+					"src_ext" => AssetPath::File(value),
+					"src_builtin" => AssetPath::BuiltIn(value),
+					"src_internal" => AssetPath::WguiInternal(value),
+					_ => unreachable!(),
+				};
+
+				if !value.is_empty() {
+					glyph = match CustomGlyphContent::from_assets(&mut ctx.layout.state.globals, asset_path) {
+						Ok(glyph) => Some(glyph),
+						Err(e) => {
+							log::warn!("failed to load {value}: {e}");
+							None
+						}
+					}
+				}
+			}
+			"round" => {
+				parse_round(
+					value,
+					&mut params.round,
+					ctx.doc_params.globals.get().defaults.rounding_mult,
+				);
+			}
+			"border" => {
+				params.border = value.parse().unwrap_or_else(|_| {
+					print_invalid_attrib(key, value);
+					0.0
+				});
+			}
+			"border_color" => {
+				parse_color(value, &mut params.border_color);
+			}
+			_ => {}
+		}
+	}
+
+	if let Some(glyph) = glyph {
+		params.glyph_data = Some(CustomGlyphData::new(glyph));
+	} else {
+		log::warn!("No source for image node!");
+	}
+
+	let (widget, _) = ctx.layout.add_child(parent_id, WidgetImage::create(params), style)?;
+
+	parse_widget_universal(ctx, &widget, attribs);
+	parse_children(file, ctx, node, widget.id)?;
+
+	Ok(widget.id)
+}
diff --git a/wgui/src/parser/widget_sprite.rs b/wgui/src/parser/widget_sprite.rs
index fc86f16..8c3735e 100644
--- a/wgui/src/parser/widget_sprite.rs
+++ b/wgui/src/parser/widget_sprite.rs
@@ -1,7 +1,7 @@
 use crate::{
 	assets::AssetPath,
 	layout::WidgetID,
-	parser::{AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, style::parse_style},
+	parser::{parse_children, parse_widget_universal, style::parse_style, AttribPair, ParserContext, ParserFile},
 	renderer_vk::text::custom_glyph::{CustomGlyphContent, CustomGlyphData},
 	widget::sprite::{WidgetSprite, WidgetSpriteParams},
 };
diff --git a/wgui/src/renderer_vk/context.rs b/wgui/src/renderer_vk/context.rs
index 3f3247b..895f06d 100644
--- a/wgui/src/renderer_vk/context.rs
+++ b/wgui/src/renderer_vk/context.rs
@@ -2,21 +2,22 @@ use std::{cell::RefCell, rc::Rc, sync::Arc};
 
 use cosmic_text::Buffer;
 use glam::{Mat4, Vec2, Vec3};
-use slotmap::{SlotMap, new_key_type};
+use slotmap::{new_key_type, SlotMap};
 use vulkano::pipeline::graphics::viewport;
 
 use crate::{
 	drawing::{self},
 	font_config,
-	gfx::{WGfx, cmd::GfxCommandBuffer},
+	gfx::{cmd::GfxCommandBuffer, WGfx},
+	renderer_vk::image::{ImagePipeline, ImageRenderer},
 };
 
 use super::{
 	rect::{RectPipeline, RectRenderer},
 	text::{
-		DEFAULT_METRICS, SWASH_CACHE, TextArea, TextBounds,
 		text_atlas::{TextAtlas, TextPipeline},
 		text_renderer::TextRenderer,
+		TextArea, TextBounds, DEFAULT_METRICS, SWASH_CACHE,
 	},
 	viewport::Viewport,
 };
@@ -26,6 +27,7 @@ struct RendererPass<'a> {
 	text_areas: Vec<TextArea<'a>>,
 	text_renderer: TextRenderer,
 	rect_renderer: RectRenderer,
+	image_renderer: ImageRenderer,
 	scissor: Option<drawing::Boundary>,
 	pixel_scale: f32,
 }
@@ -34,16 +36,19 @@ impl RendererPass<'_> {
 	fn new(
 		text_atlas: &mut TextAtlas,
 		rect_pipeline: RectPipeline,
+		image_pipeline: ImagePipeline,
 		scissor: Option<drawing::Boundary>,
 		pixel_scale: f32,
 	) -> anyhow::Result<Self> {
 		let text_renderer = TextRenderer::new(text_atlas)?;
 		let rect_renderer = RectRenderer::new(rect_pipeline)?;
+		let image_renderer = ImageRenderer::new(image_pipeline)?;
 
 		Ok(Self {
 			submitted: false,
 			text_renderer,
 			rect_renderer,
+			image_renderer,
 			text_areas: Vec::new(),
 			scissor,
 			pixel_scale,
@@ -90,6 +95,7 @@ impl RendererPass<'_> {
 
 		self.submitted = true;
 		self.rect_renderer.render(gfx, viewport, &vk_scissor, cmd_buf)?;
+		self.image_renderer.render(gfx, viewport, &vk_scissor, cmd_buf)?;
 
 		{
 			let mut font_system = font_system.system.lock();
@@ -119,18 +125,21 @@ pub struct SharedContext {
 	atlas_map: SlotMap<SharedContextKey, SharedAtlas>,
 	rect_pipeline: RectPipeline,
 	text_pipeline: TextPipeline,
+	image_pipeline: ImagePipeline,
 }
 
 impl SharedContext {
 	pub fn new(gfx: Arc<WGfx>) -> anyhow::Result<Self> {
 		let rect_pipeline = RectPipeline::new(gfx.clone(), gfx.surface_format)?;
 		let text_pipeline = TextPipeline::new(gfx.clone(), gfx.surface_format)?;
+		let image_pipeline = ImagePipeline::new(gfx.clone(), gfx.surface_format)?;
 
 		Ok(Self {
 			gfx,
 			atlas_map: SlotMap::with_key(),
 			rect_pipeline,
 			text_pipeline,
+			image_pipeline,
 		})
 	}
 
@@ -237,6 +246,7 @@ impl Context {
 				passes.push(RendererPass::new(
 					&mut atlas.text_atlas,
 					shared.rect_pipeline.clone(),
+					shared.image_pipeline.clone(),
 					next_scissor,
 					self.pixel_scale,
 				)?);
@@ -293,6 +303,11 @@ impl Context {
 						transform: extent.transform,
 					});
 				}
+				drawing::RenderPrimitive::Image(extent, image) => {
+					pass
+						.image_renderer
+						.add_image(extent.boundary, image.clone(), &extent.transform);
+				}
 				drawing::RenderPrimitive::ScissorSet(boundary) => {
 					next_scissor = Some(boundary.0);
 					needs_new_pass = true;
diff --git a/wgui/src/renderer_vk/image.rs b/wgui/src/renderer_vk/image.rs
new file mode 100644
index 0000000..9b8e0aa
--- /dev/null
+++ b/wgui/src/renderer_vk/image.rs
@@ -0,0 +1,244 @@
+use std::{collections::HashMap, sync::Arc};
+
+use cosmic_text::SubpixelBin;
+use glam::Mat4;
+use smallvec::smallvec;
+use vulkano::{
+	buffer::{BufferContents, BufferUsage, Subbuffer},
+	command_buffer::CommandBufferUsage,
+	format::Format,
+	image::view::ImageView,
+	pipeline::graphics::{self, vertex_input::Vertex},
+};
+
+use crate::{
+	drawing::{Boundary, ImagePrimitive},
+	gfx::{
+		cmd::GfxCommandBuffer,
+		pass::WGfxPass,
+		pipeline::{WGfxPipeline, WPipelineCreateInfo},
+		WGfx, BLEND_ALPHA,
+	},
+	renderer_vk::{
+		model_buffer::ModelBuffer,
+		text::custom_glyph::{CustomGlyphData, RasterizeCustomGlyphRequest, RasterizedCustomGlyph},
+	},
+};
+
+use super::viewport::Viewport;
+
+#[repr(C)]
+#[derive(BufferContents, Vertex, Copy, Clone, Debug)]
+pub struct ImageVertex {
+	#[format(R32_UINT)]
+	pub in_model_idx: u32,
+	#[format(R32_UINT)]
+	pub in_rect_dim: [u16; 2],
+	#[format(R32_UINT)]
+	pub in_border_color: u32,
+	#[format(R32_UINT)]
+	pub round_border: [u8; 4],
+}
+
+/// Cloneable pipeline & shaders to be shared between `RectRenderer` instances.
+#[derive(Clone)]
+pub struct ImagePipeline {
+	gfx: Arc<WGfx>,
+	pub(super) inner: Arc<WGfxPipeline<ImageVertex>>,
+}
+
+impl ImagePipeline {
+	pub fn new(gfx: Arc<WGfx>, format: Format) -> anyhow::Result<Self> {
+		let vert = vert_image::load(gfx.device.clone())?;
+		let frag = frag_image::load(gfx.device.clone())?;
+
+		let pipeline = gfx.create_pipeline::<ImageVertex>(
+			&vert,
+			&frag,
+			WPipelineCreateInfo::new(format)
+				.use_blend(BLEND_ALPHA)
+				.use_instanced()
+				.use_updatable_descriptors(smallvec![2]),
+		)?;
+
+		Ok(Self { gfx, inner: pipeline })
+	}
+}
+
+struct ImageVertexWithContent {
+	vert: ImageVertex,
+	content: CustomGlyphData,
+	content_key: usize, // identifies an image tag.
+}
+
+struct CachedPass {
+	content_id: usize,
+	vert_buffer: Subbuffer<[ImageVertex]>,
+	inner: WGfxPass<ImageVertex>,
+	res: [u32; 2],
+}
+
+pub struct ImageRenderer {
+	pipeline: ImagePipeline,
+	image_verts: Vec<ImageVertexWithContent>,
+	model_buffer: ModelBuffer,
+	cached_passes: HashMap<usize, CachedPass>,
+}
+
+impl ImageRenderer {
+	pub fn new(pipeline: ImagePipeline) -> anyhow::Result<Self> {
+		Ok(Self {
+			model_buffer: ModelBuffer::new(&pipeline.gfx)?,
+			pipeline,
+			image_verts: vec![],
+			cached_passes: HashMap::new(),
+		})
+	}
+
+	pub fn begin(&mut self) {
+		self.image_verts.clear();
+		self.model_buffer.begin();
+	}
+
+	pub fn add_image(&mut self, boundary: Boundary, image: ImagePrimitive, transform: &Mat4) {
+		let in_model_idx = self
+			.model_buffer
+			.register_pos_size(&boundary.pos, &boundary.size, transform);
+
+		self.image_verts.push(ImageVertexWithContent {
+			vert: ImageVertex {
+				in_model_idx,
+				in_rect_dim: [boundary.size.x as u16, boundary.size.y as u16],
+				in_border_color: cosmic_text::Color::from(image.border_color).0,
+				round_border: [
+					image.round_units,
+					(image.border) as u8,
+					0, // unused
+					0,
+				],
+			},
+			content: image.content,
+			content_key: image.content_key,
+		});
+	}
+
+	fn upload_image(
+		gfx: Arc<WGfx>,
+		res: [u32; 2],
+		img: &ImageVertexWithContent,
+	) -> anyhow::Result<Option<Arc<ImageView>>> {
+		let raster = match RasterizedCustomGlyph::try_from(&RasterizeCustomGlyphRequest {
+			data: img.content.clone(),
+			width: res[0] as _,
+			height: res[1] as _,
+			x_bin: SubpixelBin::Zero,
+			y_bin: SubpixelBin::Zero,
+			scale: 1.0, // unused
+		}) {
+			Some(x) => x,
+			None => {
+				log::error!("Unable to rasterize custom image");
+				return Ok(None);
+			}
+		};
+		let mut cmd_buf = gfx.create_xfer_command_buffer(CommandBufferUsage::OneTimeSubmit)?;
+
+		let image = cmd_buf.upload_image(
+			raster.width as _,
+			raster.height as _,
+			Format::R8G8B8A8_UNORM,
+			&raster.data,
+		)?;
+		let image_view = ImageView::new_default(image)?;
+
+		cmd_buf.build_and_execute_now()?;
+
+		Ok(Some(image_view))
+	}
+
+	pub fn render(
+		&mut self,
+		gfx: &Arc<WGfx>,
+		viewport: &mut Viewport,
+		vk_scissor: &graphics::viewport::Scissor,
+		cmd_buf: &mut GfxCommandBuffer,
+	) -> anyhow::Result<()> {
+		let res = viewport.resolution();
+		self.model_buffer.upload(gfx)?;
+
+		for img in self.image_verts.iter() {
+			let pass = match self.cached_passes.get_mut(&img.content_key) {
+				Some(x) => {
+					if x.content_id != img.content.id || x.res != res {
+						// image changed
+						let Some(image_view) = Self::upload_image(self.pipeline.gfx.clone(), res, img)? else {
+							continue;
+						};
+
+						x.inner
+							.update_sampler(2, image_view, self.pipeline.gfx.texture_filter)?;
+					}
+
+					x
+				}
+				None => {
+					let vert_buffer = self.pipeline.gfx.empty_buffer(
+						BufferUsage::VERTEX_BUFFER | BufferUsage::TRANSFER_DST,
+						(std::mem::size_of::<ImageVertex>()) as _,
+					)?;
+
+					let Some(image_view) = Self::upload_image(self.pipeline.gfx.clone(), res, img)? else {
+						continue;
+					};
+
+					let set0 = viewport.get_image_descriptor(&self.pipeline);
+					let set1 = self.model_buffer.get_image_descriptor(&self.pipeline);
+					let set2 = self
+						.pipeline
+						.inner
+						.uniform_sampler(2, image_view, self.pipeline.gfx.texture_filter)?;
+
+					let pass = self.pipeline.inner.create_pass(
+						[res[0] as _, res[1] as _],
+						vert_buffer.clone(),
+						0..4,
+						0..self.image_verts.len() as _,
+						vec![set0, set1, set2],
+						vk_scissor,
+					)?;
+
+					self.cached_passes.insert(
+						img.content_key,
+						CachedPass {
+							content_id: img.content.id,
+							vert_buffer,
+							inner: pass,
+							res,
+						},
+					);
+					self.cached_passes.get_mut(&img.content_key).unwrap()
+				}
+			};
+
+			pass.vert_buffer.write()?[0..1].clone_from_slice(&[img.vert]);
+
+			cmd_buf.run_ref(&pass.inner)?;
+		}
+
+		Ok(())
+	}
+}
+
+pub mod vert_image {
+	vulkano_shaders::shader! {
+			ty: "vertex",
+			path: "src/renderer_vk/shaders/image.vert",
+	}
+}
+
+pub mod frag_image {
+	vulkano_shaders::shader! {
+			ty: "fragment",
+			path: "src/renderer_vk/shaders/image.frag",
+	}
+}
diff --git a/wgui/src/renderer_vk/mod.rs b/wgui/src/renderer_vk/mod.rs
index d6f00a5..75b514d 100644
--- a/wgui/src/renderer_vk/mod.rs
+++ b/wgui/src/renderer_vk/mod.rs
@@ -1,4 +1,5 @@
 pub mod context;
+pub mod image;
 pub mod model_buffer;
 pub mod rect;
 pub mod text;
diff --git a/wgui/src/renderer_vk/model_buffer.rs b/wgui/src/renderer_vk/model_buffer.rs
index 1567ab6..931122d 100644
--- a/wgui/src/renderer_vk/model_buffer.rs
+++ b/wgui/src/renderer_vk/model_buffer.rs
@@ -8,7 +8,7 @@ use vulkano::{
 
 use crate::{
 	gfx,
-	renderer_vk::{rect::RectPipeline, text::text_atlas::TextPipeline},
+	renderer_vk::{image::ImagePipeline, rect::RectPipeline, text::text_atlas::TextPipeline},
 };
 
 pub struct ModelBuffer {
@@ -19,6 +19,8 @@ pub struct ModelBuffer {
 	buffer_capacity_f32: u32,
 
 	rect_descriptor: Option<Arc<DescriptorSet>>,
+	text_descriptor: Option<Arc<DescriptorSet>>,
+	image_descriptor: Option<Arc<DescriptorSet>>,
 }
 
 impl ModelBuffer {
@@ -40,6 +42,8 @@ impl ModelBuffer {
 			buffer,
 			buffer_capacity_f32: INITIAL_CAPACITY_F32,
 			rect_descriptor: None,
+			text_descriptor: None,
+			image_descriptor: None,
 		})
 	}
 
@@ -109,8 +113,15 @@ impl ModelBuffer {
 
 	pub fn get_text_descriptor(&mut self, pipeline: &TextPipeline) -> Arc<DescriptorSet> {
 		self
-			.rect_descriptor
+			.text_descriptor
 			.get_or_insert_with(|| pipeline.inner.buffer(3, self.buffer.clone()).unwrap())
 			.clone()
 	}
+
+	pub fn get_image_descriptor(&mut self, pipeline: &ImagePipeline) -> Arc<DescriptorSet> {
+		self
+			.image_descriptor
+			.get_or_insert_with(|| pipeline.inner.buffer(1, self.buffer.clone()).unwrap())
+			.clone()
+	}
 }
diff --git a/wgui/src/renderer_vk/rect.rs b/wgui/src/renderer_vk/rect.rs
index 54eb908..b1e52e7 100644
--- a/wgui/src/renderer_vk/rect.rs
+++ b/wgui/src/renderer_vk/rect.rs
@@ -10,10 +10,10 @@ use vulkano::{
 use crate::{
 	drawing::{Boundary, Rectangle},
 	gfx::{
-		BLEND_ALPHA, WGfx,
 		cmd::GfxCommandBuffer,
 		pass::WGfxPass,
 		pipeline::{WGfxPipeline, WPipelineCreateInfo},
+		WGfx, BLEND_ALPHA,
 	},
 	renderer_vk::model_buffer::ModelBuffer,
 };
diff --git a/wgui/src/renderer_vk/shaders/image.frag b/wgui/src/renderer_vk/shaders/image.frag
new file mode 100644
index 0000000..02767d4
--- /dev/null
+++ b/wgui/src/renderer_vk/shaders/image.frag
@@ -0,0 +1,55 @@
+
+#version 450
+#extension GL_GOOGLE_include_directive : enable
+
+precision highp float;
+
+layout(location = 0) in vec2 in_uv;
+layout(location = 1) in vec4 in_border_color;
+layout(location = 2) in float in_border_size; // in units
+layout(location = 3) in float in_radius;      // in units
+layout(location = 4) in vec2 in_rect_size;
+layout(location = 0) out vec4 out_color;
+
+#define UNIFORM_PARAMS_SET 0
+#include "uniform.glsl"
+
+layout(set = 2, binding = 0) uniform sampler2D image;
+
+void main() {
+  float rect_aspect = in_rect_size.x / in_rect_size.y;
+
+  vec2 center = in_rect_size / 2.0;
+  vec2 coords = in_uv * in_rect_size;
+
+
+  float radius = in_radius;
+
+  vec2 sdf_rect_dim = center - vec2(radius);
+  float sdf = length(max(abs(coords - center), sdf_rect_dim) - sdf_rect_dim) -
+              in_radius;
+
+  vec4 color = texture(image, in_uv);
+
+  float pixel_size = 1.0 / uniforms.pixel_scale;
+
+  if (in_border_size < in_radius) {
+    // rounded border
+    float f = in_border_size > 0.0 ? smoothstep(in_border_size + pixel_size,
+                                                in_border_size, -sdf) *
+                                         in_border_color.a
+                                   : 0.0;
+    out_color = mix(color, in_border_color, f);
+  } else {
+    // square border
+    vec2 a = abs(coords - center);
+    float aa = center.x - in_border_size;
+    float bb = center.y - in_border_size;
+    out_color = (a.x > aa || a.y > bb) ? in_border_color : color;
+  }
+
+  if (in_radius > 0.0) {
+    // rounding cutout alpha
+    out_color.a *= 1.0 - smoothstep(-pixel_size, 0.0, sdf);
+  }
+}
diff --git a/wgui/src/renderer_vk/shaders/image.vert b/wgui/src/renderer_vk/shaders/image.vert
new file mode 100644
index 0000000..2208dc1
--- /dev/null
+++ b/wgui/src/renderer_vk/shaders/image.vert
@@ -0,0 +1,52 @@
+#version 450
+#extension GL_GOOGLE_include_directive : enable
+
+precision highp float;
+
+layout(location = 0) in uint in_model_idx;
+layout(location = 1) in uint in_rect_dim;
+layout(location = 2) in uint in_border_color;
+layout(location = 3) in uint round_border;
+
+layout(location = 0) out vec2 out_uv;
+layout(location = 1) out vec4 out_border_color;
+layout(location = 2) out float out_border_size;
+layout(location = 3) out float out_radius;
+layout(location = 4) out vec2 out_rect_size;
+
+#define UNIFORM_PARAMS_SET 0
+#define MODEL_BUFFER_SET 1
+
+#include "model_buffer.glsl"
+#include "uniform.glsl"
+
+void main() {
+  uint v = uint(gl_VertexIndex); // 0-3
+  uint rect_width = in_rect_dim & 0xffffu;
+  uint rect_height = (in_rect_dim & 0xffff0000u) >> 16u;
+  vec2 rect_size = vec2(float(rect_width), float(rect_height));
+  float rect_aspect = rect_size.x / rect_size.y;
+
+  // 0.0 - 1.0 normalized
+  uvec2 corner_pos_u = uvec2(v & 1u, (v >> 1u) & 1u);
+  vec2 corner_pos = vec2(corner_pos_u);
+  out_uv = corner_pos;
+
+  mat4 model_matrix = model_buffer.models[in_model_idx];
+
+  out_rect_size = rect_size;
+
+  gl_Position = uniforms.projection * model_matrix * vec4(corner_pos, 0.0, 1.0);
+
+  out_border_color =
+      vec4(float((in_border_color & 0x00ff0000u) >> 16u) / 255.0,
+           float((in_border_color & 0x0000ff00u) >> 8u) / 255.0,
+           float(in_border_color & 0x000000ffu) / 255.0,
+           float((in_border_color & 0xff000000u) >> 24u) / 255.0);
+
+  float radius = float(round_border & 0xffu);
+  out_radius = radius;
+
+  float border_size = float((round_border & 0xff00u) >> 8);
+  out_border_size = border_size;
+}
diff --git a/wgui/src/renderer_vk/text/custom_glyph.rs b/wgui/src/renderer_vk/text/custom_glyph.rs
index ed4fd57..66ac8f7 100644
--- a/wgui/src/renderer_vk/text/custom_glyph.rs
+++ b/wgui/src/renderer_vk/text/custom_glyph.rs
@@ -53,8 +53,8 @@ impl CustomGlyphContent {
 /// Clone and reuse this to avoid atlasing the same content twice.
 #[derive(Debug, Clone)]
 pub struct CustomGlyphData {
-	pub(super) id: usize,
-	pub(super) content: Arc<CustomGlyphContent>,
+	pub(crate) id: usize,
+	pub(crate) content: Arc<CustomGlyphContent>,
 }
 
 impl CustomGlyphData {
@@ -157,7 +157,7 @@ pub struct RasterizedCustomGlyph {
 }
 
 impl RasterizedCustomGlyph {
-	pub(super) fn try_from(input: &RasterizeCustomGlyphRequest) -> Option<Self> {
+	pub(crate) fn try_from(input: &RasterizeCustomGlyphRequest) -> Option<Self> {
 		match input.data.content.as_ref() {
 			CustomGlyphContent::Svg(tree) => rasterize_svg(tree, input),
 			CustomGlyphContent::Image(data) => Some(rasterize_image(data)),
diff --git a/wgui/src/renderer_vk/viewport.rs b/wgui/src/renderer_vk/viewport.rs
index 05b8c35..ee6b0b4 100644
--- a/wgui/src/renderer_vk/viewport.rs
+++ b/wgui/src/renderer_vk/viewport.rs
@@ -5,7 +5,10 @@ use vulkano::{
 	descriptor_set::DescriptorSet,
 };
 
-use crate::{gfx::WGfx, renderer_vk::util::WMat4};
+use crate::{
+	gfx::WGfx,
+	renderer_vk::{image::ImagePipeline, util::WMat4},
+};
 
 use super::{rect::RectPipeline, text::text_atlas::TextPipeline};
 
@@ -16,6 +19,7 @@ pub struct Viewport {
 	params_buffer: Subbuffer<[Params]>,
 	text_descriptor: Option<Arc<DescriptorSet>>,
 	rect_descriptor: Option<Arc<DescriptorSet>>,
+	image_descriptor: Option<Arc<DescriptorSet>>,
 }
 
 impl Viewport {
@@ -36,6 +40,7 @@ impl Viewport {
 			params_buffer,
 			text_descriptor: None,
 			rect_descriptor: None,
+			image_descriptor: None,
 		})
 	}
 
@@ -57,6 +62,15 @@ impl Viewport {
 			.clone()
 	}
 
+	pub fn get_image_descriptor(&mut self, pipeline: &ImagePipeline) -> Arc<DescriptorSet> {
+		self
+			.image_descriptor
+			.get_or_insert_with(|| {
+				pipeline.inner.buffer(0, self.params_buffer.clone()).unwrap() // safe unwrap
+			})
+			.clone()
+	}
+
 	/// Updates the `Viewport` with the given `resolution` and `projection`.
 	pub fn update(&mut self, resolution: [u32; 2], projection: &glam::Mat4, pixel_scale: f32) -> anyhow::Result<()> {
 		if self.params.screen_resolution == resolution
diff --git a/wgui/src/widget/image.rs b/wgui/src/widget/image.rs
new file mode 100644
index 0000000..f02aaeb
--- /dev/null
+++ b/wgui/src/widget/image.rs
@@ -0,0 +1,113 @@
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+use slotmap::Key;
+
+use crate::{
+	drawing::{self, ImagePrimitive, PrimitiveExtent},
+	event::CallbackDataCommon,
+	globals::Globals,
+	layout::WidgetID,
+	renderer_vk::text::custom_glyph::CustomGlyphData,
+	widget::{util::WLength, WidgetStateFlags},
+};
+
+use super::{WidgetObj, WidgetState};
+
+static AUTO_INCREMENT: AtomicUsize = AtomicUsize::new(0);
+
+#[derive(Debug, Default)]
+pub struct WidgetImageParams {
+	pub glyph_data: Option<CustomGlyphData>,
+
+	pub border: f32,
+	pub border_color: drawing::Color,
+
+	pub round: WLength,
+}
+
+#[derive(Debug, Default)]
+pub struct WidgetImage {
+	params: WidgetImageParams,
+	id: WidgetID,
+	content_key: usize,
+}
+
+impl WidgetImage {
+	pub fn create(params: WidgetImageParams) -> WidgetState {
+		WidgetState::new(
+			WidgetStateFlags::default(),
+			Box::new(Self {
+				params,
+				id: WidgetID::null(),
+				content_key: AUTO_INCREMENT.fetch_add(1, Ordering::Relaxed),
+			}),
+		)
+	}
+
+	pub fn set_content(&mut self, common: &mut CallbackDataCommon, content: Option<CustomGlyphData>) {
+		if self.params.glyph_data == content {
+			return;
+		}
+
+		self.params.glyph_data = content;
+		common.mark_widget_dirty(self.id);
+	}
+
+	pub fn get_content(&self) -> Option<CustomGlyphData> {
+		self.params.glyph_data.clone()
+	}
+}
+
+impl WidgetObj for WidgetImage {
+	fn draw(&mut self, state: &mut super::DrawState, _params: &super::DrawParams) {
+		let boundary = drawing::Boundary::construct_relative(state.transform_stack);
+
+		let Some(content) = self.params.glyph_data.clone() else {
+			return;
+		};
+
+		let round_units = match self.params.round {
+			WLength::Units(units) => units as u8,
+			WLength::Percent(percent) => (f32::min(boundary.size.x, boundary.size.y) * percent / 2.0) as u8,
+		};
+
+		state.primitives.push(drawing::RenderPrimitive::Image(
+			PrimitiveExtent {
+				boundary,
+				transform: state.transform_stack.get().transform,
+			},
+			ImagePrimitive {
+				content,
+				content_key: self.content_key,
+				border: self.params.border,
+				border_color: self.params.border_color,
+				round_units,
+			},
+		));
+	}
+
+	fn measure(
+		&mut self,
+		_globals: &Globals,
+		_known_dimensions: taffy::Size<Option<f32>>,
+		_available_space: taffy::Size<taffy::AvailableSpace>,
+	) -> taffy::Size<f32> {
+		taffy::Size::ZERO
+	}
+
+	fn get_id(&self) -> WidgetID {
+		self.id
+	}
+
+	fn set_id(&mut self, id: WidgetID) {
+		self.id = id;
+	}
+
+	fn get_type(&self) -> super::WidgetType {
+		super::WidgetType::Sprite
+	}
+
+	fn debug_print(&self) -> String {
+		String::default()
+	}
+}
diff --git a/wgui/src/widget/mod.rs b/wgui/src/widget/mod.rs
index f0712a4..912436d 100644
--- a/wgui/src/widget/mod.rs
+++ b/wgui/src/widget/mod.rs
@@ -17,6 +17,7 @@ use crate::{
 };
 
 pub mod div;
+pub mod image;
 pub mod label;
 pub mod rectangle;
 pub mod sprite;
diff --git a/wgui/src/widget/sprite.rs b/wgui/src/widget/sprite.rs
index f64f947..50e9c81 100644
--- a/wgui/src/widget/sprite.rs
+++ b/wgui/src/widget/sprite.rs
@@ -50,6 +50,10 @@ impl WidgetSprite {
 	}
 
 	pub fn set_content(&mut self, common: &mut CallbackDataCommon, content: Option<CustomGlyphData>) {
+		if self.params.glyph_data == content {
+			return;
+		}
+
 		self.params.glyph_data = content;
 		common.mark_widget_dirty(self.id);
 	}
diff --git a/wlx-overlay-s/src/overlays/custom.rs b/wlx-overlay-s/src/overlays/custom.rs
index 3637fe4..9626c72 100644
--- a/wlx-overlay-s/src/overlays/custom.rs
+++ b/wlx-overlay-s/src/overlays/custom.rs
@@ -9,7 +9,9 @@ use wgui::{
     parser::{Fetchable, parse_color_hex},
     renderer_vk::text::custom_glyph::{CustomGlyphContent, CustomGlyphData},
     taffy,
-    widget::{label::WidgetLabel, rectangle::WidgetRectangle, sprite::WidgetSprite},
+    widget::{
+        image::WidgetImage, label::WidgetLabel, rectangle::WidgetRectangle, sprite::WidgetSprite,
+    },
 };
 use wlx_common::windowing::OverlayWindowState;
 
@@ -111,23 +113,26 @@ fn apply_custom_command(
             }
         }
         ModifyPanelCommand::SetSprite(path) => {
-            let mut widget = panel
+            if let Ok(pair) = panel
                 .parser_state
-                .fetch_widget_as::<WidgetSprite>(&panel.layout.state, element)
-                .context("No <sprite> with such id.")?;
-
-            if path == "none" {
-                widget.set_content(&mut com, None);
-            } else {
+                .fetch_widget(&panel.layout.state, element)
+            {
                 let content = CustomGlyphContent::from_assets(
                     &mut app.wgui_globals,
                     wgui::assets::AssetPath::File(&path),
                 )
                 .context("Could not load content from supplied path.")?;
-
                 let data = CustomGlyphData::new(content);
 
-                widget.set_content(&mut com, Some(data));
+                if let Some(mut sprite) = pair.widget.get_as_mut::<WidgetSprite>() {
+                    sprite.set_content(&mut com, Some(data));
+                } else if let Some(mut image) = pair.widget.get_as_mut::<WidgetImage>() {
+                    image.set_content(&mut com, Some(data));
+                } else {
+                    anyhow::bail!("No <sprite> or <image> with such id.");
+                }
+            } else {
+                anyhow::bail!("No <sprite> or <image> with such id.");
             }
         }
         ModifyPanelCommand::SetColor(color) => {

From fcacc182de4b3417b8ca0f7e978f5008832d0ad9 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Wed, 24 Dec 2025 00:26:49 +0900
Subject: [PATCH 25/29] run wayvr at start by default

---
 wlx-overlay-s/src/config_wayvr.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wlx-overlay-s/src/config_wayvr.rs b/wlx-overlay-s/src/config_wayvr.rs
index 3634091..c75cf0c 100644
--- a/wlx-overlay-s/src/config_wayvr.rs
+++ b/wlx-overlay-s/src/config_wayvr.rs
@@ -135,7 +135,7 @@ pub struct WayVRDashboard {
 
 #[derive(Deserialize, Serialize)]
 pub struct WayVRConfig {
-    #[serde(default = "def_false")]
+    #[serde(default = "def_true")]
     pub run_compositor_at_start: bool,
 
     #[serde(default = "Default::default")]

From 6672fb71e4bbe6132f9a86c4f0631e3e13f0340f Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Wed, 24 Dec 2025 00:55:10 +0900
Subject: [PATCH 26/29] =?UTF-8?q?SetSprite=20=E2=86=92=20SetImage,=20remov?=
 =?UTF-8?q?e=20fifo=20&=20shell=20label?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wayvr-ipc/src/packet_client.rs                |   2 +-
 wayvrctl/src/main.rs                          |   6 +-
 wlx-overlay-s/src/backend/task.rs             |   2 +-
 wlx-overlay-s/src/backend/wayvr/server_ipc.rs |   4 +-
 wlx-overlay-s/src/gui/README.md               |  41 +----
 wlx-overlay-s/src/gui/panel/button.rs         |  35 ++--
 wlx-overlay-s/src/gui/panel/helper.rs         | 118 ------------
 wlx-overlay-s/src/gui/panel/label.rs          | 172 +-----------------
 wlx-overlay-s/src/overlays/custom.rs          |   2 +-
 9 files changed, 27 insertions(+), 355 deletions(-)
 delete mode 100644 wlx-overlay-s/src/gui/panel/helper.rs

diff --git a/wayvr-ipc/src/packet_client.rs b/wayvr-ipc/src/packet_client.rs
index 0ed09ed..83d7e91 100644
--- a/wayvr-ipc/src/packet_client.rs
+++ b/wayvr-ipc/src/packet_client.rs
@@ -52,7 +52,7 @@ pub struct WlxHapticsParams {
 pub enum WlxModifyPanelCommand {
 	SetText(String),
 	SetColor(String),
-	SetSprite(String),
+	SetImage(String),
 	SetVisible(bool),
 	SetStickyState(bool),
 }
diff --git a/wayvrctl/src/main.rs b/wayvrctl/src/main.rs
index 7ecf454..cab0e56 100644
--- a/wayvrctl/src/main.rs
+++ b/wayvrctl/src/main.rs
@@ -132,7 +132,7 @@ async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()
             let command = match command {
                 SubcommandPanelModify::SetText { text } => packet_client::WlxModifyPanelCommand::SetText(text),
                 SubcommandPanelModify::SetColor { hex_color } => packet_client::WlxModifyPanelCommand::SetColor(hex_color),
-                SubcommandPanelModify::SetSprite { absolute_path } => packet_client::WlxModifyPanelCommand::SetSprite(absolute_path),
+                SubcommandPanelModify::SetImage { absolute_path } => packet_client::WlxModifyPanelCommand::SetImage(absolute_path),
                 SubcommandPanelModify::SetVisible { visible_0_or_1 } => packet_client::WlxModifyPanelCommand::SetVisible(visible_0_or_1 != 0),
                 SubcommandPanelModify::SetStickyState { sticky_state_0_or_1 } => packet_client::WlxModifyPanelCommand::SetStickyState(sticky_state_0_or_1 != 0),
             };
@@ -266,11 +266,11 @@ enum SubcommandPanelModify {
         hex_color: String,
     },
     /// Set the content of a <sprite> or <image>. Max size for <sprite> is 256x256.
-    SetSprite {
+    SetImage {
         /// Absolute path to a svg, gif, png, jpeg or webp image.
         absolute_path: String,
     },
-    /// Set the visibility of a <div>, <rectangle>, <label> or <sprite>
+    /// Set the visibility of a <div>, <rectangle>, <label>, <sprite> or <image>
     SetVisible {
         visible_0_or_1: u8,
     },
diff --git a/wlx-overlay-s/src/backend/task.rs b/wlx-overlay-s/src/backend/task.rs
index 37cf321..cd228b9 100644
--- a/wlx-overlay-s/src/backend/task.rs
+++ b/wlx-overlay-s/src/backend/task.rs
@@ -58,7 +58,7 @@ pub enum PlayspaceTask {
 pub enum ModifyPanelCommand {
     SetText(String),
     SetColor(String),
-    SetSprite(String),
+    SetImage(String),
     SetVisible(bool),
     SetStickyState(bool),
 }
diff --git a/wlx-overlay-s/src/backend/wayvr/server_ipc.rs b/wlx-overlay-s/src/backend/wayvr/server_ipc.rs
index bd17b20..ed320d5 100644
--- a/wlx-overlay-s/src/backend/wayvr/server_ipc.rs
+++ b/wlx-overlay-s/src/backend/wayvr/server_ipc.rs
@@ -495,8 +495,8 @@ impl Connection {
                     packet_client::WlxModifyPanelCommand::SetText(text) => {
                         ModifyPanelCommand::SetText(text)
                     }
-                    packet_client::WlxModifyPanelCommand::SetSprite(sprite) => {
-                        ModifyPanelCommand::SetSprite(sprite)
+                    packet_client::WlxModifyPanelCommand::SetImage(sprite) => {
+                        ModifyPanelCommand::SetImage(sprite)
                     }
                     packet_client::WlxModifyPanelCommand::SetStickyState(sticky) => {
                         ModifyPanelCommand::SetStickyState(sticky)
diff --git a/wlx-overlay-s/src/gui/README.md b/wlx-overlay-s/src/gui/README.md
index 23bb465..d7b0cda 100644
--- a/wlx-overlay-s/src/gui/README.md
+++ b/wlx-overlay-s/src/gui/README.md
@@ -1,5 +1,9 @@
 # Custom UI Elements
 
+Elements on custom panels may be modified at runtime using `wayvrctl`.
+
+For more, refer to: `wayvrctl panel-modify --help`
+
 ### Labels
 
 #### Clock label
@@ -14,43 +18,6 @@ See the Custom Timezones section for more info on timezones. Skip `_timezone` to
 <label _source="clock" _display="time" _timezone="0" [...] />
 ```
 
-#### Fifo label
-
-Fifo label creates a fifo on your system that other programs can pipe output into.
-
-- The label will look for the last complete line to use as its text.
-- If the pipe breaks due to an IO error, re-creation is attempted after 15 seconds.
-- `_path` supports environment variables, but not `~`!
-
-```xml
-<label _source="fifo" _path="$XDG_RUNTIME_DIR/my-test-label" [...] />
-```
-
-Example script to test with:
-```bash
-for i in {0..99}; do echo "i is $i" > $XDG_RUNTIME_DIR/my-test-label; sleep 1; done
-```
-
-#### Shell Exec label
-
-This label executes a shell script using the `sh` shell.
-
-- Write lines to the script's stdout to update the label text.
-- The label will look for the last complete line to use as its text.
-- Long-running scripts are allowed, but the label is only updated while the HMD is active.
-- If the script exits successfully (code 0), it will be re-ran on the next frame. Otherwise, it will be re-ran in 15s.
-- Control the pacing from inside the script itself. For example, adding a sleep 5 will make the script execute at most once per 5 seconds.
-- `_exec` supports everything that `sh` supports!
-
-```xml
-<label _source="shell" _exec="$HOME/.local/bin/my-test-script.sh" [...] />
-```
-
-```bash
-#!/usr/bin/bash
-echo "This is my script's output!"
-```
-
 #### Battery label
 
 This is a label type that's used internally to display battery states.
diff --git a/wlx-overlay-s/src/gui/panel/button.rs b/wlx-overlay-s/src/gui/panel/button.rs
index 578b902..cdfd292 100644
--- a/wlx-overlay-s/src/gui/panel/button.rs
+++ b/wlx-overlay-s/src/gui/panel/button.rs
@@ -1,6 +1,6 @@
 use std::{
     cell::RefCell,
-    process::{Command, Stdio},
+    process::{Child, Command, Stdio},
     rc::Rc,
     str::FromStr,
     sync::{Arc, atomic::Ordering},
@@ -359,15 +359,13 @@ pub(super) fn setup_custom_button<S: 'static>(
                     carry_over: RefCell::new(None),
                 });
 
-                let piped = attribs.get_value("_update_label").is_some_and(|s| s == "1");
-
                 layout.add_event_listener::<AppState, S>(
                     attribs.widget_id,
                     EventListenerKind::InternalStateChange,
                     Box::new({
                         let state = state.clone();
-                        move |common, _data, _, _| {
-                            shell_on_tick(&state, common, piped);
+                        move |_, _, _, _| {
+                            shell_on_tick(&state);
                             Ok(EventResult::Pass)
                         }
                     }),
@@ -429,8 +427,7 @@ pub(super) fn setup_custom_button<S: 'static>(
 
 #[derive(Default)]
 struct ShellButtonMutableState {
-    reader: Option<PipeReaderThread>,
-    pid: Option<u32>,
+    child: Option<Child>,
 }
 
 struct ShellButtonState {
@@ -443,17 +440,18 @@ struct ShellButtonState {
 fn shell_on_action(state: &ShellButtonState) -> anyhow::Result<()> {
     let mut mut_state = state.mut_state.borrow_mut();
 
-    if mut_state.reader.as_ref().is_some_and(|r| !r.is_finished())
-        && let Some(pid) = mut_state.pid.as_ref()
+    if let Some(child) = mut_state.child.as_mut()
+        && let Ok(None) = child.try_wait()
     {
         log::info!("ShellExec triggered while child is still running; sending SIGUSR1");
         let _ = Command::new("kill")
             .arg("-s")
             .arg("USR1")
-            .arg(pid.to_string())
+            .arg(child.id().to_string())
             .spawn()
             .unwrap()
             .wait();
+
         return Ok(());
     }
 
@@ -464,26 +462,19 @@ fn shell_on_action(state: &ShellButtonState) -> anyhow::Result<()> {
         .spawn()
         .with_context(|| format!("Failed to run shell script: '{}'", &state.exec))?;
 
-    mut_state.pid = Some(child.id());
-    mut_state.reader = Some(PipeReaderThread::new_from_child(child));
+    mut_state.child = Some(child);
 
     Ok(())
 }
 
-fn shell_on_tick(state: &ShellButtonState, common: &mut event::CallbackDataCommon, piped: bool) {
+fn shell_on_tick(state: &ShellButtonState) {
     let mut mut_state = state.mut_state.borrow_mut();
 
-    let Some(reader) = mut_state.reader.as_mut() else {
+    let Some(child) = mut_state.child.as_mut() else {
         return;
     };
 
-    if piped && let Some(text) = reader.get_last_line() {
-        state
-            .button
-            .set_text(common, Translation::from_raw_text(&text));
-    }
-
-    if reader.is_finished() {
-        mut_state.reader = None;
+    if let Ok(Some(_)) = child.try_wait() {
+        mut_state.child = None;
     }
 }
diff --git a/wlx-overlay-s/src/gui/panel/helper.rs b/wlx-overlay-s/src/gui/panel/helper.rs
deleted file mode 100644
index a9c85fe..0000000
--- a/wlx-overlay-s/src/gui/panel/helper.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use regex::Regex;
-use std::{
-    fs,
-    io::{BufRead, BufReader},
-    process::Child,
-    sync::{
-        Arc, LazyLock,
-        mpsc::{self, Receiver},
-    },
-    thread::JoinHandle,
-};
-
-static ENV_VAR_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-    Regex::new(r"\$\{([A-Z_][A-Z0-9_]*)}|\$([A-Z_][A-Z0-9_]*)").unwrap() // want panic
-});
-
-pub(super) fn expand_env_vars(template: &str) -> String {
-    ENV_VAR_REGEX
-        .replace_all(template, |caps: &regex::Captures| {
-            let var_name = caps.get(1).or_else(|| caps.get(2)).unwrap().as_str();
-            std::env::var(var_name)
-                .inspect_err(|e| log::warn!("Unable to substitute env var {var_name}: {e:?}"))
-                .unwrap_or_default()
-        })
-        .into_owned()
-}
-
-pub(super) struct PipeReaderThread {
-    receiver: Receiver<String>,
-    handle: JoinHandle<bool>,
-}
-
-impl PipeReaderThread {
-    pub fn new_from_child(mut c: Child) -> Self {
-        const BUF_LEN: usize = 128;
-        let (sender, receiver) = mpsc::sync_channel::<String>(4);
-
-        let handle = std::thread::spawn({
-            move || {
-                let stdout = c.stdout.take().unwrap();
-                let mut reader = BufReader::new(stdout);
-
-                loop {
-                    let mut buf = String::with_capacity(BUF_LEN);
-                    match reader.read_line(&mut buf) {
-                        Ok(0) => {
-                            // EOF reached
-                            break;
-                        }
-                        Ok(_) => {
-                            let _ = sender.try_send(buf);
-                        }
-                        Err(e) => {
-                            log::error!("Error reading pipe: {e:?}");
-                            break;
-                        }
-                    }
-                }
-                c.wait()
-                    .inspect_err(|e| log::error!("Failed to wait for child process: {e:?}"))
-                    .is_ok_and(|c| c.success())
-            }
-        });
-
-        Self { receiver, handle }
-    }
-
-    pub fn new_from_fifo(path: Arc<str>) -> Self {
-        const BUF_LEN: usize = 128;
-        let (sender, receiver) = mpsc::sync_channel::<String>(4);
-
-        let handle = std::thread::spawn({
-            move || {
-                let Ok(mut reader) = fs::File::open(&*path)
-                    .inspect_err(|e| {
-                        log::warn!("Failed to open fifo: {e:?}");
-                    })
-                    .map(|r| BufReader::new(r))
-                else {
-                    return false;
-                };
-
-                loop {
-                    let mut buf = String::with_capacity(BUF_LEN);
-                    match reader.read_line(&mut buf) {
-                        Ok(0) => {
-                            // EOF reached
-                            break;
-                        }
-                        Ok(_) => {
-                            let _ = sender.try_send(buf);
-                        }
-                        Err(e) => {
-                            log::error!("Error reading fifo: {e:?}");
-                            break;
-                        }
-                    }
-                }
-
-                true
-            }
-        });
-
-        Self { receiver, handle }
-    }
-
-    pub fn get_last_line(&mut self) -> Option<String> {
-        self.receiver.try_iter().last()
-    }
-
-    pub fn is_finished(&self) -> bool {
-        self.handle.is_finished()
-    }
-
-    pub fn check_success(self) -> bool {
-        self.handle.join().unwrap_or(false)
-    }
-}
diff --git a/wlx-overlay-s/src/gui/panel/label.rs b/wlx-overlay-s/src/gui/panel/label.rs
index e2c8a58..ea4b688 100644
--- a/wlx-overlay-s/src/gui/panel/label.rs
+++ b/wlx-overlay-s/src/gui/panel/label.rs
@@ -1,17 +1,7 @@
-use std::{
-    cell::RefCell,
-    fs,
-    os::unix::fs::FileTypeExt,
-    process::{Command, Stdio},
-    rc::Rc,
-    sync::Arc,
-    time::{Duration, Instant},
-};
+use std::rc::Rc;
 
-use anyhow::Context;
 use chrono::Local;
 use chrono_tz::Tz;
-use interprocess::os::unix::fifo_file::create_fifo;
 use wgui::{
     drawing,
     event::{self, EventCallback},
@@ -21,9 +11,7 @@ use wgui::{
     widget::{EventResult, label::WidgetLabel},
 };
 
-use crate::{gui::panel::helper::PipeReaderThread, state::AppState};
-
-use super::helper::expand_env_vars;
+use crate::state::AppState;
 
 #[allow(clippy::too_many_lines)]
 pub(super) fn setup_custom_label<S: 'static>(
@@ -37,42 +25,6 @@ pub(super) fn setup_custom_label<S: 'static>(
     };
 
     let callback: EventCallback<AppState, S> = match source {
-        "shell" => {
-            let Some(exec) = attribs.get_value("_exec") else {
-                log::warn!("label with shell source but no exec attribute!");
-                return;
-            };
-            let state = ShellLabelState {
-                exec: exec.to_string(),
-                mut_state: RefCell::new(PipeLabelMutableState {
-                    reader: None,
-                    next_try: Instant::now(),
-                }),
-                carry_over: RefCell::new(None),
-            };
-            Box::new(move |common, data, _, _| {
-                let _ = shell_on_tick(&state, common, data).inspect_err(|e| log::error!("{e:?}"));
-                Ok(EventResult::Pass)
-            })
-        }
-        "fifo" => {
-            let Some(path) = attribs.get_value("_path") else {
-                log::warn!("label with fifo source but no path attribute!");
-                return;
-            };
-            let state = FifoLabelState {
-                path: expand_env_vars(path).into(),
-                carry_over: RefCell::new(None),
-                mut_state: RefCell::new(PipeLabelMutableState {
-                    reader: None,
-                    next_try: Instant::now(),
-                }),
-            };
-            Box::new(move |common, data, _, _| {
-                fifo_on_tick(&state, common, data);
-                Ok(EventResult::Pass)
-            })
-        }
         "battery" => {
             let Some(device) = attribs
                 .get_value("_device")
@@ -186,126 +138,6 @@ pub(super) fn setup_custom_label<S: 'static>(
     );
 }
 
-struct PipeLabelMutableState {
-    reader: Option<PipeReaderThread>,
-    next_try: Instant,
-}
-
-struct ShellLabelState {
-    exec: String,
-    mut_state: RefCell<PipeLabelMutableState>,
-    carry_over: RefCell<Option<String>>,
-}
-
-fn shell_on_tick(
-    state: &ShellLabelState,
-    common: &mut event::CallbackDataCommon,
-    data: &mut event::CallbackData,
-) -> anyhow::Result<()> {
-    let mut mut_state = state.mut_state.borrow_mut();
-
-    if let Some(reader) = mut_state.reader.as_mut() {
-        if let Some(text) = reader.get_last_line() {
-            let label = data.obj.get_as_mut::<WidgetLabel>().unwrap();
-            label.set_text(common, Translation::from_raw_text(&text));
-        }
-
-        if reader.is_finished() && !mut_state.reader.take().unwrap().check_success() {
-            mut_state.next_try = Instant::now() + Duration::from_secs(15);
-        }
-        return Ok(());
-    } else if mut_state.next_try > Instant::now() {
-        return Ok(());
-    }
-
-    let child = Command::new("sh")
-        .arg("-c")
-        .arg(&state.exec)
-        .stdout(Stdio::piped())
-        .spawn()
-        .with_context(|| format!("Failed to run shell script: '{}'", &state.exec))?;
-
-    mut_state.reader = Some(PipeReaderThread::new_from_child(child));
-
-    Ok(())
-}
-
-struct FifoLabelState {
-    path: Arc<str>,
-    mut_state: RefCell<PipeLabelMutableState>,
-    carry_over: RefCell<Option<String>>,
-}
-
-impl FifoLabelState {
-    fn try_remove_fifo(&self) -> anyhow::Result<()> {
-        let meta = match fs::metadata(&*self.path) {
-            Ok(meta) => meta,
-            Err(e) => {
-                if fs::exists(&*self.path).unwrap_or(true) {
-                    anyhow::bail!("Could not stat existing file at {}: {e:?}", &self.path);
-                }
-                return Ok(());
-            }
-        };
-
-        if !meta.file_type().is_fifo() {
-            anyhow::bail!("Existing file at {} is not a FIFO", &self.path);
-        }
-
-        if let Err(e) = fs::remove_file(&*self.path) {
-            anyhow::bail!("Unable to remove existing FIFO at {}: {e:?}", &self.path);
-        }
-
-        Ok(())
-    }
-}
-
-impl Drop for FifoLabelState {
-    fn drop(&mut self) {
-        if let Err(e) = self.try_remove_fifo() {
-            log::debug!("{e:?}");
-        }
-    }
-}
-
-fn fifo_on_tick(
-    state: &FifoLabelState,
-    common: &mut event::CallbackDataCommon,
-    data: &mut event::CallbackData,
-) {
-    let mut mut_state = state.mut_state.borrow_mut();
-
-    let Some(reader) = mut_state.reader.as_mut() else {
-        if mut_state.next_try > Instant::now() {
-            return;
-        }
-
-        if let Err(e) = state.try_remove_fifo() {
-            mut_state.next_try = Instant::now() + Duration::from_secs(15);
-            log::warn!("Requested FIFO path is taken: {e:?}");
-            return;
-        }
-
-        if let Err(e) = create_fifo(&*state.path, 0o777) {
-            mut_state.next_try = Instant::now() + Duration::from_secs(15);
-            log::warn!("Failed to create FIFO: {e:?}");
-            return;
-        }
-
-        mut_state.reader = Some(PipeReaderThread::new_from_fifo(state.path.clone()));
-        return;
-    };
-
-    if let Some(text) = reader.get_last_line() {
-        let label = data.obj.get_as_mut::<WidgetLabel>().unwrap();
-        label.set_text(common, Translation::from_raw_text(&text));
-    }
-
-    if reader.is_finished() && !mut_state.reader.take().unwrap().check_success() {
-        mut_state.next_try = Instant::now() + Duration::from_secs(15);
-    }
-}
-
 const BAT_LOW: drawing::Color = drawing::Color::new(0.69, 0.38, 0.38, 1.);
 const BAT_NORMAL: drawing::Color = drawing::Color::new(0.55, 0.84, 0.79, 1.);
 const BAT_CHARGING: drawing::Color = drawing::Color::new(0.38, 0.50, 0.62, 1.);
diff --git a/wlx-overlay-s/src/overlays/custom.rs b/wlx-overlay-s/src/overlays/custom.rs
index 9626c72..ae8290b 100644
--- a/wlx-overlay-s/src/overlays/custom.rs
+++ b/wlx-overlay-s/src/overlays/custom.rs
@@ -112,7 +112,7 @@ fn apply_custom_command(
                 anyhow::bail!("No <label> or <Button> with such id.");
             }
         }
-        ModifyPanelCommand::SetSprite(path) => {
+        ModifyPanelCommand::SetImage(path) => {
             if let Ok(pair) = panel
                 .parser_state
                 .fetch_widget(&panel.layout.state, element)

From 3f5a363136198e9a43d37431687c486fa80371cf Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Wed, 24 Dec 2025 00:58:40 +0900
Subject: [PATCH 27/29] fmt

---
 wayvr-ipc/src/client.rs                   |   5 +-
 wayvr-ipc/src/util/handle.rs              | 259 +++++++--------
 wayvrctl/src/helper.rs                    | 387 ++++++++++++----------
 wayvrctl/src/main.rs                      | 201 ++++++-----
 wgui/src/components/button.rs             |   9 +-
 wgui/src/components/checkbox.rs           |   4 +-
 wgui/src/components/slider.rs             |   2 +-
 wgui/src/drawing.rs                       |   2 +-
 wgui/src/parser/component_button.rs       |   6 +-
 wgui/src/parser/mod.rs                    |   2 +-
 wgui/src/parser/style.rs                  |   4 +-
 wgui/src/parser/widget_image.rs           |   3 +-
 wgui/src/parser/widget_rectangle.rs       |   3 +-
 wgui/src/parser/widget_sprite.rs          |   2 +-
 wgui/src/renderer_vk/context.rs           |   6 +-
 wgui/src/renderer_vk/image.rs             |   2 +-
 wgui/src/renderer_vk/rect.rs              |   2 +-
 wgui/src/renderer_vk/text/custom_glyph.rs |   2 +-
 wgui/src/widget/image.rs                  |   2 +-
 wgui/src/widget/mod.rs                    |   6 +-
 wgui/src/widget/rectangle.rs              |   2 +-
 wgui/src/widget/sprite.rs                 |   2 +-
 wlx-overlay-s/src/gui/panel/mod.rs        |   1 -
 23 files changed, 484 insertions(+), 430 deletions(-)

diff --git a/wayvr-ipc/src/client.rs b/wayvr-ipc/src/client.rs
index db4c287..bba9a98 100644
--- a/wayvr-ipc/src/client.rs
+++ b/wayvr-ipc/src/client.rs
@@ -1,8 +1,7 @@
 use bytes::BufMut;
 use interprocess::local_socket::{
-	self,
-	tokio::{prelude::*, Stream},
-	GenericNamespaced,
+	self, GenericNamespaced,
+	tokio::{Stream, prelude::*},
 };
 use serde::Serialize;
 use smallvec::SmallVec;
diff --git a/wayvr-ipc/src/util/handle.rs b/wayvr-ipc/src/util/handle.rs
index a408d41..63aaa7b 100644
--- a/wayvr-ipc/src/util/handle.rs
+++ b/wayvr-ipc/src/util/handle.rs
@@ -1,167 +1,164 @@
 #[macro_export]
 macro_rules! gen_id {
-    (
+	(
 		$container_name:ident,
 		$instance_name:ident,
 		$cell_name:ident,
 		$handle_name:ident) => {
-        //ThingCell
-        pub struct $cell_name {
-            pub obj: $instance_name,
-            pub generation: u64,
-        }
+		//ThingCell
+		pub struct $cell_name {
+			pub obj: $instance_name,
+			pub generation: u64,
+		}
 
-        //ThingVec
-        pub struct $container_name {
-            // Vec<Option<ThingCell>>
-            pub vec: Vec<Option<$cell_name>>,
+		//ThingVec
+		pub struct $container_name {
+			// Vec<Option<ThingCell>>
+			pub vec: Vec<Option<$cell_name>>,
 
-            cur_generation: u64,
-        }
+			cur_generation: u64,
+		}
 
-        //ThingHandle
-        #[derive(Default, Clone, Copy, PartialEq, Hash, Eq)]
-        pub struct $handle_name {
-            idx: u32,
-            generation: u64,
-        }
+		//ThingHandle
+		#[derive(Default, Clone, Copy, PartialEq, Hash, Eq)]
+		pub struct $handle_name {
+			idx: u32,
+			generation: u64,
+		}
 
-        #[allow(dead_code)]
-        impl $handle_name {
-            pub fn reset(&mut self) {
-                self.generation = 0;
-            }
+		#[allow(dead_code)]
+		impl $handle_name {
+			pub fn reset(&mut self) {
+				self.generation = 0;
+			}
 
-            pub fn is_set(&self) -> bool {
-                self.generation > 0
-            }
+			pub fn is_set(&self) -> bool {
+				self.generation > 0
+			}
 
-            pub fn id(&self) -> u32 {
-                self.idx
-            }
+			pub fn id(&self) -> u32 {
+				self.idx
+			}
 
-            pub fn new(idx: u32, generation: u64) -> Self {
-                Self { idx, generation }
-            }
-        }
+			pub fn new(idx: u32, generation: u64) -> Self {
+				Self { idx, generation }
+			}
+		}
 
-        //ThingVec
-        #[allow(dead_code)]
-        impl $container_name {
-            pub fn new() -> Self {
-                Self {
-                    vec: Vec::new(),
-                    cur_generation: 0,
-                }
-            }
+		//ThingVec
+		#[allow(dead_code)]
+		impl $container_name {
+			pub fn new() -> Self {
+				Self {
+					vec: Vec::new(),
+					cur_generation: 0,
+				}
+			}
 
-            pub fn iter(&self, callback: &dyn Fn($handle_name, &$instance_name)) {
-                for (idx, opt_cell) in self.vec.iter().enumerate() {
-                    if let Some(cell) = opt_cell {
-                        let handle = $container_name::get_handle(&cell, idx);
-                        callback(handle, &cell.obj);
-                    }
-                }
-            }
+			pub fn iter(&self, callback: &dyn Fn($handle_name, &$instance_name)) {
+				for (idx, opt_cell) in self.vec.iter().enumerate() {
+					if let Some(cell) = opt_cell {
+						let handle = $container_name::get_handle(&cell, idx);
+						callback(handle, &cell.obj);
+					}
+				}
+			}
 
-            pub fn iter_mut(
-                &mut self,
-                callback: &mut dyn FnMut($handle_name, &mut $instance_name),
-            ) {
-                for (idx, opt_cell) in self.vec.iter_mut().enumerate() {
-                    if let Some(cell) = opt_cell {
-                        let handle = $container_name::get_handle(&cell, idx);
-                        callback(handle, &mut cell.obj);
-                    }
-                }
-            }
+			pub fn iter_mut(&mut self, callback: &mut dyn FnMut($handle_name, &mut $instance_name)) {
+				for (idx, opt_cell) in self.vec.iter_mut().enumerate() {
+					if let Some(cell) = opt_cell {
+						let handle = $container_name::get_handle(&cell, idx);
+						callback(handle, &mut cell.obj);
+					}
+				}
+			}
 
-            pub fn get_handle(cell: &$cell_name, idx: usize) -> $handle_name {
-                $handle_name {
-                    idx: idx as u32,
-                    generation: cell.generation,
-                }
-            }
+			pub fn get_handle(cell: &$cell_name, idx: usize) -> $handle_name {
+				$handle_name {
+					idx: idx as u32,
+					generation: cell.generation,
+				}
+			}
 
-            fn find_unused_idx(&mut self) -> Option<u32> {
-                for (num, obj) in self.vec.iter().enumerate() {
-                    if obj.is_none() {
-                        return Some(num as u32);
-                    }
-                }
-                None
-            }
+			fn find_unused_idx(&mut self) -> Option<u32> {
+				for (num, obj) in self.vec.iter().enumerate() {
+					if obj.is_none() {
+						return Some(num as u32);
+					}
+				}
+				None
+			}
 
-            pub fn add(&mut self, obj: $instance_name) -> $handle_name {
-                self.cur_generation += 1;
-                let generation = self.cur_generation;
+			pub fn add(&mut self, obj: $instance_name) -> $handle_name {
+				self.cur_generation += 1;
+				let generation = self.cur_generation;
 
-                let unused_idx = self.find_unused_idx();
+				let unused_idx = self.find_unused_idx();
 
-                let idx = if let Some(idx) = unused_idx {
-                    idx
-                } else {
-                    self.vec.len() as u32
-                };
+				let idx = if let Some(idx) = unused_idx {
+					idx
+				} else {
+					self.vec.len() as u32
+				};
 
-                let handle = $handle_name { idx, generation };
+				let handle = $handle_name { idx, generation };
 
-                let cell = $cell_name { obj, generation };
+				let cell = $cell_name { obj, generation };
 
-                if let Some(idx) = unused_idx {
-                    self.vec[idx as usize] = Some(cell);
-                } else {
-                    self.vec.push(Some(cell))
-                }
+				if let Some(idx) = unused_idx {
+					self.vec[idx as usize] = Some(cell);
+				} else {
+					self.vec.push(Some(cell))
+				}
 
-                handle
-            }
+				handle
+			}
 
-            pub fn remove(&mut self, handle: &$handle_name) {
-                // Out of bounds, ignore
-                if handle.idx as usize >= self.vec.len() {
-                    return;
-                }
+			pub fn remove(&mut self, handle: &$handle_name) {
+				// Out of bounds, ignore
+				if handle.idx as usize >= self.vec.len() {
+					return;
+				}
 
-                // Remove only if the generation matches
-                if let Some(cell) = &self.vec[handle.idx as usize] {
-                    if cell.generation == handle.generation {
-                        self.vec[handle.idx as usize] = None;
-                    }
-                }
-            }
+				// Remove only if the generation matches
+				if let Some(cell) = &self.vec[handle.idx as usize] {
+					if cell.generation == handle.generation {
+						self.vec[handle.idx as usize] = None;
+					}
+				}
+			}
 
-            pub fn get(&self, handle: &$handle_name) -> Option<&$instance_name> {
-                // Out of bounds, ignore
-                if handle.idx as usize >= self.vec.len() {
-                    return None;
-                }
+			pub fn get(&self, handle: &$handle_name) -> Option<&$instance_name> {
+				// Out of bounds, ignore
+				if handle.idx as usize >= self.vec.len() {
+					return None;
+				}
 
-                if let Some(cell) = &self.vec[handle.idx as usize] {
-                    if cell.generation == handle.generation {
-                        return Some(&cell.obj);
-                    }
-                }
+				if let Some(cell) = &self.vec[handle.idx as usize] {
+					if cell.generation == handle.generation {
+						return Some(&cell.obj);
+					}
+				}
 
-                None
-            }
+				None
+			}
 
-            pub fn get_mut(&mut self, handle: &$handle_name) -> Option<&mut $instance_name> {
-                // Out of bounds, ignore
-                if handle.idx as usize >= self.vec.len() {
-                    return None;
-                }
+			pub fn get_mut(&mut self, handle: &$handle_name) -> Option<&mut $instance_name> {
+				// Out of bounds, ignore
+				if handle.idx as usize >= self.vec.len() {
+					return None;
+				}
 
-                if let Some(cell) = &mut self.vec[handle.idx as usize] {
-                    if cell.generation == handle.generation {
-                        return Some(&mut cell.obj);
-                    }
-                }
+				if let Some(cell) = &mut self.vec[handle.idx as usize] {
+					if cell.generation == handle.generation {
+						return Some(&mut cell.obj);
+					}
+				}
 
-                None
-            }
-        }
-    };
+				None
+			}
+		}
+	};
 }
 
 /* Example usage:
diff --git a/wayvrctl/src/helper.rs b/wayvrctl/src/helper.rs
index 9fb7420..19c9197 100644
--- a/wayvrctl/src/helper.rs
+++ b/wayvrctl/src/helper.rs
@@ -1,246 +1,267 @@
-use std::{collections::HashMap};
+use std::collections::HashMap;
 
 use anyhow::Context;
 use serde::Serialize;
-use wayvr_ipc::{client::{WayVRClient, WayVRClientMutex}, ipc, packet_client, packet_server};
+use wayvr_ipc::{
+    client::{WayVRClient, WayVRClientMutex},
+    ipc, packet_client, packet_server,
+};
 
 pub struct WayVRClientState {
-	pub wayvr_client: WayVRClientMutex,
-	pub serial_generator: ipc::SerialGenerator,
-	pub pretty_print: bool,
+    pub wayvr_client: WayVRClientMutex,
+    pub serial_generator: ipc::SerialGenerator,
+    pub pretty_print: bool,
 }
 
 fn handle_empty_result(result: anyhow::Result<()>) {
-	if let Err(e) = result {
-		log::error!("{e:?}");
-	}
+    if let Err(e) = result {
+        log::error!("{e:?}");
+    }
 }
 
 fn handle_result<T: Serialize>(pretty_print: bool, result: anyhow::Result<T>) {
-	match result {
-		Ok(t) => {
-			
-			let maybe_json = if pretty_print {
-				serde_json::to_string_pretty(&t)
-			} else {
-				serde_json::to_string(&t)
-			};
+    match result {
+        Ok(t) => {
+            let maybe_json = if pretty_print {
+                serde_json::to_string_pretty(&t)
+            } else {
+                serde_json::to_string(&t)
+            };
 
-			match maybe_json {
-				Ok(json_string) => println!("{}", json_string),
-				Err(e) => log::error!("Failed to serialize JSON: {e:?}")
-			}
-		}
-		Err(e) => log::error!("{e:?}")
-	}
+            match maybe_json {
+                Ok(json_string) => println!("{}", json_string),
+                Err(e) => log::error!("Failed to serialize JSON: {e:?}"),
+            }
+        }
+        Err(e) => log::error!("{e:?}"),
+    }
 }
 
 pub async fn wvr_display_create(
-	state: &mut WayVRClientState,
-	width: u16,
-	height: u16,
-	name: String,
-	scale: Option<f32>,
-	attach_to: packet_client::AttachTo,
+    state: &mut WayVRClientState,
+    width: u16,
+    height: u16,
+    name: String,
+    scale: Option<f32>,
+    attach_to: packet_client::AttachTo,
 ) {
-	handle_result(state.pretty_print,
-		WayVRClient::fn_wvr_display_create(
-			state.wayvr_client.clone(),
- 			state.serial_generator.increment_get(),
-			packet_client::WvrDisplayCreateParams {
-				width,
-				height,
-				name,
-				scale,
-				attach_to,
-			},
-		)
-		.await.context("failed to create display")
-	);
+    handle_result(
+        state.pretty_print,
+        WayVRClient::fn_wvr_display_create(
+            state.wayvr_client.clone(),
+            state.serial_generator.increment_get(),
+            packet_client::WvrDisplayCreateParams {
+                width,
+                height,
+                name,
+                scale,
+                attach_to,
+            },
+        )
+        .await
+        .context("failed to create display"),
+    );
 }
 
-pub async fn wvr_display_list(
-	state: &mut WayVRClientState,
-) {
-	handle_result(state.pretty_print,
-		WayVRClient::fn_wvr_display_list(
-			state.wayvr_client.clone(),
- 			state.serial_generator.increment_get(),
-		)
-		.await.context("failed to fetch displays")
-);
+pub async fn wvr_display_list(state: &mut WayVRClientState) {
+    handle_result(
+        state.pretty_print,
+        WayVRClient::fn_wvr_display_list(
+            state.wayvr_client.clone(),
+            state.serial_generator.increment_get(),
+        )
+        .await
+        .context("failed to fetch displays"),
+    );
 }
 
 pub async fn wvr_display_get(
-	state: &mut WayVRClientState,
-	handle: packet_server::WvrDisplayHandle,
+    state: &mut WayVRClientState,
+    handle: packet_server::WvrDisplayHandle,
 ) {
-	handle_result(state.pretty_print,
-		WayVRClient::fn_wvr_display_get(
-			state.wayvr_client.clone(),
- 			state.serial_generator.increment_get(),
-			handle,
-		)
-		.await.context("failed to fetch display")
-);
+    handle_result(
+        state.pretty_print,
+        WayVRClient::fn_wvr_display_get(
+            state.wayvr_client.clone(),
+            state.serial_generator.increment_get(),
+            handle,
+        )
+        .await
+        .context("failed to fetch display"),
+    );
 }
 
 pub async fn wvr_display_window_list(
-	state: &mut WayVRClientState,
-	handle: packet_server::WvrDisplayHandle,
+    state: &mut WayVRClientState,
+    handle: packet_server::WvrDisplayHandle,
 ) {
-	handle_result(state.pretty_print,
-		WayVRClient::fn_wvr_display_window_list(
-			state.wayvr_client.clone(),
- 			state.serial_generator.increment_get(),
-			handle,
-		)
-		.await.context("failed to list window displays")
-	);
+    handle_result(
+        state.pretty_print,
+        WayVRClient::fn_wvr_display_window_list(
+            state.wayvr_client.clone(),
+            state.serial_generator.increment_get(),
+            handle,
+        )
+        .await
+        .context("failed to list window displays"),
+    );
 }
 
 pub async fn wvr_display_remove(
-	state: &mut WayVRClientState,
-	handle: packet_server::WvrDisplayHandle,
+    state: &mut WayVRClientState,
+    handle: packet_server::WvrDisplayHandle,
 ) {
-	handle_result(state.pretty_print,
-		WayVRClient::fn_wvr_display_remove(
-			state.wayvr_client.clone(),
- 			state.serial_generator.increment_get(),
-			handle,
-		)
-		.await.context("failed to remove display")
-	);
+    handle_result(
+        state.pretty_print,
+        WayVRClient::fn_wvr_display_remove(
+            state.wayvr_client.clone(),
+            state.serial_generator.increment_get(),
+            handle,
+        )
+        .await
+        .context("failed to remove display"),
+    );
 }
 
 pub async fn wvr_display_set_visible(
-	state: &mut WayVRClientState,
-	handle: packet_server::WvrDisplayHandle,
-	visible: bool,
+    state: &mut WayVRClientState,
+    handle: packet_server::WvrDisplayHandle,
+    visible: bool,
 ) {
-	handle_empty_result(
-		WayVRClient::fn_wvr_display_set_visible(state.wayvr_client.clone(), handle, visible).await.context("failed to set display visibility"),
-	)
+    handle_empty_result(
+        WayVRClient::fn_wvr_display_set_visible(state.wayvr_client.clone(), handle, visible)
+            .await
+            .context("failed to set display visibility"),
+    )
 }
 
 pub async fn wvr_window_set_visible(
-	state: &mut WayVRClientState,
-	handle: packet_server::WvrWindowHandle,
-	visible: bool,
+    state: &mut WayVRClientState,
+    handle: packet_server::WvrWindowHandle,
+    visible: bool,
 ) {
-	handle_empty_result(
-		WayVRClient::fn_wvr_window_set_visible(state.wayvr_client.clone(), handle, visible).await.context("failed to set window visibility"),
-	)
+    handle_empty_result(
+        WayVRClient::fn_wvr_window_set_visible(state.wayvr_client.clone(), handle, visible)
+            .await
+            .context("failed to set window visibility"),
+    )
 }
 
 pub async fn wvr_process_get(
-	state: &mut WayVRClientState,
-	handle: packet_server::WvrProcessHandle,
+    state: &mut WayVRClientState,
+    handle: packet_server::WvrProcessHandle,
 ) {
-	handle_result(state.pretty_print,
-		WayVRClient::fn_wvr_process_get(
-			state.wayvr_client.clone(),
- 			state.serial_generator.increment_get(),
-			handle,
-		)
-		.await.context("failed to get process"),
-	);
+    handle_result(
+        state.pretty_print,
+        WayVRClient::fn_wvr_process_get(
+            state.wayvr_client.clone(),
+            state.serial_generator.increment_get(),
+            handle,
+        )
+        .await
+        .context("failed to get process"),
+    );
 }
 
-pub async fn wvr_process_list(
-	state: &mut WayVRClientState,
-) {
-	handle_result(state.pretty_print,
-		WayVRClient::fn_wvr_process_list(
-			state.wayvr_client.clone(),
- 			state.serial_generator.increment_get(),
-		)
-		.await.context("failed to list processes"),
-	)
+pub async fn wvr_process_list(state: &mut WayVRClientState) {
+    handle_result(
+        state.pretty_print,
+        WayVRClient::fn_wvr_process_list(
+            state.wayvr_client.clone(),
+            state.serial_generator.increment_get(),
+        )
+        .await
+        .context("failed to list processes"),
+    )
 }
 
 pub async fn wvr_process_terminate(
-	state: &mut WayVRClientState,
-	handle: packet_server::WvrProcessHandle,
+    state: &mut WayVRClientState,
+    handle: packet_server::WvrProcessHandle,
 ) {
-	handle_empty_result(
-		WayVRClient::fn_wvr_process_terminate(state.wayvr_client.clone(), handle).await.context("failed to terminate process"),
-	)
+    handle_empty_result(
+        WayVRClient::fn_wvr_process_terminate(state.wayvr_client.clone(), handle)
+            .await
+            .context("failed to terminate process"),
+    )
 }
 
 pub async fn wvr_process_launch(
-	state: &mut WayVRClientState,
-	exec: String,
-	name: String,
-	env: Vec<String>,
-	target_display: packet_server::WvrDisplayHandle,
-	args: String,
-	userdata: HashMap<String, String>,
+    state: &mut WayVRClientState,
+    exec: String,
+    name: String,
+    env: Vec<String>,
+    target_display: packet_server::WvrDisplayHandle,
+    args: String,
+    userdata: HashMap<String, String>,
 ) {
-	handle_result(state.pretty_print,
-		WayVRClient::fn_wvr_process_launch(
-			state.wayvr_client.clone(),
-			state.serial_generator.increment_get(),
-			packet_client::WvrProcessLaunchParams {
-				env,
-				exec,
-				name,
-				target_display,
-				args,
-				userdata,
-			},
-		)
-		.await.context("failed to launch process"),
-	)
+    handle_result(
+        state.pretty_print,
+        WayVRClient::fn_wvr_process_launch(
+            state.wayvr_client.clone(),
+            state.serial_generator.increment_get(),
+            packet_client::WvrProcessLaunchParams {
+                env,
+                exec,
+                name,
+                target_display,
+                args,
+                userdata,
+            },
+        )
+        .await
+        .context("failed to launch process"),
+    )
 }
 
 pub async fn wlx_haptics(
-	state: &mut WayVRClientState,
-	intensity: f32,
-	duration: f32,
-	frequency: f32,
+    state: &mut WayVRClientState,
+    intensity: f32,
+    duration: f32,
+    frequency: f32,
 ) {
-	handle_empty_result(
-		WayVRClient::fn_wlx_haptics(
-			state.wayvr_client.clone(),
-			packet_client::WlxHapticsParams {
-				intensity,
-				duration,
-				frequency,
-			},
-		)
-		.await.context("failed to trigger haptics"),
-	)
+    handle_empty_result(
+        WayVRClient::fn_wlx_haptics(
+            state.wayvr_client.clone(),
+            packet_client::WlxHapticsParams {
+                intensity,
+                duration,
+                frequency,
+            },
+        )
+        .await
+        .context("failed to trigger haptics"),
+    )
 }
 
 pub async fn wlx_panel_modify(
-	state: &mut WayVRClientState,
-	overlay: String,
-	element: String,
-	command: packet_client::WlxModifyPanelCommand,
+    state: &mut WayVRClientState,
+    overlay: String,
+    element: String,
+    command: packet_client::WlxModifyPanelCommand,
 ) {
-	handle_empty_result(
-		WayVRClient::fn_wlx_modify_panel(
-			state.wayvr_client.clone(),
-			packet_client::WlxModifyPanelParams {
-				overlay,
-				element,
-				command,
-			},
-		)
-		.await.context("failed to modify panel"),
-	)
+    handle_empty_result(
+        WayVRClient::fn_wlx_modify_panel(
+            state.wayvr_client.clone(),
+            packet_client::WlxModifyPanelParams {
+                overlay,
+                element,
+                command,
+            },
+        )
+        .await
+        .context("failed to modify panel"),
+    )
 }
 
-pub async fn wlx_input_state(
-	state: &mut WayVRClientState,
-) {
-	handle_result(state.pretty_print,
-		WayVRClient::fn_wlx_input_state(
-			state.wayvr_client.clone(),
- 			state.serial_generator.increment_get(),
-		)
-		.await.context("failed to get input state"),
-	)
+pub async fn wlx_input_state(state: &mut WayVRClientState) {
+    handle_result(
+        state.pretty_print,
+        WayVRClient::fn_wlx_input_state(
+            state.wayvr_client.clone(),
+            state.serial_generator.increment_get(),
+        )
+        .await
+        .context("failed to get input state"),
+    )
 }
-
diff --git a/wayvrctl/src/main.rs b/wayvrctl/src/main.rs
index cab0e56..ed47b82 100644
--- a/wayvrctl/src/main.rs
+++ b/wayvrctl/src/main.rs
@@ -1,36 +1,47 @@
-use std::{collections::HashMap, process::{self, ExitCode}, time::Duration};
+use std::{
+    collections::HashMap,
+    process::{self, ExitCode},
+    time::Duration,
+};
 
 use anyhow::Context;
 use clap::Parser;
 use env_logger::Env;
-use wayvr_ipc::{client::WayVRClient, ipc, packet_client, };
+use wayvr_ipc::{client::WayVRClient, ipc, packet_client};
 
-use crate::helper::{wlx_haptics, wlx_input_state, wlx_panel_modify, wvr_display_create, wvr_display_get, wvr_display_list, wvr_display_remove, wvr_display_set_visible, wvr_display_window_list, wvr_process_get, wvr_process_launch, wvr_process_list, wvr_process_terminate, wvr_window_set_visible, WayVRClientState};
+use crate::helper::{
+    WayVRClientState, wlx_haptics, wlx_input_state, wlx_panel_modify, wvr_display_create,
+    wvr_display_get, wvr_display_list, wvr_display_remove, wvr_display_set_visible,
+    wvr_display_window_list, wvr_process_get, wvr_process_launch, wvr_process_list,
+    wvr_process_terminate, wvr_window_set_visible,
+};
 
 mod helper;
 
-
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> ExitCode {
     env_logger::init_from_env(Env::default().default_filter_or("info"));
     let args = Args::parse();
 
     let mut state = WayVRClientState {
-        wayvr_client : WayVRClient::new(&format!("wayvrctl-{}", process::id())).await.inspect_err(|e| {
-            log::error!("Failed to initialize WayVR connection: {e:?}");
-            process::exit(1);
-        }).unwrap(),
+        wayvr_client: WayVRClient::new(&format!("wayvrctl-{}", process::id()))
+            .await
+            .inspect_err(|e| {
+                log::error!("Failed to initialize WayVR connection: {e:?}");
+                process::exit(1);
+            })
+            .unwrap(),
         serial_generator: ipc::SerialGenerator::new(),
         pretty_print: args.pretty,
     };
 
-    let maybe_err = if let Subcommands::Batch {fail_fast} = args.command {
+    let maybe_err = if let Subcommands::Batch { fail_fast } = args.command {
         run_batch(&mut state, fail_fast).await
     } else {
         run_once(&mut state, args).await
-     };
+    };
 
-    if let Err(e) = maybe_err{
+    if let Err(e) = maybe_err {
         log::error!("{e:?}");
         return ExitCode::FAILURE;
     } else {
@@ -50,30 +61,30 @@ async fn run_batch(state: &mut WayVRClientState, fail_fast: bool) -> anyhow::Res
             continue;
         }
 
-        if let Err(e) = parse_run_line(state, &line).await.with_context(|| format!("error on line {}", line_no + 1)) {
+        if let Err(e) = parse_run_line(state, &line)
+            .await
+            .with_context(|| format!("error on line {}", line_no + 1))
+        {
             if fail_fast {
-                return Err(e)
+                return Err(e);
             } else {
                 log::error!("{e:?}");
             }
         }
-
     }
     Ok(())
 }
 
 async fn parse_run_line(state: &mut WayVRClientState, line: &str) -> anyhow::Result<()> {
-            let mut argv = shell_words::split(&line)
-            .with_context(|| format!("parse error"))
-            ?;
+    let mut argv = shell_words::split(&line).with_context(|| format!("parse error"))?;
 
-        // clap expects argv[0] to be the binary name
-        argv.insert(0, env!("CARGO_PKG_NAME").to_string());
+    // clap expects argv[0] to be the binary name
+    argv.insert(0, env!("CARGO_PKG_NAME").to_string());
 
-        let args = Args::try_parse_from(argv).with_context(|| format!("invalid arguments"))?;
-        run_once(state, args).await?;
+    let args = Args::try_parse_from(argv).with_context(|| format!("invalid arguments"))?;
+    run_once(state, args).await?;
 
-        Ok(())
+    Ok(())
 }
 
 async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()> {
@@ -84,8 +95,21 @@ async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()
         Subcommands::InputState => {
             wlx_input_state(state).await;
         }
-        Subcommands::DisplayCreate { width, height, name, scale } => {
-            wvr_display_create(state, width, height, name, scale, packet_client::AttachTo::None).await;
+        Subcommands::DisplayCreate {
+            width,
+            height,
+            name,
+            scale,
+        } => {
+            wvr_display_create(
+                state,
+                width,
+                height,
+                name,
+                scale,
+                packet_client::AttachTo::None,
+            )
+            .await;
         }
         Subcommands::DisplayList => {
             wvr_display_list(state).await;
@@ -102,11 +126,17 @@ async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()
             let handle = serde_json::from_str(&handle).context("Invalid handle")?;
             wvr_display_remove(state, handle).await;
         }
-        Subcommands::DisplaySetVisible { handle, visible_0_or_1 } => {
+        Subcommands::DisplaySetVisible {
+            handle,
+            visible_0_or_1,
+        } => {
             let handle = serde_json::from_str(&handle).context("Invalid handle")?;
             wvr_display_set_visible(state, handle, visible_0_or_1 != 0).await;
         }
-        Subcommands::WindowSetVisible { handle, visible_0_or_1 } => {
+        Subcommands::WindowSetVisible {
+            handle,
+            visible_0_or_1,
+        } => {
             let handle = serde_json::from_str(&handle).context("Invalid handle")?;
             wvr_window_set_visible(state, handle, visible_0_or_1 != 0).await;
         }
@@ -121,29 +151,52 @@ async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()
             let handle = serde_json::from_str(&handle).context("Invalid handle")?;
             wvr_process_terminate(state, handle).await;
         }
-        Subcommands::ProcessLaunch { exec, name, env, target_display, args } => {
+        Subcommands::ProcessLaunch {
+            exec,
+            name,
+            env,
+            target_display,
+            args,
+        } => {
             let handle = serde_json::from_str(&target_display).context("Invalid target_display")?;
             wvr_process_launch(state, exec, name, env, handle, args, HashMap::new()).await;
         }
-        Subcommands::Haptics { intensity, duration, frequency } => {
+        Subcommands::Haptics {
+            intensity,
+            duration,
+            frequency,
+        } => {
             wlx_haptics(state, intensity, duration, frequency).await;
         }
-        Subcommands::PanelModify { overlay, element, command } => {
+        Subcommands::PanelModify {
+            overlay,
+            element,
+            command,
+        } => {
             let command = match command {
-                SubcommandPanelModify::SetText { text } => packet_client::WlxModifyPanelCommand::SetText(text),
-                SubcommandPanelModify::SetColor { hex_color } => packet_client::WlxModifyPanelCommand::SetColor(hex_color),
-                SubcommandPanelModify::SetImage { absolute_path } => packet_client::WlxModifyPanelCommand::SetImage(absolute_path),
-                SubcommandPanelModify::SetVisible { visible_0_or_1 } => packet_client::WlxModifyPanelCommand::SetVisible(visible_0_or_1 != 0),
-                SubcommandPanelModify::SetStickyState { sticky_state_0_or_1 } => packet_client::WlxModifyPanelCommand::SetStickyState(sticky_state_0_or_1 != 0),
+                SubcommandPanelModify::SetText { text } => {
+                    packet_client::WlxModifyPanelCommand::SetText(text)
+                }
+                SubcommandPanelModify::SetColor { hex_color } => {
+                    packet_client::WlxModifyPanelCommand::SetColor(hex_color)
+                }
+                SubcommandPanelModify::SetImage { absolute_path } => {
+                    packet_client::WlxModifyPanelCommand::SetImage(absolute_path)
+                }
+                SubcommandPanelModify::SetVisible { visible_0_or_1 } => {
+                    packet_client::WlxModifyPanelCommand::SetVisible(visible_0_or_1 != 0)
+                }
+                SubcommandPanelModify::SetStickyState {
+                    sticky_state_0_or_1,
+                } => packet_client::WlxModifyPanelCommand::SetStickyState(sticky_state_0_or_1 != 0),
             };
-            
+
             wlx_panel_modify(state, overlay, element, command).await;
         }
     }
     Ok(())
 }
 
-
 /// A command-line interface for WayVR IPC
 #[derive(clap::Parser, Debug)]
 #[command(version, about, long_about = None)]
@@ -161,96 +214,92 @@ struct Args {
 enum Subcommands {
     /// Read commands from stdout, one per line.
     Batch {
-    /// Stop on the first error
-    #[arg(short, long)]
-      fail_fast: bool,  
+        /// Stop on the first error
+        #[arg(short, long)]
+        fail_fast: bool,
     },
     /// Get the positions of HMD & controllers
     InputState,
     /// Create a new WayVR display
-    DisplayCreate{
-    	width: u16,
-    	height: u16,
-    	name: String,
+    DisplayCreate {
+        width: u16,
+        height: u16,
+        name: String,
         #[arg(short, long)]
-    	scale: Option<f32>,
-
-    	//attach_to: packet_client::AttachTo,
+        scale: Option<f32>,
+        //attach_to: packet_client::AttachTo,
     },
     /// List WayVR displays
     DisplayList,
     /// Retrieve information about a single WayVR display
     DisplayGet {
         /// A display handle JSON returned by DisplayList or DisplayCreate
-    	handle: String,
+        handle: String,
     },
     /// List windows attached to a WayVR display
     DisplayWindowList {
         /// A display handle JSON returned by DisplayList or DisplayCreate
-    	handle: String,
+        handle: String,
     },
     /// Delete a WayVR display
     DisplayRemove {
         /// A display handle JSON returned by DisplayList or DisplayCreate
-    	handle: String,
+        handle: String,
     },
     /// Change the visibility of a WayVR display
     DisplaySetVisible {
         /// A display handle JSON returned by DisplayList or DisplayCreate
-    	handle: String,
-    	visible_0_or_1: u8,
+        handle: String,
+        visible_0_or_1: u8,
     },
 
     // DisplaySetLayout skipped
- 
     /// Change the visibility of a window on a WayVR display
     WindowSetVisible {
         /// A JSON window handle returned by DisplayWindowList
-    	handle: String,
-    	visible_0_or_1: u8,
+        handle: String,
+        visible_0_or_1: u8,
     },
     /// Retrieve information about a WayVR-managed process
     ProcessGet {
-    /// A JSON process handle returned by ProcessList or ProcessLaunch
-	handle: String,
-
+        /// A JSON process handle returned by ProcessList or ProcessLaunch
+        handle: String,
     },
     /// List all processes managed by WayVR
     ProcessList,
     /// Terminate a WayVR-managed process
     ProcessTerminate {
         /// A JSON process handle returned by ProcessList or ProcessLaunch
-    	handle: String,
+        handle: String,
     },
     /// Launch a new process inside WayVR
     ProcessLaunch {
-    	exec: String,
-    	name: String,
-    	env: Vec<String>,
+        exec: String,
+        name: String,
+        env: Vec<String>,
         /// A display handle JSON returned by DisplayList or DisplayCreate
-    	target_display: String,
-    	args: String,
+        target_display: String,
+        args: String,
     },
     /// Trigger haptics on the user's controller
     Haptics {
         #[arg(short, long, default_value = "0.25")]
-    	intensity: f32,
-        #[arg(short, long , default_value = "0.1")]
-    	duration: f32,
+        intensity: f32,
         #[arg(short, long, default_value = "0.1")]
-    	frequency: f32,
+        duration: f32,
+        #[arg(short, long, default_value = "0.1")]
+        frequency: f32,
     },
     /// Apply a modification to a panel element
     PanelModify {
         /// The name of the overlay (XML file name without extension)
-    	overlay: String,
+        overlay: String,
         /// The id of the element to modify, as set in the XML
-    	element: String,
+        element: String,
         /// Command to execute
         #[command(subcommand)]
-    	command: SubcommandPanelModify,
-    }
-
+        command: SubcommandPanelModify,
+    },
 }
 
 #[derive(clap::Parser, Debug)]
@@ -271,11 +320,7 @@ enum SubcommandPanelModify {
         absolute_path: String,
     },
     /// Set the visibility of a <div>, <rectangle>, <label>, <sprite> or <image>
-    SetVisible {
-        visible_0_or_1: u8,
-    },
+    SetVisible { visible_0_or_1: u8 },
     /// Set the sticky state of a <Button>. Intended for buttons without `sticky="1"`.
-    SetStickyState {
-        sticky_state_0_or_1: u8,
-    }
+    SetStickyState { sticky_state_0_or_1: u8 },
 }
diff --git a/wgui/src/components/button.rs b/wgui/src/components/button.rs
index 95656b2..9d88782 100644
--- a/wgui/src/components/button.rs
+++ b/wgui/src/components/button.rs
@@ -1,25 +1,24 @@
 use crate::{
 	animation::{Animation, AnimationEasing},
 	assets::AssetPath,
-	components::{self, tooltip::ComponentTooltip, Component, ComponentBase, ComponentTrait, RefreshData},
+	components::{self, Component, ComponentBase, ComponentTrait, RefreshData, tooltip::ComponentTooltip},
 	drawing::{self, Boundary, Color},
 	event::{CallbackDataCommon, EventListenerCollection, EventListenerID, EventListenerKind},
 	i18n::Translation,
 	layout::{LayoutTask, WidgetID, WidgetPair},
 	renderer_vk::{
 		text::{
-			custom_glyph::{CustomGlyphContent, CustomGlyphData},
 			FontWeight, TextStyle,
+			custom_glyph::{CustomGlyphContent, CustomGlyphData},
 		},
 		util::centered_matrix,
 	},
 	widget::{
-		self,
+		self, ConstructEssentials, EventResult, WidgetData,
 		label::{WidgetLabel, WidgetLabelParams},
 		rectangle::{WidgetRectangle, WidgetRectangleParams},
 		sprite::{WidgetSprite, WidgetSpriteParams},
 		util::WLength,
-		ConstructEssentials, EventResult, WidgetData,
 	},
 };
 use glam::{Mat4, Vec3};
@@ -28,7 +27,7 @@ use std::{
 	rc::Rc,
 	time::{Duration, Instant},
 };
-use taffy::{prelude::length, AlignItems, JustifyContent};
+use taffy::{AlignItems, JustifyContent, prelude::length};
 
 pub struct Params<'a> {
 	pub text: Option<Translation>, // if unset, label will not be populated
diff --git a/wgui/src/components/checkbox.rs b/wgui/src/components/checkbox.rs
index 71195c9..a401a85 100644
--- a/wgui/src/components/checkbox.rs
+++ b/wgui/src/components/checkbox.rs
@@ -1,7 +1,7 @@
 use std::{cell::RefCell, rc::Rc};
 use taffy::{
-	prelude::{length, percent},
 	AlignItems,
+	prelude::{length, percent},
 };
 
 use crate::{
@@ -13,10 +13,10 @@ use crate::{
 	layout::{self, WidgetID, WidgetPair},
 	renderer_vk::text::{FontWeight, TextStyle},
 	widget::{
+		ConstructEssentials, EventResult,
 		label::{WidgetLabel, WidgetLabelParams},
 		rectangle::{WidgetRectangle, WidgetRectangleParams},
 		util::WLength,
-		ConstructEssentials, EventResult,
 	},
 };
 
diff --git a/wgui/src/components/slider.rs b/wgui/src/components/slider.rs
index 1b7f0f7..bc2b69f 100644
--- a/wgui/src/components/slider.rs
+++ b/wgui/src/components/slider.rs
@@ -18,11 +18,11 @@ use crate::{
 		util,
 	},
 	widget::{
+		ConstructEssentials, EventResult,
 		div::WidgetDiv,
 		label::{WidgetLabel, WidgetLabelParams},
 		rectangle::{WidgetRectangle, WidgetRectangleParams},
 		util::WLength,
-		ConstructEssentials, EventResult,
 	},
 };
 
diff --git a/wgui/src/drawing.rs b/wgui/src/drawing.rs
index e439d8c..df83fb8 100644
--- a/wgui/src/drawing.rs
+++ b/wgui/src/drawing.rs
@@ -10,8 +10,8 @@ use crate::{
 	globals::Globals,
 	layout::Widget,
 	renderer_vk::text::{
-		custom_glyph::{CustomGlyph, CustomGlyphData},
 		TextShadow,
+		custom_glyph::{CustomGlyph, CustomGlyphData},
 	},
 	stack::{self, ScissorBoundary, ScissorStack, TransformStack},
 	widget::{self, ScrollbarInfo, WidgetState},
diff --git a/wgui/src/parser/component_button.rs b/wgui/src/parser/component_button.rs
index 51727d1..685dd1d 100644
--- a/wgui/src/parser/component_button.rs
+++ b/wgui/src/parser/component_button.rs
@@ -1,13 +1,13 @@
 use crate::{
 	assets::AssetPath,
-	components::{button, tooltip, Component},
+	components::{Component, button, tooltip},
 	drawing::Color,
 	i18n::Translation,
 	layout::WidgetID,
 	parser::{
-		parse_check_f32, parse_check_i32, parse_children, parse_f32, print_invalid_attrib, process_component,
+		AttribPair, ParserContext, ParserFile, parse_check_f32, parse_check_i32, parse_children, parse_f32,
+		print_invalid_attrib, process_component,
 		style::{parse_color_opt, parse_round, parse_style, parse_text_style},
-		AttribPair, ParserContext, ParserFile,
 	},
 	widget::util::WLength,
 };
diff --git a/wgui/src/parser/mod.rs b/wgui/src/parser/mod.rs
index 2d1220c..93343ed 100644
--- a/wgui/src/parser/mod.rs
+++ b/wgui/src/parser/mod.rs
@@ -9,7 +9,7 @@ mod widget_rectangle;
 mod widget_sprite;
 
 use crate::{
-	assets::{normalize_path, AssetPath, AssetPathOwned},
+	assets::{AssetPath, AssetPathOwned, normalize_path},
 	components::{Component, ComponentWeak},
 	drawing::{self},
 	globals::WguiGlobals,
diff --git a/wgui/src/parser/style.rs b/wgui/src/parser/style.rs
index 8ae92aa..2a308d9 100644
--- a/wgui/src/parser/style.rs
+++ b/wgui/src/parser/style.rs
@@ -6,8 +6,8 @@ use taffy::{
 use crate::{
 	drawing,
 	parser::{
-		is_percent, parse_color_hex, parse_f32, parse_percent, parse_size_unit, parse_val, print_invalid_attrib,
-		print_invalid_value, AttribPair,
+		AttribPair, is_percent, parse_color_hex, parse_f32, parse_percent, parse_size_unit, parse_val,
+		print_invalid_attrib, print_invalid_value,
 	},
 	renderer_vk::text::{FontWeight, HorizontalAlign, TextStyle},
 	widget::util::WLength,
diff --git a/wgui/src/parser/widget_image.rs b/wgui/src/parser/widget_image.rs
index 0b4b44a..ff74006 100644
--- a/wgui/src/parser/widget_image.rs
+++ b/wgui/src/parser/widget_image.rs
@@ -2,9 +2,8 @@ use crate::{
 	assets::AssetPath,
 	layout::WidgetID,
 	parser::{
-		parse_children, parse_widget_universal, print_invalid_attrib,
+		AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, print_invalid_attrib,
 		style::{parse_color, parse_round, parse_style},
-		AttribPair, ParserContext, ParserFile,
 	},
 	renderer_vk::text::custom_glyph::{CustomGlyphContent, CustomGlyphData},
 	widget::image::{WidgetImage, WidgetImageParams},
diff --git a/wgui/src/parser/widget_rectangle.rs b/wgui/src/parser/widget_rectangle.rs
index 0b42326..3346304 100644
--- a/wgui/src/parser/widget_rectangle.rs
+++ b/wgui/src/parser/widget_rectangle.rs
@@ -2,9 +2,8 @@ use crate::{
 	drawing::GradientMode,
 	layout::WidgetID,
 	parser::{
-		parse_children, parse_widget_universal, print_invalid_attrib,
+		AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, print_invalid_attrib,
 		style::{parse_color, parse_round, parse_style},
-		AttribPair, ParserContext, ParserFile,
 	},
 	widget::rectangle::{WidgetRectangle, WidgetRectangleParams},
 };
diff --git a/wgui/src/parser/widget_sprite.rs b/wgui/src/parser/widget_sprite.rs
index 8c3735e..fc86f16 100644
--- a/wgui/src/parser/widget_sprite.rs
+++ b/wgui/src/parser/widget_sprite.rs
@@ -1,7 +1,7 @@
 use crate::{
 	assets::AssetPath,
 	layout::WidgetID,
-	parser::{parse_children, parse_widget_universal, style::parse_style, AttribPair, ParserContext, ParserFile},
+	parser::{AttribPair, ParserContext, ParserFile, parse_children, parse_widget_universal, style::parse_style},
 	renderer_vk::text::custom_glyph::{CustomGlyphContent, CustomGlyphData},
 	widget::sprite::{WidgetSprite, WidgetSpriteParams},
 };
diff --git a/wgui/src/renderer_vk/context.rs b/wgui/src/renderer_vk/context.rs
index 895f06d..66a9d1a 100644
--- a/wgui/src/renderer_vk/context.rs
+++ b/wgui/src/renderer_vk/context.rs
@@ -2,22 +2,22 @@ use std::{cell::RefCell, rc::Rc, sync::Arc};
 
 use cosmic_text::Buffer;
 use glam::{Mat4, Vec2, Vec3};
-use slotmap::{new_key_type, SlotMap};
+use slotmap::{SlotMap, new_key_type};
 use vulkano::pipeline::graphics::viewport;
 
 use crate::{
 	drawing::{self},
 	font_config,
-	gfx::{cmd::GfxCommandBuffer, WGfx},
+	gfx::{WGfx, cmd::GfxCommandBuffer},
 	renderer_vk::image::{ImagePipeline, ImageRenderer},
 };
 
 use super::{
 	rect::{RectPipeline, RectRenderer},
 	text::{
+		DEFAULT_METRICS, SWASH_CACHE, TextArea, TextBounds,
 		text_atlas::{TextAtlas, TextPipeline},
 		text_renderer::TextRenderer,
-		TextArea, TextBounds, DEFAULT_METRICS, SWASH_CACHE,
 	},
 	viewport::Viewport,
 };
diff --git a/wgui/src/renderer_vk/image.rs b/wgui/src/renderer_vk/image.rs
index 9b8e0aa..95d8e96 100644
--- a/wgui/src/renderer_vk/image.rs
+++ b/wgui/src/renderer_vk/image.rs
@@ -14,10 +14,10 @@ use vulkano::{
 use crate::{
 	drawing::{Boundary, ImagePrimitive},
 	gfx::{
+		BLEND_ALPHA, WGfx,
 		cmd::GfxCommandBuffer,
 		pass::WGfxPass,
 		pipeline::{WGfxPipeline, WPipelineCreateInfo},
-		WGfx, BLEND_ALPHA,
 	},
 	renderer_vk::{
 		model_buffer::ModelBuffer,
diff --git a/wgui/src/renderer_vk/rect.rs b/wgui/src/renderer_vk/rect.rs
index b1e52e7..54eb908 100644
--- a/wgui/src/renderer_vk/rect.rs
+++ b/wgui/src/renderer_vk/rect.rs
@@ -10,10 +10,10 @@ use vulkano::{
 use crate::{
 	drawing::{Boundary, Rectangle},
 	gfx::{
+		BLEND_ALPHA, WGfx,
 		cmd::GfxCommandBuffer,
 		pass::WGfxPass,
 		pipeline::{WGfxPipeline, WPipelineCreateInfo},
-		WGfx, BLEND_ALPHA,
 	},
 	renderer_vk::model_buffer::ModelBuffer,
 };
diff --git a/wgui/src/renderer_vk/text/custom_glyph.rs b/wgui/src/renderer_vk/text/custom_glyph.rs
index 66ac8f7..fd17608 100644
--- a/wgui/src/renderer_vk/text/custom_glyph.rs
+++ b/wgui/src/renderer_vk/text/custom_glyph.rs
@@ -1,8 +1,8 @@
 use std::{
 	f32,
 	sync::{
-		atomic::{AtomicUsize, Ordering},
 		Arc,
+		atomic::{AtomicUsize, Ordering},
 	},
 };
 
diff --git a/wgui/src/widget/image.rs b/wgui/src/widget/image.rs
index f02aaeb..0b27aa4 100644
--- a/wgui/src/widget/image.rs
+++ b/wgui/src/widget/image.rs
@@ -8,7 +8,7 @@ use crate::{
 	globals::Globals,
 	layout::WidgetID,
 	renderer_vk::text::custom_glyph::CustomGlyphData,
-	widget::{util::WLength, WidgetStateFlags},
+	widget::{WidgetStateFlags, util::WLength},
 };
 
 use super::{WidgetObj, WidgetState};
diff --git a/wgui/src/widget/mod.rs b/wgui/src/widget/mod.rs
index 912436d..75f7854 100644
--- a/wgui/src/widget/mod.rs
+++ b/wgui/src/widget/mod.rs
@@ -206,11 +206,7 @@ impl EventResult {
 
 	#[must_use]
 	pub fn merge(self, other: Self) -> Self {
-		if self > other {
-			self
-		} else {
-			other
-		}
+		if self > other { self } else { other }
 	}
 }
 
diff --git a/wgui/src/widget/rectangle.rs b/wgui/src/widget/rectangle.rs
index aae553e..fdab121 100644
--- a/wgui/src/widget/rectangle.rs
+++ b/wgui/src/widget/rectangle.rs
@@ -4,7 +4,7 @@ use crate::{
 	drawing::{self, GradientMode, PrimitiveExtent},
 	event::CallbackDataCommon,
 	layout::WidgetID,
-	widget::{util::WLength, WidgetStateFlags},
+	widget::{WidgetStateFlags, util::WLength},
 };
 
 use super::{WidgetObj, WidgetState};
diff --git a/wgui/src/widget/sprite.rs b/wgui/src/widget/sprite.rs
index 50e9c81..ce01f3a 100644
--- a/wgui/src/widget/sprite.rs
+++ b/wgui/src/widget/sprite.rs
@@ -9,8 +9,8 @@ use crate::{
 	globals::Globals,
 	layout::WidgetID,
 	renderer_vk::text::{
-		custom_glyph::{CustomGlyph, CustomGlyphData},
 		DEFAULT_METRICS,
+		custom_glyph::{CustomGlyph, CustomGlyphData},
 	},
 	widget::WidgetStateFlags,
 };
diff --git a/wlx-overlay-s/src/gui/panel/mod.rs b/wlx-overlay-s/src/gui/panel/mod.rs
index 66a4d1f..a43665a 100644
--- a/wlx-overlay-s/src/gui/panel/mod.rs
+++ b/wlx-overlay-s/src/gui/panel/mod.rs
@@ -33,7 +33,6 @@ use crate::{
 use super::timer::GuiTimer;
 
 pub mod button;
-mod helper;
 mod label;
 
 const DEFAULT_MAX_SIZE: f32 = 2048.0;

From 49b6234db3888228726d5ebcc07f33912c33749b Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Wed, 24 Dec 2025 01:11:54 +0900
Subject: [PATCH 28/29] cleanup

---
 wlx-overlay-s/src/gui/panel/button.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/wlx-overlay-s/src/gui/panel/button.rs b/wlx-overlay-s/src/gui/panel/button.rs
index cdfd292..56c9b56 100644
--- a/wlx-overlay-s/src/gui/panel/button.rs
+++ b/wlx-overlay-s/src/gui/panel/button.rs
@@ -10,10 +10,7 @@ use std::{
 use anyhow::Context;
 use wgui::{
     components::button::ComponentButton,
-    event::{
-        self, CallbackData, CallbackMetadata, EventCallback, EventListenerKind, MouseButtonIndex,
-    },
-    i18n::Translation,
+    event::{CallbackData, CallbackMetadata, EventCallback, EventListenerKind, MouseButtonIndex},
     layout::Layout,
     parser::CustomAttribsInfoOwned,
     widget::EventResult,
@@ -23,7 +20,6 @@ use wlx_common::overlays::ToastTopic;
 use crate::{
     RUNNING,
     backend::task::{OverlayTask, PlayspaceTask, TaskType},
-    gui::panel::helper::PipeReaderThread,
     overlays::toast::Toast,
     state::AppState,
     subsystem::hid::VirtualKey,

From ca814e6ecbc31d4a2780af226cbdf3dcd75d2f6c Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Wed, 24 Dec 2025 01:51:25 +0900
Subject: [PATCH 29/29] wayvrctl: allow unquoted strings on set-text

---
 wayvrctl/src/main.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wayvrctl/src/main.rs b/wayvrctl/src/main.rs
index ed47b82..084fa87 100644
--- a/wayvrctl/src/main.rs
+++ b/wayvrctl/src/main.rs
@@ -175,7 +175,7 @@ async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()
         } => {
             let command = match command {
                 SubcommandPanelModify::SetText { text } => {
-                    packet_client::WlxModifyPanelCommand::SetText(text)
+                    packet_client::WlxModifyPanelCommand::SetText(text.join(" "))
                 }
                 SubcommandPanelModify::SetColor { hex_color } => {
                     packet_client::WlxModifyPanelCommand::SetColor(hex_color)
@@ -307,7 +307,8 @@ enum SubcommandPanelModify {
     /// Set the text of a <label> or <Button>
     SetText {
         /// Text that needs to be set
-        text: String,
+        #[arg(num_args = 1.., action = clap::ArgAction::Append)]
+        text: Vec<String>,
     },
     /// Set the color of a <rectangle> or <label> or monochrome <sprite>
     SetColor {