Add cosmic_atspi_v1 protocol

Cargo.toml

@@ -54,12 +54,13 @@ wayland-scanner = "0.31.1"
 xcursor = "0.3.3"
 xdg = "^2.1"
 xdg-user = "0.2.1"
-xkbcommon = "0.7"
+xkbcommon = "0.8"
 zbus = "4.4.0"
 profiling = { version = "1.0" }
 rustix = { version = "0.38.32", features = ["process"] }
 smallvec = "1.13.2"
 rand = "0.8.5"
+reis = { version = "0.4", features = ["calloop"] }
 drm-ffi = "0.8.0"
 
 [dependencies.id_tree]

src/config/mod.rs

@@ -640,6 +640,7 @@ fn config_changed(config: cosmic_config::Config, keys: Vec<String>, state: &mut
                         }
                     }
                 }
+                state.common.atspi_ei.update_keymap(value.clone());
                 state.common.config.cosmic_conf.xkb_config = value;
             }
             "input_default" => {

src/input/mod.rs

@@ -1464,6 +1464,13 @@ impl State {
                 .unwrap_or(false)
         });
 
+        self.common.atspi_ei.input(
+            modifiers,
+            &handle,
+            event.state(),
+            event.time() as u64 * 1000,
+        );
+
         // Leave move overview mode, if any modifier was released
         if let Some(Trigger::KeyboardMove(action_modifiers)) =
             shell.overview_mode().0.active_trigger()
@@ -1625,6 +1632,57 @@ impl State {
             )));
         }
 
+        if event.state() == KeyState::Released {
+            let removed = self
+                .common
+                .atspi_ei
+                .active_virtual_mods
+                .remove(&event.key_code());
+            // If `Caps_Lock` is a virtual modifier, and is in locked state, clear it
+            if removed && handle.modified_sym() == Keysym::Caps_Lock {
+                if (modifiers.serialized.locked & 2) != 0 {
+                    let serial = SERIAL_COUNTER.next_serial();
+                    let time = self.common.clock.now().as_millis();
+                    keyboard.input(
+                        self,
+                        event.key_code(),
+                        KeyState::Pressed,
+                        serial,
+                        time,
+                        |_, _, _| FilterResult::<()>::Forward,
+                    );
+                    let serial = SERIAL_COUNTER.next_serial();
+                    keyboard.input(
+                        self,
+                        event.key_code(),
+                        KeyState::Released,
+                        serial,
+                        time,
+                        |_, _, _| FilterResult::<()>::Forward,
+                    );
+                }
+            }
+        } else if event.state() == KeyState::Pressed
+            && self
+                .common
+                .atspi_ei
+                .virtual_mods
+                .contains(&event.key_code())
+        {
+            self.common
+                .atspi_ei
+                .active_virtual_mods
+                .insert(event.key_code());
+
+            tracing::debug!(
+                "active virtual mods: {:?}",
+                self.common.atspi_ei.active_virtual_mods
+            );
+            seat.supressed_keys().add(&handle, None);
+
+            return FilterResult::Intercept(None);
+        }
+
         // Skip released events for initially surpressed keys
         if event.state() == KeyState::Released {
             if let Some(tokens) = seat.supressed_keys().filter(&handle) {
@@ -1649,6 +1707,15 @@ impl State {
             return FilterResult::Intercept(None);
         }
 
+        if self.common.atspi_ei.has_keyboard_grab()
+            || self
+                .common
+                .atspi_ei
+                .has_key_grab(modifiers.serialized.layout_effective, event.key_code())
+        {
+            return FilterResult::Intercept(None);
+        }
+
         // handle the rest of the global shortcuts
         let mut clear_queue = true;
         if !shortcuts_inhibited {

src/state.rs

@@ -12,6 +12,7 @@ use crate::{
     shell::{grabs::SeatMoveGrabState, CosmicSurface, SeatExt, Shell},
     utils::prelude::OutputExt,
     wayland::protocols::{
+        atspi::AtspiState,
         drm::WlDrmState,
         image_source::ImageSourceState,
         output_configuration::OutputConfigurationState,
@@ -229,6 +230,9 @@ pub struct Common {
     pub xwayland_state: Option<XWaylandState>,
     pub xwayland_shell_state: XWaylandShellState,
     pub pointer_focus_state: Option<PointerFocusState>,
+
+    pub atspi_state: AtspiState,
+    pub atspi_ei: crate::wayland::handlers::atspi::AtspiEiState,
 }
 
 #[derive(Debug)]
@@ -559,6 +563,9 @@ impl State {
             tracing::warn!(?err, "Failed to initialize dbus handlers");
         }
 
+        // TODO: Restrict to only specific client?
+        let atspi_state = AtspiState::new::<State, _>(dh, client_is_privileged);
+
         State {
             common: Common {
                 config,
@@ -615,6 +622,9 @@ impl State {
                 xwayland_state: None,
                 xwayland_shell_state,
                 pointer_focus_state: None,
+
+                atspi_state,
+                atspi_ei: Default::default(),
             },
             backend: BackendData::Unset,
             ready: Once::new(),