From 65e463b5996f3533d18ac942b1221a67fc08ebcd Mon Sep 17 00:00:00 2001
From: fsh <tristesse@gmail.com>
Date: Mon, 8 Jul 2024 16:14:07 +0200
Subject: [PATCH] x11: Properly update XKB group state (#13931)

Pass on all the XkbStateNotify information to XKB.

> "All parameters must always be passed, or the resulting state may be
incoherent."
>
https://docs.rs/xkbcommon/latest/xkbcommon/xkb/struct.State.html#method.update_mask

Previously, many keymaps using multiple groups/layers would not work and
remain in group0.

Release Notes:

- Fixed handling of Xkb keymap groups on X11.
---
 crates/gpui/src/platform/linux/x11/client.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs
index 8590defea922c53b60f4754101f9e5f4c6ddec98..1f64658072afdd28b49933f1c86e115fb371b014 100644
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -585,8 +585,8 @@ impl X11Client {
                     event.base_mods.into(),
                     event.latched_mods.into(),
                     event.locked_mods.into(),
-                    0,
-                    0,
+                    event.base_group as u32,
+                    event.latched_group as u32,
                     event.locked_group.into(),
                 );