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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.88 by root, Wed Jan 23 09:14:58 2008 UTC vs.
Revision 1.100 by root, Sat Jan 26 13:31:13 2008 UTC

     }
 }
 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)
 }
 bool
 rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
 {
-  //TODO: only supports 24 bit truecolour
+  //TODO: only supports 24 bit
   int alpha = color.a >= 0xff00 ? 0xffff : color.a;
 #if XFT
   XRenderPictFormat *format;
 {
   rgba c;
   char eos;
   int skip;
+  c.a = rgba::MAX_CC;
   // parse the nonstandard "[alphapercent]" prefix
   if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
     {
       c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
       name += skip;
     }
-  else
-    c.a = rgba::MAX_CC;
-  // parse the non-standard "#aarrggbb" format
-  if (name[0] == '#' && strlen (name) == 1+2+2+2+2 && 4 == sscanf (name+1, "%2hx%2hx%2hx%2hx%c", &c.a, &c.r, &c.g, &c.b, &eos))
-    {
-      c.r <<= 8;
-      c.g <<= 8;
-      c.b <<= 8;
-      c.a <<= 8;
-    }
   // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
-  else if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
+  if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
     {
       XColor xc;
       if (XParseColor (screen->dpy, screen->cmap, name, &xc))
         {

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