From 13630d5d3dc3cd31799ec945fc3cd32178e02bf1 Mon Sep 17 00:00:00 2001
From: Mitsuami <173323057+mitsuami-megane@users.noreply.github.com>
Date: Sun, 28 Dec 2025 08:37:53 +0000
Subject: [PATCH 1/4] update ja locale (#332)

---
 wlx-overlay-s/src/assets/lang/ja.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wlx-overlay-s/src/assets/lang/ja.json b/wlx-overlay-s/src/assets/lang/ja.json
index 3a90773..6a7e1ad 100644
--- a/wlx-overlay-s/src/assets/lang/ja.json
+++ b/wlx-overlay-s/src/assets/lang/ja.json
@@ -47,7 +47,7 @@
     "ALIGN_TO_HMD": "常にHMDの方を向く",
     "MOUSE": {
       "TITLE": "マウスの修正",
-      "WRONG_SCREEN_SELECTION_HELP": "カーソルが全く別のスクリーンで動く場合、\nスクリーンが正しく選択されていない可能性があります。\nマニュアルをご確認ください。",
+      "WRONG_SCREEN_SELECTION_HELP": "カーソルが全く別のスクリーンで動く場合、\nスクリーンが正しく選択されていない可能性があります。\nReadmeをご参照ください。",
       "NORMAL": "通常",
       "FLIPPED": "ミラー",
       "FLIP90": "ミラー 90°",
@@ -82,4 +82,4 @@
     "FIXING_FLOOR": "5秒後にフロアを固定します...",
     "ONE_CONTROLLER_ON_FLOOR": "コントローラーを床に置いてください！"
   }
-}
\ No newline at end of file
+}

From 951abc70b02ad59a5034b2827449bc2a833ccba7 Mon Sep 17 00:00:00 2001
From: Aleksander <aleksander@oo8.dev>
Date: Sun, 28 Dec 2025 16:25:48 +0100
Subject: [PATCH 2/4] fix wayvr-dashboard appimage build (#333)

---
 .github/workflows/scripts/appimage_build_wayvr_dashboard.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/scripts/appimage_build_wayvr_dashboard.sh b/.github/workflows/scripts/appimage_build_wayvr_dashboard.sh
index 5fba8bb..37f30c4 100755
--- a/.github/workflows/scripts/appimage_build_wayvr_dashboard.sh
+++ b/.github/workflows/scripts/appimage_build_wayvr_dashboard.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 WAYVR_DASHBOARD_PATH="/tmp/wayvr-dashboard"
 
-WLX_DIR=$(realpath $(pwd))
+MAIN_DIR=$(realpath $(pwd))
 
 # built wayvr-dashboard binary executable path
 DASH_PATH="${WAYVR_DASHBOARD_PATH}/temp/wayvr-dashboard"
@@ -12,7 +12,7 @@ cd ${WAYVR_DASHBOARD_PATH}
 .github/workflows/build.sh
 
 # See https://github.com/olekolek1000/wayvr-dashboard/blob/master/.github/workflows/appimage.sh
-cd ..
+cd ${MAIN_DIR}
 cd ${APPDIR}
 
 # Fix webkit
@@ -30,7 +30,7 @@ TARGET_WEBKIT_SO="./usr/lib/libwebkit2gtk-4.1.so.0"
 cp /usr/lib/x86_64-linux-gnu/libwebkit2gtk-4.1.so.0 ${TARGET_WEBKIT_SO}
 sed -i -e "s|/usr|././|g" "${TARGET_WEBKIT_SO}"
 
-cd ${WLX_DIR}
+cd ${MAIN_DIR}
 
 chmod +x ${DASH_PATH}
 

From 36f64c5027bf5c6652b0c82387fa0e3d2c2e2eef Mon Sep 17 00:00:00 2001
From: Stuart Irwin <stuin01@gmail.com>
Date: Wed, 31 Dec 2025 17:59:48 -0800
Subject: [PATCH 3/4] Readd uptime timer label (#336)

* Readd uptime timer label

* Fixed timer formatting
---
 wlx-overlay-s/src/gui/README.md      | 10 ++++++++
 wlx-overlay-s/src/gui/panel/label.rs | 38 ++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/wlx-overlay-s/src/gui/README.md b/wlx-overlay-s/src/gui/README.md
index d7b0cda..be09142 100644
--- a/wlx-overlay-s/src/gui/README.md
+++ b/wlx-overlay-s/src/gui/README.md
@@ -18,6 +18,16 @@ See the Custom Timezones section for more info on timezones. Skip `_timezone` to
 <label _source="clock" _display="time" _timezone="0" [...] />
 ```
 
+#### Timer label
+
+Instead of a clock, this label shows the amount of time since program start, (aka time in VR).
+
+Use `_format` to arrange `%h` hours, `%m` minutes, and `%s` seconds.
+
+```xml
+<label _source="timer" _format="%h:%m:%s" [...] />
+```
+
 #### Battery label
 
 This is a label type that's used internally to display battery states.
diff --git a/wlx-overlay-s/src/gui/panel/label.rs b/wlx-overlay-s/src/gui/panel/label.rs
index ea4b688..72bce9d 100644
--- a/wlx-overlay-s/src/gui/panel/label.rs
+++ b/wlx-overlay-s/src/gui/panel/label.rs
@@ -1,5 +1,6 @@
 use std::rc::Rc;
 
+use chrono::DateTime;
 use chrono::Local;
 use chrono_tz::Tz;
 use wgui::{
@@ -121,6 +122,19 @@ pub(super) fn setup_custom_label<S: 'static>(
                 Ok(EventResult::Pass)
             })
         }
+        "timer" => {
+            let format = attribs.get_value("_format").unwrap_or("%h:%m");
+
+            let state = TimerLabelState {
+                start: Local::now(),
+                format: format.into(),
+            };
+
+            Box::new(move |common, data, _, _| {
+                timer_on_tick(&state, common, data);
+                Ok(EventResult::Pass)
+            })
+        }
         "ipd" => Box::new(|common, data, app, _| {
             ipd_on_tick(common, data, app);
             Ok(EventResult::Pass)
@@ -198,6 +212,30 @@ fn clock_on_tick(
     label.set_text(common, Translation::from_raw_text(&date_time));
 }
 
+struct TimerLabelState {
+    start: DateTime<Local>,
+    format: Rc<str>,
+}
+
+fn timer_on_tick(
+    state: &TimerLabelState,
+    common: &mut event::CallbackDataCommon,
+    data: &mut event::CallbackData,
+) {
+    let duration = Local::now()
+        .signed_duration_since(&state.start)
+        .num_seconds();
+
+    let time = &state
+        .format
+        .replace("%s", &format!("{:02}", (duration % 60)))
+        .replace("%m", &format!("{:02}", ((duration / 60) % 60)))
+        .replace("%h", &format!("{:02}", ((duration / 60) / 60)));
+
+    let label = data.obj.get_as_mut::<WidgetLabel>().unwrap();
+    label.set_text(common, Translation::from_raw_text(&time));
+}
+
 fn ipd_on_tick(
     common: &mut event::CallbackDataCommon,
     data: &mut event::CallbackData,

From dd3486f06ba0c1aaf4cf020a4403e7eaedbbf948 Mon Sep 17 00:00:00 2001
From: Amos Wong <8733840+amoshydra@users.noreply.github.com>
Date: Sun, 4 Jan 2026 20:53:47 +0800
Subject: [PATCH 4/4] feat: add wayvrctl ipc for overlay show hide (#338)

---
 wayvr-ipc/src/client.rs             |  7 +++++++
 wayvr-ipc/src/packet_client.rs      |  1 +
 wayvrctl/src/helper.rs              | 12 ++++++++++++
 wayvrctl/src/main.rs                |  8 +++++++-
 wlx-overlay-s/src/ipc/events.rs     |  4 ++++
 wlx-overlay-s/src/ipc/ipc_server.rs |  9 +++++++++
 wlx-overlay-s/src/ipc/signal.rs     |  1 +
 7 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/wayvr-ipc/src/client.rs b/wayvr-ipc/src/client.rs
index b742ef4..d9e0fa5 100644
--- a/wayvr-ipc/src/client.rs
+++ b/wayvr-ipc/src/client.rs
@@ -495,6 +495,13 @@ impl WayVRClient {
 		Ok(())
 	}
 
+	pub async fn fn_wlx_overlay_show_hide(
+		client: WayVRClientMutex,
+	) -> anyhow::Result<()> {
+		send_only!(client, &PacketClient::WlxShowHide);
+		Ok(())
+	}
+
 	pub async fn fn_wlx_modify_panel(
 		client: WayVRClientMutex,
 		params: packet_client::WlxModifyPanelParams,
diff --git a/wayvr-ipc/src/packet_client.rs b/wayvr-ipc/src/packet_client.rs
index 3cb046b..37ac1ae 100644
--- a/wayvr-ipc/src/packet_client.rs
+++ b/wayvr-ipc/src/packet_client.rs
@@ -86,4 +86,5 @@ pub enum PacketClient {
 	WlxInputState(Serial),
 	WlxModifyPanel(WlxModifyPanelParams),
 	WlxDeviceHaptics(usize, WlxHapticsParams),
+	WlxShowHide,
 }
diff --git a/wayvrctl/src/helper.rs b/wayvrctl/src/helper.rs
index 7ab0d17..63f9ee8 100644
--- a/wayvrctl/src/helper.rs
+++ b/wayvrctl/src/helper.rs
@@ -236,6 +236,18 @@ pub async fn wlx_device_haptics(
     )
 }
 
+pub async fn wlx_overlay_show_hide(
+    state: &mut WayVRClientState,
+) {
+    handle_empty_result(
+        WayVRClient::fn_wlx_overlay_show_hide(
+            state.wayvr_client.clone(),
+        )
+        .await
+        .context("failed to trigger overlay show hide"),
+    )
+}
+
 pub async fn wlx_panel_modify(
     state: &mut WayVRClientState,
     overlay: String,
diff --git a/wayvrctl/src/main.rs b/wayvrctl/src/main.rs
index 1676bd4..e94cca9 100644
--- a/wayvrctl/src/main.rs
+++ b/wayvrctl/src/main.rs
@@ -10,7 +10,7 @@ use env_logger::Env;
 use wayvr_ipc::{client::WayVRClient, ipc, packet_client};
 
 use crate::helper::{
-    WayVRClientState, wlx_device_haptics, wlx_input_state, wlx_panel_modify, wvr_display_create,
+    WayVRClientState, wlx_overlay_show_hide, wlx_device_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,
@@ -169,6 +169,10 @@ async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()
         } => {
             wlx_device_haptics(state, device, intensity, duration, frequency).await;
         }
+        Subcommands::ShowHide {
+        } => {
+            wlx_overlay_show_hide(state).await;
+        }
         Subcommands::PanelModify {
             overlay,
             element,
@@ -293,6 +297,8 @@ enum Subcommands {
         #[arg(short, long, default_value = "0.1")]
         frequency: f32,
     },
+    /// Toggle overlay show or hide
+    ShowHide,
     /// Apply a modification to a panel element
     PanelModify {
         /// The name of the overlay (XML file name without extension)
diff --git a/wlx-overlay-s/src/ipc/events.rs b/wlx-overlay-s/src/ipc/events.rs
index 4c87e3e..c477df0 100644
--- a/wlx-overlay-s/src/ipc/events.rs
+++ b/wlx-overlay-s/src/ipc/events.rs
@@ -165,6 +165,10 @@ where
                 app.tasks
                     .enqueue(TaskType::Input(InputTask::Haptics { device, haptics }));
             }
+            WayVRSignal::ShowHide => {
+                app.tasks
+                    .enqueue(TaskType::Overlay(OverlayTask::ShowHide));
+            }
             WayVRSignal::DropOverlay(overlay_id) => {
                 app.tasks
                     .enqueue(TaskType::Overlay(OverlayTask::Drop(OverlaySelector::Id(
diff --git a/wlx-overlay-s/src/ipc/ipc_server.rs b/wlx-overlay-s/src/ipc/ipc_server.rs
index 9ee919d..97d699e 100644
--- a/wlx-overlay-s/src/ipc/ipc_server.rs
+++ b/wlx-overlay-s/src/ipc/ipc_server.rs
@@ -522,6 +522,12 @@ impl Connection {
         ));
     }
 
+    fn handle_wlx_overlay_show_hide(
+        params: &mut TickParams
+    ) {
+        params.signals.send(WayVRSignal::ShowHide);
+    }
+
     fn handle_wlx_panel(
         params: &mut TickParams,
         custom_params: packet_client::WlxModifyPanelParams,
@@ -624,6 +630,9 @@ impl Connection {
             PacketClient::WlxDeviceHaptics(device, haptics_params) => {
                 Self::handle_wlx_device_haptics(params, device, haptics_params);
             }
+            PacketClient::WlxShowHide => {
+                Self::handle_wlx_overlay_show_hide(params);
+            }
             PacketClient::WlxModifyPanel(custom_params) => {
                 Self::handle_wlx_panel(params, custom_params);
             }
diff --git a/wlx-overlay-s/src/ipc/signal.rs b/wlx-overlay-s/src/ipc/signal.rs
index 9cdb69a..e5a9eaf 100644
--- a/wlx-overlay-s/src/ipc/signal.rs
+++ b/wlx-overlay-s/src/ipc/signal.rs
@@ -16,5 +16,6 @@ pub enum WayVRSignal {
     Haptics(crate::backend::input::Haptics),
     DeviceHaptics(usize, crate::backend::input::Haptics),
     DropOverlay(crate::windowing::OverlayID),
+    ShowHide,
     CustomTask(crate::backend::task::ModifyPanelTask),
 }