Print action requests from our subtree

lukewarlow · delan · delan · commit 6ac6a6b483cf · 2026-01-07T20:36:57.000+08:00
Co-authored-by: Delan Azabani &lt;dazabani@igalia.com&gt;
Signed-off-by: Luke Warlow &lt;lwarlow@igalia.com&gt;
diff --git a/components/layout/accessibility_tree.rs b/components/layout/accessibility_tree.rs
@@ -6,7 +6,7 @@ use std::rc::Rc;
 use std::sync::LazyLock;
 
 pub(crate) use accessibility_traits::AccessibilityTree;
-use accesskit::{Node as AxNode, NodeId as AxNodeId, Role, Tree as AxTree};
+use accesskit::{Action, Node as AxNode, NodeId as AxNodeId, Role, Tree as AxTree};
 use html5ever::{LocalName, local_name};
 use layout_api::wrapper_traits::{LayoutNode, ThreadSafeLayoutNode};
 use log::trace;
@@ -77,6 +77,7 @@ impl AccessibilityTreeCalculator {
                     }
                 }
             }
+            ax_next.add_action(Action::Click);
             ax_nodes.insert(ax_next_id, ax_next);
         }
         AccessibilityTree {
diff --git a/ports/servoshell/desktop/app.rs b/ports/servoshell/desktop/app.rs
@@ -284,7 +284,9 @@ impl ApplicationHandler<AppEvent> for App {
             if let Some(window_id) = app_event.window_id() {
                 let window_id: u64 = window_id.into();
                 if let Some(window) = state.window(window_id.into()) {
-                    window.platform_window().handle_winit_app_event(app_event);
+                    window
+                        .platform_window()
+                        .handle_winit_app_event(&window, app_event);
                 }
             }
         }
diff --git a/ports/servoshell/desktop/headed_window.rs b/ports/servoshell/desktop/headed_window.rs
@@ -779,8 +779,21 @@ impl PlatformWindow for Window {
         }
     }
 
-    fn handle_winit_app_event(&self, app_event: AppEvent) {
+    fn handle_winit_app_event(&self, _window: &ServoShellWindow, app_event: AppEvent) {
         if let AppEvent::Accessibility(ref event) = app_event {
+            match &event.window_event {
+                egui_winit::accesskit_winit::WindowEvent::InitialTreeRequested => {
+                    // TODO get the initial tree from servo
+                },
+                egui_winit::accesskit_winit::WindowEvent::ActionRequested(req) => {
+                    // TODO use window to get active webview, then do something with action request.
+                    if req.target_tree != TreeId::ROOT {
+                        println!("{:?}", req);
+                    }
+                },
+                _ => {},
+            }
+
             if self
                 .gui
                 .borrow_mut()
diff --git a/ports/servoshell/window.rs b/ports/servoshell/window.rs
@@ -15,6 +15,7 @@ use servo::{
 };
 use url::Url;
 
+use crate::desktop::event_loop::AppEvent;
 use crate::running_app_state::{RunningAppState, UserInterfaceCommand, WebViewCollection};
 
 // This should vary by zoom level and maybe actual text size (focused or under cursor)
@@ -310,7 +311,12 @@ pub(crate) trait PlatformWindow {
     /// TODO: This should be handled internally in the winit window if possible so that it
     /// makes more sense when we are mixing headed and headless windows.
     #[cfg(not(any(target_os = "android", target_env = "ohos")))]
-    fn handle_winit_app_event(&self, _: crate::desktop::event_loop::AppEvent) {}
+    fn handle_winit_app_event(
+        &self,
+        _: &ServoShellWindow,
+        _: crate::desktop::event_loop::AppEvent,
+    ) {
+    }
     fn take_user_interface_commands(&self) -> Vec<UserInterfaceCommand> {
         Default::default()
     }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ use std::rc::Rc;`
`6`	`6`	`use std::sync::LazyLock;`
`7`	`7`
`8`	`8`	`pub(crate) use accessibility_traits::AccessibilityTree;`
`9`		`-use accesskit::{Node as AxNode, NodeId as AxNodeId, Role, Tree as AxTree};`
	`9`	`+use accesskit::{Action, Node as AxNode, NodeId as AxNodeId, Role, Tree as AxTree};`
`10`	`10`	`use html5ever::{LocalName, local_name};`
`11`	`11`	`use layout_api::wrapper_traits::{LayoutNode, ThreadSafeLayoutNode};`
`12`	`12`	`use log::trace;`
`@@ -77,6 +77,7 @@ impl AccessibilityTreeCalculator {`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`
	`80`	`+ ax_next.add_action(Action::Click);`
`80`	`81`	`ax_nodes.insert(ax_next_id, ax_next);`
`81`	`82`	`}`
`82`	`83`	`AccessibilityTree {`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,9 @@ impl ApplicationHandler<AppEvent> for App {`
`284`	`284`	`if let Some(window_id) = app_event.window_id() {`
`285`	`285`	`let window_id: u64 = window_id.into();`
`286`	`286`	`if let Some(window) = state.window(window_id.into()) {`
`287`		`- window.platform_window().handle_winit_app_event(app_event);`
	`287`	`+ window`
	`288`	`+ .platform_window()`
	`289`	`+ .handle_winit_app_event(&window, app_event);`
`288`	`290`	`}`
`289`	`291`	`}`
`290`	`292`	`}`