Various fixes after rebase

Author: DataTriny

bindings/python/Cargo.toml

@@ -11,6 +11,7 @@ edition = "2021"
 [lib]
 name = "accesskit"
 crate-type = ["cdylib"]
+doc = false
 
 [features]
 extension-module = ["pyo3/extension-module"]

bindings/python/examples/pygame/hello_world.py

@@ -9,10 +9,10 @@
 WINDOW_WIDTH = 400
 WINDOW_HEIGHT = 200
 
-WINDOW_ID = accesskit.NodeId(1)
-BUTTON_1_ID = accesskit.NodeId(2)
-BUTTON_2_ID = accesskit.NodeId(3)
-ANNOUNCEMENT_ID = accesskit.NodeId(4)
+WINDOW_ID = 0
+BUTTON_1_ID = 1
+BUTTON_2_ID = 2
+ANNOUNCEMENT_ID = 3
 INITIAL_FOCUS = BUTTON_1_ID
 
 BUTTON_1_RECT = accesskit.Rect(20.0, 20.0, 100.0, 60.0)
@@ -50,7 +50,7 @@ def __init__(self, app_name, source, action_handler):
             )
         elif os.name == "posix":
             self.adapter = accesskit.unix.Adapter.create(
-                app_name, "pygame", pygame.version.ver, source, action_handler
+                app_name, "pygame", pygame.version.ver, source, False, action_handler
             )
         elif PLATFORM_SYSTEM == "Windows":
             hwnd = pygame.display.get_wm_info()["window"]
@@ -73,17 +73,23 @@ def update_if_active(self, update_factory):
             else:
                 self.adapter.update(update_factory())
 
+    def update_window_focus_state(self, is_focused):
+        if not self.adapter is None:
+            if PLATFORM_SYSTEM == "Darwin":
+                events = self.adapter.update_window_focus_state(is_focused)
+                if not events is None:
+                    events.raise_events()
+            elif os.name == "posix":
+                self.adapter.update_window_focus_state(is_focused)
+            # On Windows, the subclassing adapter takes care of this.
+
 
 class WindowState:
     def __init__(self):
-        self._focus = INITIAL_FOCUS
-        self.is_window_focused = False
+        self.focus = INITIAL_FOCUS
         self.announcement = None
         self.node_classes = accesskit.NodeClassSet()
 
-    def focus(self):
-        return self._focus if self.is_window_focused else None
-
     def build_root(self):
         builder = accesskit.NodeBuilder(accesskit.Role.WINDOW)
         builder.set_children([BUTTON_1_ID, BUTTON_2_ID])
@@ -96,9 +102,8 @@ def build_initial_tree(self):
         root = self.build_root()
         button_1 = build_button(BUTTON_1_ID, "Button 1", self.node_classes)
         button_2 = build_button(BUTTON_2_ID, "Button 2", self.node_classes)
-        result = accesskit.TreeUpdate()
+        result = accesskit.TreeUpdate.with_focus(self.focus)
         result.tree = accesskit.Tree(WINDOW_ID)
-        result.focus = self.focus()
         result.nodes.append((WINDOW_ID, root))
         result.nodes.append((BUTTON_1_ID, button_1))
         result.nodes.append((BUTTON_2_ID, button_2))
@@ -118,21 +123,19 @@ def press_button(self, adapter, id):
         adapter.update_if_active(self.build_tree_update_for_button_press)
 
     def build_tree_update_for_button_press(self):
-        update = accesskit.TreeUpdate()
+        update = accesskit.TreeUpdate.with_focus(self.focus)
         update.nodes.append(
             (ANNOUNCEMENT_ID, build_announcement(self.announcement, self.node_classes))
         )
         update.nodes.append((WINDOW_ID, self.build_root()))
-        update.focus = self.focus()
         return update
 
-    def update_focus(self, adapter):
+    def set_focus(self, adapter, focus):
+        self.focus = focus
         adapter.update_if_active(self.build_tree_update_for_focus_update)
 
     def build_tree_update_for_focus_update(self):
-        update = accesskit.TreeUpdate()
-        update.focus = self.focus()
-        return update
+        return accesskit.TreeUpdate.with_focus(self.focus)
 
 
 def do_action(request):
@@ -171,26 +174,23 @@ def main():
             if event.type == pygame.QUIT:
                 is_running = False
             elif event.type == pygame.WINDOWFOCUSGAINED:
-                state.is_window_focused = True
-                state.update_focus(adapter)
+                adapter.update_window_focus_state(True)
             elif event.type == pygame.WINDOWFOCUSLOST:
-                state.is_window_focused = False
-                state.update_focus(adapter)
+                adapter.update_window_focus_state(False)
             elif event.type == pygame.KEYDOWN:
                 if event.key == pygame.K_TAB:
-                    state._focus = (
-                        BUTTON_2_ID if state._focus == BUTTON_1_ID else BUTTON_1_ID
+                    new_focus = (
+                        BUTTON_2_ID if state.focus == BUTTON_1_ID else BUTTON_1_ID
                     )
-                    state.update_focus(adapter)
+                    state.set_focus(adapter, new_focus)
                 elif event.key == pygame.K_SPACE:
-                    state.press_button(adapter, state._focus)
+                    state.press_button(adapter, state.focus)
             elif event.type == ACCESSKIT_EVENT and event.__dict__["target"] in [
                 BUTTON_1_ID,
                 BUTTON_2_ID,
             ]:
                 if event.__dict__["event"] == SET_FOCUS_MSG:
-                    state._focus = event.__dict__["target"]
-                    state.update_focus(adapter)
+                    state.set_focus(adapter, event.__dict__["target"])
                 elif event.__dict__["event"] == DO_DEFAULT_ACTION_MSG:
                     state.press_button(adapter, event.__dict__["target"])
 

bindings/python/src/common.rs

@@ -3,8 +3,7 @@
 // the LICENSE-APACHE file) or the MIT license (found in
 // the LICENSE-MIT file), at your option.
 
-use pyo3::{basic::CompareOp, prelude::*, types::PyList};
-use std::num::NonZeroU128;
+use pyo3::{prelude::*, types::PyList};
 
 #[pyclass(module = "accesskit")]
 pub struct NodeClassSet(accesskit::NodeClassSet);
@@ -99,43 +98,7 @@ impl NodeBuilder {
     }
 }
 
-#[derive(Clone, Copy)]
-#[pyclass(module = "accesskit")]
-pub struct NodeId(accesskit::NodeId);
-
-#[pymethods]
-impl NodeId {
-    #[new]
-    pub fn new(content: NonZeroU128) -> NodeId {
-        Self(accesskit::NodeId(content))
-    }
-
-    pub fn __richcmp__(&self, other: &NodeId, op: CompareOp) -> bool {
-        match op {
-            CompareOp::Eq => self.0 == other.0,
-            CompareOp::Ne => self.0 != other.0,
-            _ => false,
-        }
-    }
-}
-
-impl From<NodeId> for accesskit::NodeId {
-    fn from(id: NodeId) -> Self {
-        id.0
-    }
-}
-
-impl From<accesskit::NodeId> for NodeId {
-    fn from(id: accesskit::NodeId) -> Self {
-        Self(id)
-    }
-}
-
-impl From<&accesskit::NodeId> for NodeId {
-    fn from(id: &accesskit::NodeId) -> Self {
-        Self(*id)
-    }
-}
+pub type NodeId = u64;
 
 #[derive(Clone)]
 #[pyclass(module = "accesskit")]
@@ -178,9 +141,9 @@ impl From<CustomAction> for accesskit::CustomAction {
     }
 }
 
-impl From<&accesskit::CustomAction> for CustomAction {
-    fn from(action: &accesskit::CustomAction) -> Self {
-        Self(action.clone())
+impl From<accesskit::CustomAction> for CustomAction {
+    fn from(action: accesskit::CustomAction) -> Self {
+        Self(action)
     }
 }
 
@@ -205,7 +168,7 @@ impl TextPosition {
 
     #[setter]
     pub fn set_node(&mut self, node: NodeId) {
-        self.0.node = node.into()
+        self.0.node = node.into();
     }
 
     #[getter]
@@ -369,15 +332,15 @@ macro_rules! vec_property_methods {
         impl Node {
             $(#[getter]
             pub fn $getter(&self, py: Python) -> Py<PyList> {
-                let values = self.inner().$getter().iter().map(<$py_item_type>::from).map(|i| i.into_py(py));
+                let values = self.inner().$getter().iter().cloned().map(<$py_item_type>::from).map(|i| i.into_py(py));
                 PyList::new(py, values).into()
             })*
         }
         $(#[pymethods]
         impl NodeBuilder {
             #[getter]
             pub fn $getter(&self, py: Python) -> Py<PyList> {
-                let values = self.inner().$getter().iter().map(<$py_item_type>::from).map(|i| i.into_py(py));
+                let values = self.inner().$getter().iter().cloned().map(<$py_item_type>::from).map(|i| i.into_py(py));
                 PyList::new(py, values).into()
             }
             pub fn $setter(&mut self, values: &PyList) {
@@ -656,25 +619,20 @@ vec_property_methods! {
 #[pyclass(module = "accesskit", get_all, set_all)]
 pub struct Tree {
     pub root: NodeId,
-    pub root_scroller: Option<NodeId>,
 }
 
 #[pymethods]
 impl Tree {
     #[new]
     pub fn new(root: NodeId) -> Self {
-        Self {
-            root,
-            root_scroller: None,
-        }
+        Self { root }
     }
 }
 
 impl From<Tree> for accesskit::Tree {
     fn from(tree: Tree) -> Self {
         Self {
             root: tree.root.into(),
-            root_scroller: tree.root_scroller.map(Into::into),
         }
     }
 }
@@ -684,17 +642,17 @@ impl From<Tree> for accesskit::Tree {
 pub struct TreeUpdate {
     pub nodes: Py<PyList>,
     pub tree: Option<Py<Tree>>,
-    pub focus: Option<NodeId>,
+    pub focus: NodeId,
 }
 
 #[pymethods]
 impl TreeUpdate {
-    #[new]
-    pub fn new(py: Python<'_>) -> Self {
+    #[staticmethod]
+    pub fn with_focus(py: Python<'_>, focus: NodeId) -> Self {
         Self {
             nodes: PyList::empty(py).into(),
             tree: None,
-            focus: None,
+            focus,
         }
     }
 }
@@ -713,7 +671,7 @@ impl From<TreeUpdate> for accesskit::TreeUpdate {
             tree: update
                 .tree
                 .map(|tree| accesskit::Tree::from(*tree.as_ref(py).borrow())),
-            focus: update.focus.map(Into::into),
+            focus: update.focus.into(),
         })
     }
 }

bindings/python/src/lib.rs

@@ -46,7 +46,6 @@ fn accesskit(py: Python<'_>, m: &PyModule) -> PyResult<()> {
     m.add_class::<NodeClassSet>()?;
     m.add_class::<Node>()?;
     m.add_class::<NodeBuilder>()?;
-    m.add_class::<NodeId>()?;
     m.add_class::<Tree>()?;
     m.add_class::<TreeUpdate>()?;
     m.add_class::<Affine>()?;

bindings/python/src/macos.rs

@@ -39,19 +39,30 @@ impl Adapter {
     ///
     /// `view` must be a valid, unreleased pointer to an `NSView`.
     #[new]
-    pub unsafe fn new(view: isize, initial_state: TreeUpdate, handler: Py<PyAny>) -> Self {
+    pub unsafe fn new(
+        view: isize,
+        initial_state: TreeUpdate,
+        is_view_focused: bool,
+        handler: Py<PyAny>,
+    ) -> Self {
         Self(accesskit_macos::Adapter::new(
             view as *mut _,
             initial_state.into(),
+            is_view_focused,
             Box::new(PythonActionHandler(handler)),
         ))
     }
 
-    /// You must call `accesskit.macos.QueuedEvents.raise` on the returned value. It can be `None` in case of error.
+    /// You must call `accesskit.macos.QueuedEvents.raise_events` on the returned value.
     pub fn update(&self, update: TreeUpdate) -> QueuedEvents {
         self.0.update(update.into()).into()
     }
 
+    /// You must call `accesskit.macos.QueuedEvents.raise_events` on the returned value.
+    pub fn update_view_focus_state(&self, is_focused: bool) -> QueuedEvents {
+        self.0.update_view_focus_state(is_focused).into()
+    }
+
     pub fn view_children(&self) -> isize {
         self.0.view_children() as _
     }
@@ -72,6 +83,8 @@ pub struct SubclassingAdapter(accesskit_macos::SubclassingAdapter);
 #[pymethods]
 impl SubclassingAdapter {
     /// Create an adapter that dynamically subclasses the specified view.
+    /// This must be done before the view is shown or focused for
+    /// the first time.
     ///
     /// The action handler will always be called on the main thread.
     ///
@@ -127,12 +140,12 @@ impl SubclassingAdapter {
         ))
     }
 
-    /// You must call `accesskit.macos.QueuedEvents.raise` on the returned value. It can be `None` in case of error.
+    /// You must call `accesskit.macos.QueuedEvents.raise_events` on the returned value.
     pub fn update(&self, update: TreeUpdate) -> QueuedEvents {
         self.0.update(update.into()).into()
     }
 
-    /// You must call `accesskit.macos.QueuedEvents.raise` on the returned value. It can be `None` in case of error or if the window is not active.
+    /// You must call `accesskit.macos.QueuedEvents.raise_events` on the returned value. It can be `None` if the window is not active.
     pub fn update_if_active(
         &self,
         py: Python<'_>,
@@ -145,6 +158,11 @@ impl SubclassingAdapter {
             })
             .map(Into::into)
     }
+
+    /// You must call `accesskit.macos.QueuedEvents.raise_events` on the returned value. It can be `None` if the window is not active.
+    pub fn update_view_focus_state(&self, is_focused: bool) -> Option<QueuedEvents> {
+        self.0.update_view_focus_state(is_focused).map(Into::into)
+    }
 }
 
 /// Modifies the specified class, which must be a subclass of `NSWindow`,

bindings/python/src/unix.rs

@@ -17,6 +17,7 @@ impl Adapter {
         toolkit_name: &str,
         toolkit_version: &str,
         source: Py<PyAny>,
+        is_window_focused: bool,
         handler: Py<PyAny>,
     ) -> Option<Self> {
         accesskit_unix::Adapter::new(
@@ -33,6 +34,7 @@ impl Adapter {
                         .into()
                 })
             },
+            is_window_focused,
             Box::new(PythonActionHandler(handler)),
         )
         .map(Self)
@@ -45,4 +47,8 @@ impl Adapter {
     pub fn update(&self, update: TreeUpdate) {
         self.0.update(update.into());
     }
+
+    pub fn update_window_focus_state(&self, is_focused: bool) {
+        self.0.update_window_focus_state(is_focused);
+    }
 }