[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvttoolkit.C

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.91 by root, Sat Jan 26 10:03:35 2008 UTC vs.
Revision 1.100 by root, Sat Jan 26 13:31:13 2008 UTC

   while (XEventsQueued (dpy, QueuedAfterReading))
     {
       XEvent xev;
       XNextEvent (dpy, &xev);
-      flush_ev.start ();
 #ifdef USE_XIM
       if (!XFilterEvent (&xev, None))
-#endif
         {
           if (xev.type == PropertyNotify
               && xev.xany.window == root
               && 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])
                 xw.erase_unordered (i);
               else if (xw[i]->window == xev.xany.window)
                 xw[i]->call (xev);
             }
+#ifdef USE_XIM
         }
+#endif
     }
 }
 void rxvt_display::flush_cb (ev::prepare &w, int revents)
 {
+  while (XEventsQueued (dpy, QueuedAfterFlush))
+    x_cb (x_ev, EV_READ);
   w.stop ();
-  XFlush (dpy);
 }
 void rxvt_display::reg (xevent_watcher *w)
 {
   if (!w->active)

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines