Remove workaround for some input method problems

* src/xterm.c (handle_one_xevent): Remove modifier key
workaround for some input method problems, since they cause more
problems than they fix.  (bug#56782)

diff --git a/src/xterm.c b/src/xterm.c
index 6f8291b494bdbb093c5c3543644e57014457f1a9..48e9a174fa518e1f86ef733489465381a6f0815b 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -17756,7 +17756,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
          /* `xkey' will be modified, but it's not important to modify
             `event' itself.  */
          XKeyEvent xkey = event->xkey;
-         int i;
+
 #ifdef HAVE_XINPUT2
          Time pending_keystroke_time;
          struct xi_device_t *source;
@@ -17806,27 +17806,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
           if (modifiers & dpyinfo->meta_mod_mask)
             memset (&compose_status, 0, sizeof (compose_status));
 
-#ifdef HAVE_XKB
-         if (dpyinfo->xkb_desc)
-           {
-             XkbDescRec *rec = dpyinfo->xkb_desc;
-
-             if (rec->map->modmap && rec->map->modmap[xkey.keycode])
-               goto done_keysym;
-           }
-         else
-#endif
-           {
-             if (dpyinfo->modmap)
-               {
-                 for (i = 0; i < 8 * dpyinfo->modmap->max_keypermod; i++)
-                   {
-                     if (xkey.keycode == dpyinfo->modmap->modifiermap[i])
-                         goto done_keysym;
-                   }
-               }
-           }
-
 #ifdef HAVE_X_I18N
           if (FRAME_XIC (f))
             {
@@ -21160,27 +21139,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
              state |= x_emacs_to_x_modifiers (dpyinfo, extra_keyboard_modifiers);
 
-#ifdef HAVE_XKB
-             if (dpyinfo->xkb_desc)
-               {
-                 XkbDescRec *rec = dpyinfo->xkb_desc;
-
-                 if (rec->map->modmap && rec->map->modmap[xev->detail])
-                   goto xi_done_keysym;
-               }
-             else
-#endif
-               {
-                 if (dpyinfo->modmap)
-                   {
-                     for (i = 0; i < 8 * dpyinfo->modmap->max_keypermod; i++)
-                       {
-                         if (xev->detail == dpyinfo->modmap->modifiermap[i])
-                           goto xi_done_keysym;
-                       }
-                   }
-               }
-
 #ifdef HAVE_XKB
              if (dpyinfo->xkb_desc)
                {