virtual_mods

Author: ids1024

src/dbus/a11y_keyboard_monitor.rs

@@ -1,6 +1,7 @@
 // https://gitlab.gnome.org/GNOME/mutter/-/blob/main/data/dbus-interfaces/org.freedesktop.a11y.xml
 //
 // TODO: Restrict protocol acccess?
+// TODO remove client when not connected to server
 
 use futures_executor::ThreadPool;
 use smithay::backend::input::KeyState;
@@ -97,7 +98,7 @@ impl A11yKeyboardMonitorState {
         }
     }
 
-    pub fn has_virtual_modifier(&self, keysym: Keysym) -> bool {
+    pub fn has_virtual_mod(&self, keysym: Keysym) -> bool {
         self.clients
             .lock()
             .unwrap()
@@ -106,7 +107,11 @@ impl A11yKeyboardMonitorState {
             .any(|client| client.virtual_mods.contains(&keysym))
     }
 
-    pub fn remove_active_virtual_modifier(&mut self, keysym: Keysym) -> bool {
+    pub fn add_active_virtual_mod(&mut self, keysym: Keysym) {
+        self.active_virtual_mods.insert(keysym);
+    }
+
+    pub fn remove_active_virtual_mod(&mut self, keysym: Keysym) -> bool {
         self.active_virtual_mods.remove(&keysym)
     }
 

src/input/mod.rs

@@ -1729,11 +1729,15 @@ impl State {
         }
 
         if event.state() == KeyState::Released {
-            let removed = self
+            let mut removed = self
                 .common
                 .atspi_ei
                 .active_virtual_mods
                 .remove(&event.key_code());
+            removed |= self
+                .common
+                .a11y_keyboard_monitor_state
+                .remove_active_virtual_mod(handle.modified_sym());
             // 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 {
@@ -1759,16 +1763,23 @@ impl State {
                 }
             }
         } else if event.state() == KeyState::Pressed
-            && self
+            && (self
                 .common
                 .atspi_ei
                 .virtual_mods
                 .contains(&event.key_code())
+                || self
+                    .common
+                    .a11y_keyboard_monitor_state
+                    .has_virtual_mod(handle.modified_sym()))
         {
             self.common
                 .atspi_ei
                 .active_virtual_mods
                 .insert(event.key_code());
+            self.common
+                .a11y_keyboard_monitor_state
+                .add_active_virtual_mod(handle.modified_sym());
 
             tracing::debug!(
                 "active virtual mods: {:?}",