From: Po Lu <luangruo@yahoo.com>
Date: Tue, 4 Jan 2022 03:16:46 +0000 (+0800)
Subject: Add effective group to xkey events when handling XI key press events
X-Git-Tag: emacs-29.0.90~3274
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6668a7608cac6f09d4adc3282fce9a7c03e56792;p=emacs.git

Add effective group to xkey events when handling XI key press events

* src/xterm.c (handle_one_xevent): Add effective group to
xkey.state when translating XI key events.
---

diff --git a/src/xterm.c b/src/xterm.c
index 31e39280b36..8202e8fb003 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10668,7 +10668,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 	      xkey.root = xev->root;
 	      xkey.subwindow = xev->child;
 	      xkey.time = xev->time;
-	      xkey.state = xev->mods.effective;
+	      xkey.state = ((xev->mods.effective & ~(1 << 13 | 1 << 14))
+			    | (xev->group.effective << 13));
 	      xkey.keycode = xev->detail;
 	      xkey.same_screen = True;