experimental change for mappingnotify fix

diff --git a/src/command.C b/src/command.C
index 5fcd2f058e465783795a4168456bb1e987f2f85b..f5c2b4920174e42ec7f862dd502c445fc4ec8835 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -1437,10 +1437,6 @@ rxvt_term::x_cb (XEvent &ev)
           }
         break;
 
-      case MappingNotify:
-        XRefreshKeyboardMapping (&ev.xmapping);
-        break;
-
         /*
          * XXX: this is not the _current_ arrangement
          * Here's my conclusion:

diff --git a/src/rxvttoolkit.C b/src/rxvttoolkit.C
index 3fca776794b349ccfcefb6a635ba270c17e0a8d6..16ec56fabbc9d66bce7f0341ea6269c916fc7d76 100644 (file)
--- a/src/rxvttoolkit.C
+++ b/src/rxvttoolkit.C
@@ -561,6 +561,9 @@ void rxvt_display::x_cb (io_watcher &w, short revents)
               && xev.xproperty.atom == xa[XA_XIM_SERVERS])
             im_change_check ();
 #endif
+          if (xev.type == MappingNotify)
+            XRefreshKeyboardMapping (&xev.xmapping);
+
           for (int i = xw.size (); i--; )
             {
               if (!xw[i])