From 390361cb24e376e8a00647a7625a06d6cdcf9b4d Mon Sep 17 00:00:00 2001
From: Po Lu <luangruo@yahoo.com>
Date: Mon, 29 Nov 2021 12:39:16 +0800
Subject: [PATCH] Update XKB map on MappingNotify

* src/xterm.c (handle_one_xevent): Update XKB map when X
tells us the keyboard map has been updated.
---
 src/xterm.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/xterm.c b/src/xterm.c
index 8045470bdd3..253e0eb20b0 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9813,6 +9813,11 @@ handle_one_xevent (struct x_display_info *dpyinfo,
           x_find_modifier_meanings (dpyinfo);
 	  FALLTHROUGH;
         case MappingKeyboard:
+#ifdef HAVE_XKB
+	  if (dpyinfo->xkb_desc)
+	    XkbGetUpdatedMap (dpyinfo->display, XkbAllComponentsMask,
+			      dpyinfo->xkb_desc);
+#endif
           XRefreshKeyboardMapping ((XMappingEvent *) &event->xmapping);
         }
       goto OTHER;
-- 
2.39.5