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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.140 by sf-exg, Sat Dec 29 14:23:35 2012 UTC vs.
Revision 1.147 by root, Wed Dec 17 13:16:18 2014 UTC

  * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
  * Copyright (c) 2011      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *----------------------------------------------------------------------*/
 #include "../config.h"
 #include <rxvt.h>
 #include <rxvttoolkit.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/utsname.h>
 #endif
 #if USE_XIM
   "WM_LOCALE_NAME",
   "XIM_SERVERS",
 #endif
-#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
+#if HAVE_IMG || ENABLE_PERL
   "_XROOTPMAP_ID",
   "ESETROOT_PMAP_ID",
 #endif
 #if ENABLE_XEMBED
   "_XEMBED",
       XFree (vi);
       cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
     }
   else
-    rxvt_warn ("cannot requested visual id 0x%02x, using default visual.\n", id);
+    rxvt_warn ("no visual found for requested id 0x%02x, using default visual.\n", id);
 }
 void
 rxvt_screen::select_depth (int bitdepth)
 {
   flags = 0;
 #if XRENDER
   int major, minor;
   if (XRenderQueryVersion (dpy, &major, &minor))
-    if (major > 0 || (major == 0 && minor >= 10))
+    if (major > 0 || (major == 0 && minor >= 11))
       {
         flags |= DISPLAY_HAS_RENDER;
-#if 0
-        if (major > 0 || (major == 0 && minor >= 11))
-          flags |= DISPLAY_HAS_RENDER_MUL;
-#endif
         if (XFilters *filters = XRenderQueryFilters (dpy, root))
           {
             for (int i = 0; i < filters->nfilter; i++)
               if (!strcmp (filters->filter [i], FilterConvolution))
       d.red   = color.r;
       d.green = color.g;
       d.blue  = color.b;
       d.alpha = alpha;
+      // XftColorAlloc always returns 100% transparent pixels(!)
       if (XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c))
         return true;
     }
 #else
   c.red   = color.r;
     }
   else if (XAllocColor (screen->dpy, screen->cmap, &c))
     return true;
 #endif
+  //TODO: set c.color* or c.*
-  c.pixel = (color.r + color.g + color.b) > 128*3
+  c.pixel = (color.r * 2 + color.g * 3 + color.b) >= 0x8000 * 6
           ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
           : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
   return false;
 }
       // many kilobytes transfer per colour, but pseudocolor isn't worth
       // many extra optimisations.
       XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
+      while (cmap_size)
+        {
-      int diff = 0x7fffffffUL;
+          int diff = 0x7fffffffL;
-      XColor *best = colors;
+          XColor *best = colors;
-      for (int i = 0; i < cmap_size; i++)
+          for (int i = 0; i < cmap_size; i++)
-        {
-          int d = (squared_diff<int> (color.r >> 2, colors [i].red   >> 2))
-                + (squared_diff<int> (color.g >> 2, colors [i].green >> 2))
-                + (squared_diff<int> (color.b >> 2, colors [i].blue  >> 2));
-          if (d < diff)
             {
+              // simple weighted rgb distance sucks, but keeps it simple
+              int d = abs (color.r - colors [i].red  ) * 2
+                    + abs (color.g - colors [i].green) * 3
+                    + abs (color.b - colors [i].blue );
+              if (d < diff)
+                {
-              diff = d;
+                  diff = d;
-              best = colors + i;
+                  best = colors + i;
+                }
             }
-        }
-      //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
+          //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d,%d)\n",
-      //    color.r, color.g, color.b, best->red, best->green, best->blue, diff);
+          //    color.r, color.g, color.b, best->red, best->green, best->blue, diff, best - colors);
-      got = alloc (screen, rgba (best->red, best->green, best->blue));
+          got = alloc (screen, rgba (best->red, best->green, best->blue));
+          if (got)
+            break;
+          *best = colors [--cmap_size];
+        }
       delete [] colors;
     }
 #endif
 void
 rxvt_color::get (rgba &color) const
 {
 #if XFT
+  //TODO premultiplied alpha??
   color.r = c.color.red;
   color.g = c.color.green;
   color.b = c.color.blue;
   color.a = c.color.alpha;
 #else

Diff Legend

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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents): Revision 1.140 by sf-exg, Sat Dec 29 14:23:35 2012 UTC vs. Revision 1.147 by root, Wed Dec 17 13:16:18 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.140 by sf-exg, Sat Dec 29 14:23:35 2012 UTC vs.
Revision 1.147 by root, Wed Dec 17 13:16:18 2014 UTC