*** empty log message ***

diff --git a/Changes b/Changes
index 14f6b86f93b6249e9da51e17ab78c5e51d7ce5ac..43841fd20fa5a55e07bdc92b35a0534fc8608ea6 100644 (file)
--- a/Changes
+++ b/Changes
@@ -15,10 +15,11 @@ WISH: OnTheSpot editing, or maybe switch to miiiiiiif. or maybe use perl and an
 WISH: just for fun, do shade and tint with XRender.
 DUMB: support tex fonts
 
-TODO: ctrl - mouse button2 in vim makes X freeze
-       - don't let iso14755 get into the way of perl (could lead to global
-          grabs never being cleared).
+TODO: ctrl - mouse button2 in vim makes X freeze (unreproducable with cvs)
+        - don't let iso14755 or mouse reporting get into the way of perl
+          (could lead to global grabs never being cleared).
         - removed (unused) arabic presentation form composing sequences.
+        - correctly ask XIM for events it needs to be enabled on the window.
 
 7.2  Sun Jan 22 21:58:16 CET 2006
         - bugfix: urxvt (not urxvtd) did not correctly handle multiple

diff --git a/src/main.C b/src/main.C
index ae90f8463adf0d260a780f7ae2a8f9c0ab335382..8a018f8fa0621cbb02f90debebaf5526453d4400 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -1431,6 +1431,9 @@ foundpet:
       return false;
     }
 
+  if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
+    vt_select_input ();
+
   if (input_style & XIMPreeditArea)
     IMSetStatusPosition ();
 

diff --git a/src/rxvt.h b/src/rxvt.h
index 750680340fea3c913b5220530c712b99e4136576..65d676bec8d4f1a0eea6e6055cd35cb1df5a2d3f 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1159,11 +1159,11 @@ struct rxvt_term : zero_initialized, rxvt_vars {
   // modifies first argument(!)
   void paste (char *data, unsigned int len) NOTHROW;
 
-  long vt_emask, vt_emask_perl;
+  long vt_emask, vt_emask_perl, vt_emask_xim;
 
   void vt_select_input () const NOTHROW
   {
-    XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
+    XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim);
   }
 
 #if TRANSPARENT