Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

events refactor

Browse Source
This commit is contained in:
galister
2025-10-12 17:30:30 +09:00
parent fbe1d5b09e
commit 90eed4558f
30 changed files with 420 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wlx-overlay-s/src/gui/panel/button.rs
View File

@@ -5,7 +5,8 @@ use std::{
};
use wgui::{
event::{self, EventCallback, EventListenerCollection, EventListenerKind, ListenerHandleVec},
event::{self, EventCallback, EventListenerKind},
layout::Layout,
parser::CustomAttribsInfoOwned,
widget::EventResult,
};
@@ -17,10 +18,9 @@ use crate::backend::{task::TaskType, wayvr::WayVRAction};
use super::helper::read_label_from_pipe;
pub(super) fn setup_custom_button<S>(
pub(super) fn setup_custom_button<S: 'static>(
layout: &mut Layout,
attribs: &CustomAttribsInfoOwned,
listeners: &mut EventListenerCollection<AppState, S>,
listener_handles: &mut ListenerHandleVec,
_app: &AppState,
) {
const EVENTS: [(&str, EventListenerKind); 2] = [
@@ -69,7 +69,7 @@ pub(super) fn setup_custom_button<S>(
_ => return,
};
listeners.register(listener_handles, attribs.widget_id, *kind, callback);
layout.add_event_listener(attribs.widget_id, *kind, callback);
}
}
struct ShellButtonMutableState {

19
wlx-overlay-s/src/gui/panel/label.rs
View File

@@ -12,11 +12,11 @@ use chrono_tz::Tz;
use interprocess::os::unix::fifo_file::create_fifo;
use wgui::{
drawing,
event::{self, EventCallback, EventListenerCollection, ListenerHandleVec},
event::{self, EventCallback},
i18n::Translation,
layout::Layout,
parser::{CustomAttribsInfoOwned, parse_color_hex},
widget::{EventResult, label::WidgetLabel},
parser::{parse_color_hex, CustomAttribsInfoOwned},
widget::{label::WidgetLabel, EventResult},
};
use crate::state::AppState;
@@ -24,11 +24,9 @@ use crate::state::AppState;
use super::helper::{expand_env_vars, read_label_from_pipe};
#[allow(clippy::too_many_lines)]
pub(super) fn setup_custom_label<S>(
pub(super) fn setup_custom_label<S: 'static>(
layout: &mut Layout,
attribs: &CustomAttribsInfoOwned,
listeners: &mut EventListenerCollection<AppState, S>,
listener_handles: &mut ListenerHandleVec,
app: &AppState,
) {
let Some(source) = attribs.get_value("_source") else {
@@ -51,7 +49,7 @@ pub(super) fn setup_custom_label<S>(
}),
carry_over: RefCell::new(None),
};
Box::new(move |common, data, _app, _| {
Box::new(move |common, data, _, _| {
shell_on_tick(&state, common, data);
Ok(EventResult::Pass)
})
@@ -69,7 +67,7 @@ pub(super) fn setup_custom_label<S>(
next_try: Instant::now(),
}),
};
Box::new(move |common, data, _app, _| {
Box::new(move |common, data, _, _| {
pipe_on_tick(&state, common, data);
Ok(EventResult::Pass)
})
@@ -165,7 +163,7 @@ pub(super) fn setup_custom_label<S>(
format: format.into(),
};
Box::new(move |common, data, _app, _| {
Box::new(move |common, data, _, _| {
clock_on_tick(&state, common, data);
Ok(EventResult::Pass)
})
@@ -180,8 +178,7 @@ pub(super) fn setup_custom_label<S>(
}
};
listeners.register(
listener_handles,
layout.add_event_listener(
attribs.widget_id,
wgui::event::EventListenerKind::InternalStateChange,
callback,

64
wlx-overlay-s/src/gui/panel/mod.rs
View File

@@ -1,16 +1,16 @@
use std::{cell::RefCell, rc::Rc, sync::Arc};
use button::setup_custom_button;
use glam::{Affine2, Vec2, vec2};
use glam::{vec2, Affine2, Vec2};
use label::setup_custom_label;
use vulkano::{command_buffer::CommandBufferUsage, image::view::ImageView};
use wgui::{
assets::AssetPath,
drawing,
event::{
Event as WguiEvent, EventListenerCollection, InternalStateChangeEvent, ListenerHandleVec,
MouseButtonIndex, MouseDownEvent, MouseLeaveEvent, MouseMotionEvent, MouseUpEvent,
MouseWheelEvent,
Event as WguiEvent, EventCallback, EventListenerID, EventListenerKind,
InternalStateChangeEvent, MouseButtonIndex, MouseDownEvent, MouseLeaveEvent,
MouseMotionEvent, MouseUpEvent, MouseWheelEvent,
},
layout::{Layout, LayoutParams, WidgetID},
parser::ParserState,
@@ -22,7 +22,7 @@ use crate::{
backend::input::{Haptics, PointerHit, PointerMode},
graphics::{CommandBuffers, ExtentExt},
state::AppState,
windowing::backend::{FrameMeta, OverlayBackend, ShouldRender, ui_transform},
windowing::backend::{ui_transform, FrameMeta, OverlayBackend, ShouldRender},
};
use super::{timer::GuiTimer, timestep::Timestep};
@@ -40,35 +40,29 @@ pub struct GuiPanel<S> {
pub layout: Layout,
pub state: S,
pub timers: Vec<GuiTimer>,
pub listeners: EventListenerCollection<AppState, S>,
pub listener_handles: ListenerHandleVec,
pub parser_state: ParserState,
interaction_transform: Option<Affine2>,
context: WguiContext,
timestep: Timestep,
}
pub type OnCustomIdFunc<S> = Box<
pub type OnCustomIdFunc = Box<
dyn Fn(
Rc<str>,
WidgetID,
&wgui::parser::ParseDocumentParams,
&mut Layout,
&mut ParserState,
&mut EventListenerCollection<AppState, S>,
) -> anyhow::Result<()>,
>;
impl<S> GuiPanel<S> {
impl<S: 'static> GuiPanel<S> {
pub fn new_from_template(
app: &mut AppState,
path: &str,
state: S,
on_custom_id: Option<OnCustomIdFunc<S>>,
on_custom_id: Option<OnCustomIdFunc>,
) -> anyhow::Result<Self> {
let mut listeners = EventListenerCollection::<AppState, S>::default();
let mut listener_handles = ListenerHandleVec::default();
let custom_elems = Rc::new(RefCell::new(vec![]));
let doc_params = wgui::parser::ParseDocumentParams {
@@ -85,11 +79,8 @@ impl<S> GuiPanel<S> {
},
};
let (mut layout, mut parser_state) = wgui::parser::new_layout_from_assets(
&mut listeners,
&doc_params,
&LayoutParams::default(),
)?;
let (mut layout, mut parser_state) =
wgui::parser::new_layout_from_assets(&doc_params, &LayoutParams::default())?;
if let Some(on_element_id) = on_custom_id {
let ids = parser_state.data.ids.clone(); // FIXME: copying all ids?
@@ -101,7 +92,6 @@ impl<S> GuiPanel<S> {
&doc_params,
&mut layout,
&mut parser_state,
&mut listeners,
)?;
}
}
@@ -113,20 +103,14 @@ impl<S> GuiPanel<S> {
.get_as::<WidgetLabel>(elem.widget_id)
.is_some()
{
setup_custom_label(
&mut layout,
elem,
&mut listeners,
&mut listener_handles,
app,
);
setup_custom_label::<S>(&mut layout, elem, app);
} else if layout
.state
.widgets
.get_as::<WidgetRectangle>(elem.widget_id)
.is_some()
{
setup_custom_button(elem, &mut listeners, &mut listener_handles, app);
setup_custom_button::<S>(&mut layout, elem, app);
}
}
@@ -139,10 +123,8 @@ impl<S> GuiPanel<S> {
context,
timestep,
state,
listener_handles,
parser_state,
timers: vec![],
listeners,
interaction_transform: None,
})
}
@@ -159,9 +141,7 @@ impl<S> GuiPanel<S> {
timestep,
state,
parser_state: ParserState::default(),
listener_handles: ListenerHandleVec::default(),
timers: vec![],
listeners: EventListenerCollection::default(),
interaction_transform: None,
})
}
@@ -171,16 +151,22 @@ impl<S> GuiPanel<S> {
}
pub fn push_event(&mut self, app: &mut AppState, event: &WguiEvent) {
if let Err(e) = self
.layout
.push_event(&mut self.listeners, event, (app, &mut self.state))
{
if let Err(e) = self.layout.push_event(event, app, &mut self.state) {
log::error!("Failed to push event: {e:?}");
}
}
pub fn add_event_listener(
&mut self,
widget_id: WidgetID,
kind: EventListenerKind,
callback: EventCallback<AppState, S>,
) -> Option<EventListenerID> {
self.layout.add_event_listener(widget_id, kind, callback)
}
}
impl<S> OverlayBackend for GuiPanel<S> {
impl<S: 'static> OverlayBackend for GuiPanel<S> {
fn init(&mut self, _app: &mut AppState) -> anyhow::Result<()> {
if self.layout.content_size.x * self.layout.content_size.y != 0.0 {
self.update_layout()?;
@@ -274,13 +260,13 @@ impl<S> OverlayBackend for GuiPanel<S> {
fn on_scroll(&mut self, app: &mut AppState, hit: &PointerHit, delta_y: f32, delta_x: f32) {
self.layout
.push_event(
&mut self.listeners,
&WguiEvent::MouseWheel(MouseWheelEvent {
shift: vec2(delta_x, delta_y),
pos: hit.uv * self.layout.content_size,
device: hit.pointer,
}),
(app, &mut self.state),
app,
&mut self.state,
)
.unwrap(); // want panic
}

33
wlx-overlay-s/src/overlays/keyboard/builder.rs
View File

@@ -1,6 +1,6 @@
use std::{collections::HashMap, rc::Rc};
use glam::{Affine3A, Mat4, Quat, Vec2, Vec3, vec2, vec3};
use glam::{vec2, vec3, Affine3A, Mat4, Quat, Vec2, Vec3};
use wgui::{
animation::{Animation, AnimationEasing},
assets::AssetPath,
@@ -11,24 +11,24 @@ use wgui::{
renderer_vk::util,
taffy::{self, prelude::length},
widget::{
EventResult,
div::WidgetDiv,
rectangle::{WidgetRectangle, WidgetRectangleParams},
util::WLength,
EventResult,
},
};
use crate::{
gui::panel::GuiPanel,
state::AppState,
subsystem::hid::{ALT, CTRL, META, SHIFT, SUPER, XkbKeymap},
subsystem::hid::{XkbKeymap, ALT, CTRL, META, SHIFT, SUPER},
windowing::window::{OverlayWindowConfig, OverlayWindowState, Positioning},
};
use super::{
KEYBOARD_NAME, KeyButtonData, KeyState, KeyboardBackend, KeyboardState, handle_press,
handle_release,
handle_press, handle_release,
layout::{self, AltModifier, KeyCapType},
KeyButtonData, KeyState, KeyboardBackend, KeyboardState, KEYBOARD_NAME,
};
const BACKGROUND_PADDING: f32 = 4.;
@@ -81,11 +81,8 @@ pub fn create_keyboard(
extra: Default::default(),
};
let (_, mut gui_state_key) = wgui::parser::new_layout_from_assets(
&mut panel.listeners,
&parse_doc_params,
&LayoutParams::default(),
)?;
let (_, mut gui_state_key) =
wgui::parser::new_layout_from_assets(&parse_doc_params, &LayoutParams::default())?;
for row in 0..layout.key_sizes.len() {
let (div, _) = panel.layout.add_child(
@@ -167,7 +164,6 @@ pub fn create_keyboard(
&parse_doc_params,
&template_key,
&mut panel.layout,
&mut panel.listeners,
div.id,
params,
)?;
@@ -190,8 +186,7 @@ pub fn create_keyboard(
})
};
panel.listeners.register(
&mut panel.listener_handles,
panel.add_event_listener(
widget_id,
EventListenerKind::MouseEnter,
Box::new({
@@ -203,8 +198,7 @@ pub fn create_keyboard(
}
}),
);
panel.listeners.register(
&mut panel.listener_handles,
panel.add_event_listener(
widget_id,
EventListenerKind::MouseLeave,
Box::new({
@@ -216,8 +210,7 @@ pub fn create_keyboard(
}
}),
);
panel.listeners.register(
&mut panel.listener_handles,
panel.add_event_listener(
widget_id,
EventListenerKind::MousePress,
Box::new({
@@ -233,8 +226,7 @@ pub fn create_keyboard(
}
}),
);
panel.listeners.register(
&mut panel.listener_handles,
panel.add_event_listener(
widget_id,
EventListenerKind::MouseRelease,
Box::new({
@@ -249,8 +241,7 @@ pub fn create_keyboard(
);
if let Some(modifier) = my_modifier {
panel.listeners.register(
&mut panel.listener_handles,
panel.add_event_listener(
widget_id,
EventListenerKind::InternalStateChange,
Box::new({

6
wlx-overlay-s/src/overlays/watch.rs
View File

@@ -23,7 +23,7 @@ pub fn create_watch(app: &mut AppState, num_sets: usize) -> anyhow::Result<Overl
"gui/watch.xml",
state,
Some(Box::new(
move |id, widget, doc_params, layout, parser_state, listeners| {
move |id, widget, doc_params, layout, parser_state| {
if &*id != "sets" {
return Ok(());
}
@@ -32,9 +32,7 @@ pub fn create_watch(app: &mut AppState, num_sets: usize) -> anyhow::Result<Overl
let mut params: HashMap<Rc<str>, Rc<str>> = HashMap::new();
params.insert("display".into(), (idx + 1).to_string().into());
params.insert("handle".into(), idx.to_string().into());
parser_state.instantiate_template(
doc_params, "Set", layout, listeners, widget, params,
)?;
parser_state.instantiate_template(doc_params, "Set", layout, widget, params)?;
}
Ok(())
},