From 1564b9d1a3a521b0677632a32f24b3b11e9580c7 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Wed, 18 Jun 2025 14:54:54 -0700 Subject: [PATCH] Inhibit keyboard shortcuts if XWayland grab is active This matches behavior in X11 sessions (Gnome and i3). It presumably is reasonable to have the same behavior here as with Wayland-native keyboard shortcut inhibition. --- src/input/mod.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/input/mod.rs b/src/input/mod.rs index e7aef5cf..6e62fe92 100644 --- a/src/input/mod.rs +++ b/src/input/mod.rs @@ -246,6 +246,7 @@ impl State { .map(|inhibitor| inhibitor.is_active()) }) .unwrap_or(false) + || matches!(f, KeyboardFocusTarget::XWaylandGrab(_)) }); let sym = handle.modified_sym(); @@ -685,6 +686,7 @@ impl State { .map(|inhibitor| inhibitor.is_active()) }) .unwrap_or(false) + || matches!(f, KeyboardFocusTarget::XWaylandGrab(_)) }); let serial = SERIAL_COUNTER.next_serial(); @@ -1536,6 +1538,7 @@ impl State { .map(|inhibitor| inhibitor.is_active()) }) .unwrap_or(false) + || matches!(f, KeyboardFocusTarget::XWaylandGrab(_)) }); self.common.atspi_ei.input(