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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.6 by root, Sat Dec 11 17:18:29 2004 UTC vs.
Revision 1.10 by root, Wed Dec 29 19:59:46 2004 UTC

         }
 #endif
     }
   while (XEventsQueued (display, QueuedAlready));
-  flush ();
+  XFlush (display);
 }
 void rxvt_display::flush ()
 {
-  for (;;)
+  if (XEventsQueued (display, QueuedAlready))
-    {
+    x_cb (x_ev, EVENT_READ);
-      if (!XPending (display))
-        break;
-      x_cb (x_ev, 0);
+  XFlush (display);
-    }
 }
 void rxvt_display::reg (xevent_watcher *w)
 {
   xw.push_back (w);
   return xim;
 }
 void rxvt_display::put_xim (rxvt_xim *xim)
 {
+#if XLIB_IS_RACEFREE
   xims.put (xim);
+#endif
 }
 #endif
 Atom rxvt_display::atom (const char *name)
 {
 }
 bool
 rxvt_color::set (rxvt_display *display, const char *name)
 {
+#if XFT
+  return XftColorAllocName (display->display, display->visual, display->cmap,
+                            name, &c);
+#else
   XColor xc;
   if (XParseColor (display->display, display->cmap, name, &xc))
     return set (display, xc.red, xc.green, xc.blue);
   return false;
+#endif
 }
 bool
 rxvt_color::set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb)
 {

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