From: Po Lu <luangruo@yahoo.com>
Date: Wed, 24 Nov 2021 01:09:45 +0000 (+0800)
Subject: Use only effective modifiers when handling XI2 button events
X-Git-Tag: emacs-29.0.90~2852^2~86
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f90176b1ca8440adcbcfa61ce0da35d967b9cd6f;p=emacs.git

Use only effective modifiers when handling XI2 button events

* src/xterm.c (handle_one_xevent): Use mods.effective when
constructing button events.
---

diff --git a/src/xterm.c b/src/xterm.c
index dfbbff23024..7e0d58745e2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10149,10 +10149,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 	      bv.x = lrint (xev->event_x);
 	      bv.y = lrint (xev->event_y);
 	      bv.window = xev->event;
-	      bv.state = xev->mods.base
-		| xev->mods.effective
-		| xev->mods.latched
-		| xev->mods.locked;
+	      bv.state = xev->mods.effective;
 	      bv.time = xev->time;
 
 	      memset (&compose_status, 0, sizeof (compose_status));