wayvrctl: add panel-reload (#735)

This commit is contained in:
oo8dev authored and GitHub committed 2026-11-17 19:30:03 +01:00
1 parent 2ad29bec8a
commit 2df0c638ef
10 files changed
+129 -68

No files matched your search

@@ -3,18 +3,22 @@
<template name="RunningGameCell">
<GroupBox>
<Button id="btn_stop" sprite_src_builtin="@/dashboard/remove_circle.svg" tooltip="PROCESS.STOP" />
<Button id="btn_kill" sprite_src_builtin="@/dashboard/knife.svg" tooltip="PROCESS.FORCE_KILL" />
<label id="label_name" weight="bold" />
<div flex_direction="row" gap="8">
<Button id="btn_stop" sprite_src_builtin="@/dashboard/remove_circle.svg" tooltip="PROCESS.STOP" />
<Button id="btn_kill" sprite_src_builtin="@/dashboard/knife.svg" tooltip="PROCESS.FORCE_KILL" />
<label id="label_name" weight="bold" />
</div>
</GroupBox>
</template>
<elements>
<div align_items="center" gap="8">
<Button id="btn_refresh" tooltip="REFRESH" width="32" height="32" sprite_src_builtin="@/dashboard/refresh.svg" />
<sprite src_builtin="@/dashboard/cpu.svg" width="24" height="24" />
<label translation="GAME_LIST.RUNNING_GAMES_LIST" />
<div flex_direction="column" gap="8">
<div align_items="center" gap="8">
<Button id="btn_refresh" tooltip="REFRESH" width="32" height="32" sprite_src_builtin="@/dashboard/refresh.svg" />
<sprite src_builtin="@/dashboard/cpu.svg" width="24" height="24" />
<label translation="GAME_LIST.RUNNING_GAMES_LIST" />
</div>
<div id="list_parent" gap="8" flex_direction="column" />
</div>
<div id="list_parent" gap="8" flex_direction="column" />
</elements>
</layout>
+11 -3
View File
@@ -455,11 +455,19 @@ impl WayVRClient {
Ok(())
}
pub async fn fn_wlx_modify_panel(
pub async fn fn_wlx_panel_reload(
client: WayVRClientMutex,
params: packet_client::WlxModifyPanelParams,
params: packet_client::WlxPanelReloadParams,
) -> anyhow::Result<()> {
send_only!(client, &PacketClient::WlxModifyPanel(params));
send_only!(client, &PacketClient::WlxPanelReload(params));
Ok(())
}
pub async fn fn_wlx_panel_modify(
client: WayVRClientMutex,
params: packet_client::WlxPanelModifyParams,
) -> anyhow::Result<()> {
send_only!(client, &PacketClient::WlxPanelModify(params));
Ok(())
}
+10 -4
View File
@@ -65,7 +65,7 @@ pub struct WlxHapticsParams {
}
#[derive(Clone, Debug, Serialize, Deserialize)]
pub enum WlxModifyPanelCommand {
pub enum WlxPanelModifyCommand {
SetText(String),
SetColor(String),
SetImage(String),
@@ -74,10 +74,15 @@ pub enum WlxModifyPanelCommand {
}
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct WlxModifyPanelParams {
pub struct WlxPanelReloadParams {
pub overlay: String,
}
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct WlxPanelModifyParams {
pub overlay: String,
pub element: String,
pub command: WlxModifyPanelCommand,
pub command: WlxPanelModifyCommand,
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
@@ -211,7 +216,8 @@ pub enum PacketClient {
WvrProcessTerminate(packet_server::WvrProcessHandle),
WvrInputCapture(bool),
WlxInputState(Serial),
WlxModifyPanel(WlxModifyPanelParams),
WlxPanelReload(WlxPanelReloadParams),
WlxPanelModify(WlxPanelModifyParams),
WlxDeviceHaptics(usize, WlxHapticsParams),
WlxShowHide,
WlxSwitchSet(Option<usize>),
+3 -26
View File
@@ -30,8 +30,8 @@ use crate::{
task::{OverlayTask, PlayspaceTask, SpawnPos, TaskType, ToggleMode},
wayvr::process::KillSignal,
},
gui::panel::{log_cmd_invalid_arg, log_cmd_missing_arg},
overlays::{custom::create_custom, toast::Toast, wayvr::WvrCommand},
gui::panel::{custom_overlay_reload, log_cmd_invalid_arg, log_cmd_missing_arg},
overlays::{toast::Toast, wayvr::WvrCommand},
state::AppState,
subsystem::hid::VirtualKey,
windowing::{OverlaySelector, backend::OverlayEventData, window::OverlayCategory},
@@ -432,30 +432,7 @@ pub(super) fn setup_custom_button<S: 'static>(
return Ok(EventResult::Pass);
}
app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
OverlaySelector::Name(arg.clone()),
Box::new(|app, owc| {
if !matches!(owc.category, OverlayCategory::Panel) {
return;
}
let name = owc.name.clone();
app.tasks.enqueue(TaskType::Overlay(OverlayTask::Drop(
OverlaySelector::Name(name.clone()),
)));
app.tasks.enqueue(TaskType::Overlay(OverlayTask::Spawn(
OverlaySelector::Name(owc.name.clone()),
SpawnPos::Spread,
Box::new(move |app| {
if let Some(mut owc) = create_custom(app, name) {
owc.show_on_spawn = true;
Some(owc)
} else {
None
}
}),
)));
}),
)));
custom_overlay_reload(app, arg.clone());
Ok(EventResult::Consumed)
})
}
+41 -6
View File
@@ -1,13 +1,20 @@
use super::timer::GuiTimer;
use crate::{
app_misc,
backend::input::{Haptics, HoverResult, PointerHit, PointerMode},
backend::task::ModifyPanelCommand,
backend::{
input::{Haptics, HoverResult, PointerHit, PointerMode},
task::{ModifyPanelCommand, OverlayTask, SpawnPos, TaskType},
},
overlays::custom::create_custom,
state::AppState,
subsystem::hid::WheelDelta,
windowing::backend::{
FrameMeta, OverlayBackend, OverlayEventData, OverlayLifetimeUpdate, RenderResources,
ShouldRender, ui_transform,
windowing::{
OverlaySelector,
backend::{
FrameMeta, OverlayBackend, OverlayEventData, OverlayLifetimeUpdate, RenderResources,
ShouldRender, ui_transform,
},
window::OverlayCategory,
},
};
use anyhow::Context;
@@ -15,7 +22,7 @@ use button::setup_custom_button;
use glam::{Affine2, Vec2, vec2};
use idmap::IdMap;
use label::setup_custom_label;
use std::{cell::RefCell, collections::HashMap, rc::Rc};
use std::{cell::RefCell, collections::HashMap, rc::Rc, sync::Arc};
use wgui::{
assets::AssetPathRef,
components::{
@@ -512,6 +519,34 @@ fn log_cmd_invalid_arg(
);
}
pub fn custom_overlay_reload(app: &mut AppState, name: Arc<str>) {
app.tasks.enqueue(TaskType::Overlay(OverlayTask::Modify(
OverlaySelector::Name(name),
Box::new(|app, owc| {
if !matches!(owc.category, OverlayCategory::Panel) {
return;
}
let name = owc.name.clone();
app.tasks
.enqueue(TaskType::Overlay(OverlayTask::Drop(OverlaySelector::Name(
name.clone(),
))));
app.tasks.enqueue(TaskType::Overlay(OverlayTask::Spawn(
OverlaySelector::Name(owc.name.clone()),
SpawnPos::Spread,
Box::new(move |app| {
if let Some(mut owc) = create_custom(app, name) {
owc.show_on_spawn = true;
Some(owc)
} else {
None
}
}),
)));
}),
)));
}
pub fn apply_custom_command<T>(
panel: &mut GuiPanel<T>,
app: &mut AppState,
+4
View File
@@ -1,6 +1,7 @@
use std::sync::Arc;
use crate::backend::wayvr::{WayVRTask, WvrServerState};
use crate::gui::panel::custom_overlay_reload;
use wayvr_ipc::packet_client::{HandsfreeMode, HandsfreeParams};
use wayvr_ipc::packet_server::PacketServer;
use wlx_common::config::HandsfreePointer;
@@ -39,6 +40,9 @@ where
app.tasks
.enqueue(TaskType::Overlay(OverlayTask::SwitchSet(set)));
}
WayVRSignal::PanelReload(params) => {
custom_overlay_reload(app, params.overlay.into());
}
WayVRSignal::CustomTask(custom_task) => {
app.tasks
.enqueue(TaskType::Overlay(OverlayTask::ModifyPanel(custom_task)));
+17 -10
View File
@@ -13,7 +13,7 @@ use interprocess::local_socket::{self, ToNsName, traits::Listener};
use smallvec::SmallVec;
use std::io::{Read, Write};
use std::sync::atomic::{AtomicU64, Ordering};
use wayvr_ipc::packet_client::HandsfreeParams;
use wayvr_ipc::packet_client::{HandsfreeParams, WlxPanelReloadParams};
use wayvr_ipc::{
ipc::{self},
packet_client::{self, PacketClient},
@@ -397,9 +397,13 @@ impl Connection {
.send(WayVRSignal::SetOverlayVisible(overlay, visible));
}
fn handle_wlx_panel(
fn handle_wlx_panel_reload(params: &mut TickParams, payload: WlxPanelReloadParams) {
params.signals.send(WayVRSignal::PanelReload(payload));
}
fn handle_wlx_panel_modify(
params: &mut TickParams,
custom_params: packet_client::WlxModifyPanelParams,
custom_params: packet_client::WlxPanelModifyParams,
) {
use crate::backend::task::{ModifyPanelCommand, ModifyPanelTask};
@@ -409,19 +413,19 @@ impl Connection {
overlay: custom_params.overlay,
element: custom_params.element,
command: match custom_params.command {
packet_client::WlxModifyPanelCommand::SetText(text) => {
packet_client::WlxPanelModifyCommand::SetText(text) => {
ModifyPanelCommand::SetText(text)
}
packet_client::WlxModifyPanelCommand::SetImage(sprite) => {
packet_client::WlxPanelModifyCommand::SetImage(sprite) => {
ModifyPanelCommand::SetImage(sprite)
}
packet_client::WlxModifyPanelCommand::SetStickyState(sticky) => {
packet_client::WlxPanelModifyCommand::SetStickyState(sticky) => {
ModifyPanelCommand::SetStickyState(sticky)
}
packet_client::WlxModifyPanelCommand::SetVisible(visible) => {
packet_client::WlxPanelModifyCommand::SetVisible(visible) => {
ModifyPanelCommand::SetVisible(visible)
}
packet_client::WlxModifyPanelCommand::SetColor(color) => {
packet_client::WlxPanelModifyCommand::SetColor(color) => {
ModifyPanelCommand::SetColor(color)
}
},
@@ -474,8 +478,11 @@ impl Connection {
PacketClient::WlxSwitchSet(set) => {
Self::handle_wlx_switch_set(params, set);
}
PacketClient::WlxModifyPanel(custom_params) => {
Self::handle_wlx_panel(params, custom_params);
PacketClient::WlxPanelReload(payload) => {
Self::handle_wlx_panel_reload(params, payload);
}
PacketClient::WlxPanelModify(custom_params) => {
Self::handle_wlx_panel_modify(params, custom_params);
}
PacketClient::WlxHandsfree(payload) => {
Self::handle_wlx_handsfree(params, payload);
+1
View File
@@ -8,6 +8,7 @@ pub enum WayVRSignal {
Handsfree(wayvr_ipc::packet_client::HandsfreeParams),
ShowHide,
CustomTask(crate::backend::task::ModifyPanelTask),
PanelReload(wayvr_ipc::packet_client::WlxPanelReloadParams),
WindowVisibilityChanged(window::WindowHandle, bool),
// (connection id, serial, params)
GetWindowState(
+14 -3
View File
@@ -189,16 +189,27 @@ pub async fn wlx_handsfree(state: &mut WayVRClientState, params: HandsfreeParams
)
}
pub async fn wlx_panel_reload(state: &mut WayVRClientState, overlay: String) {
handle_empty_result(
WayVRClient::fn_wlx_panel_reload(
state.wayvr_client.clone(),
packet_client::WlxPanelReloadParams { overlay },
)
.await
.context("failed to reload panel"),
)
}
pub async fn wlx_panel_modify(
state: &mut WayVRClientState,
overlay: String,
element: String,
command: packet_client::WlxModifyPanelCommand,
command: packet_client::WlxPanelModifyCommand,
) {
handle_empty_result(
WayVRClient::fn_wlx_modify_panel(
WayVRClient::fn_wlx_panel_modify(
state.wayvr_client.clone(),
packet_client::WlxModifyPanelParams {
packet_client::WlxPanelModifyParams {
overlay,
element,
command,
+16 -8
View File
@@ -16,9 +16,10 @@ use wayvr_ipc::{
use crate::helper::{
WayVRClientState, wlr_input_capture, wlx_device_haptics, wlx_handsfree, wlx_input_state,
wlx_overlay_list, wlx_overlay_set_visible, wlx_panel_modify, wlx_show_hide, wlx_switch_set,
wlx_window_attrib_get, wlx_window_attrib_set, wlx_window_state_get, wlx_window_state_set,
wvr_process_get, wvr_process_launch, wvr_process_list, wvr_process_terminate,
wlx_overlay_list, wlx_overlay_set_visible, wlx_panel_modify, wlx_panel_reload, wlx_show_hide,
wlx_switch_set, wlx_window_attrib_get, wlx_window_attrib_set, wlx_window_state_get,
wlx_window_state_set, wvr_process_get, wvr_process_launch, wvr_process_list,
wvr_process_terminate,
};
mod helper;
@@ -201,6 +202,9 @@ async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()
Subcommands::ShowHide => {
wlx_show_hide(state).await;
}
Subcommands::PanelReload { overlay } => {
wlx_panel_reload(state, overlay).await;
}
Subcommands::PanelModify {
overlay,
element,
@@ -208,20 +212,20 @@ async fn run_once(state: &mut WayVRClientState, args: Args) -> anyhow::Result<()
} => {
let command = match command {
SubcommandPanelModify::SetText { text } => {
packet_client::WlxModifyPanelCommand::SetText(text.join(" "))
packet_client::WlxPanelModifyCommand::SetText(text.join(" "))
}
SubcommandPanelModify::SetColor { hex_color } => {
packet_client::WlxModifyPanelCommand::SetColor(hex_color)
packet_client::WlxPanelModifyCommand::SetColor(hex_color)
}
SubcommandPanelModify::SetImage { absolute_path } => {
packet_client::WlxModifyPanelCommand::SetImage(absolute_path)
packet_client::WlxPanelModifyCommand::SetImage(absolute_path)
}
SubcommandPanelModify::SetVisible { visible_0_or_1 } => {
packet_client::WlxModifyPanelCommand::SetVisible(visible_0_or_1 != 0)
packet_client::WlxPanelModifyCommand::SetVisible(visible_0_or_1 != 0)
}
SubcommandPanelModify::SetStickyState {
sticky_state_0_or_1,
} => packet_client::WlxModifyPanelCommand::SetStickyState(sticky_state_0_or_1 != 0),
} => packet_client::WlxPanelModifyCommand::SetStickyState(sticky_state_0_or_1 != 0),
};
wlx_panel_modify(state, overlay, element, command).await;
@@ -339,6 +343,10 @@ enum Subcommands {
},
/// Toggle overlay show or hide
ShowHide,
/// Reload panel XML
PanelReload {
overlay: String,
},
/// Apply a modification to a panel element
PanelModify {
/// The name of the overlay (XML file name without extension)