diff --git a/wayvr-ipc/src/client.rs b/wayvr-ipc/src/client.rs
index 500973a..7091175 100644
--- a/wayvr-ipc/src/client.rs
+++ b/wayvr-ipc/src/client.rs
@@ -410,6 +410,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 2afc66f..b6e3655 100644
--- a/wayvr-ipc/src/packet_client.rs
+++ b/wayvr-ipc/src/packet_client.rs
@@ -67,4 +67,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 43cea32..dafda99 100644
--- a/wayvrctl/src/helper.rs
+++ b/wayvrctl/src/helper.rs
@@ -156,6 +156,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 91f6893..cb1fea7 100644
--- a/wayvrctl/src/main.rs
+++ b/wayvrctl/src/main.rs
@@ -163,6 +163,9 @@ 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,
@@ -268,6 +271,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/assets/lang/ja.json b/wlx-overlay-s/src/assets/lang/ja.json
index 04f2364..4b5e57d 100644
--- a/wlx-overlay-s/src/assets/lang/ja.json
+++ b/wlx-overlay-s/src/assets/lang/ja.json
@@ -58,7 +58,7 @@
"ALIGN_TO_HMD": "常にHMDの方を向く",
"MOUSE": {
"TITLE": "マウスの修正",
- "WRONG_SCREEN_SELECTION_HELP": "カーソルが全く別のスクリーンで動く場合、\nスクリーンが正しく選択されていない可能性があります。\nマニュアルをご確認ください。",
+ "WRONG_SCREEN_SELECTION_HELP": "カーソルが全く別のスクリーンで動く場合、\nスクリーンが正しく選択されていない可能性があります。\nReadmeをご参照ください。",
"NORMAL": "通常",
"FLIPPED": "ミラー",
"FLIP90": "ミラー 90°",
@@ -95,4 +95,4 @@
"CANNOT_ADD_SET": "セットを追加できません!",
"MAXIMUM_SETS_REACHED": "最大セット数に達しました。"
}
-}
\ No newline at end of file
+}
diff --git a/wlx-overlay-s/src/gui/README.md b/wlx-overlay-s/src/gui/README.md
index ff41ccf..4c77098 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
```
+#### 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
+
+```
+
#### 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 45cdc2a..054b805 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::{
@@ -138,6 +139,19 @@ pub(super) fn setup_custom_label(
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)
@@ -217,6 +231,30 @@ fn clock_on_tick(
label.set_text(common, Translation::from_raw_text(&date_time));
}
+struct TimerLabelState {
+ start: DateTime,
+ format: Rc,
+}
+
+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::().unwrap();
+ label.set_text(common, Translation::from_raw_text(&time));
+}
+
fn ipd_on_tick(
common: &mut event::CallbackDataCommon,
data: &mut event::CallbackData,
diff --git a/wlx-overlay-s/src/ipc/events.rs b/wlx-overlay-s/src/ipc/events.rs
index 0d7d3f8..3a8549a 100644
--- a/wlx-overlay-s/src/ipc/events.rs
+++ b/wlx-overlay-s/src/ipc/events.rs
@@ -50,6 +50,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 869991f..7b6d99a 100644
--- a/wlx-overlay-s/src/ipc/ipc_server.rs
+++ b/wlx-overlay-s/src/ipc/ipc_server.rs
@@ -350,6 +350,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,
@@ -424,6 +430,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 aaac9d0..74a1ed5 100644
--- a/wlx-overlay-s/src/ipc/signal.rs
+++ b/wlx-overlay-s/src/ipc/signal.rs
@@ -4,5 +4,6 @@ pub enum WayVRSignal {
BroadcastStateChanged(wayvr_ipc::packet_server::WvrStateChanged),
DeviceHaptics(usize, crate::backend::input::Haptics),
DropOverlay(crate::windowing::OverlayID),
+ ShowHide,
CustomTask(crate::backend::task::ModifyPanelTask),
}