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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.133 by sf-exg, Sun Jun 3 17:48:28 2012 UTC vs.
Revision 1.149 by root, Wed Dec 17 16:03:51 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
-#ifdef ENABLE_TRANSPARENCY
+#if HAVE_IMG || ENABLE_PERL
   "_XROOTPMAP_ID",
   "ESETROOT_PMAP_ID",
 #endif
 #if ENABLE_XEMBED
   "_XEMBED",
     put (*this->begin ());
 }
 /////////////////////////////////////////////////////////////////////////////
-#ifdef USE_XIM
+#if USE_XIM
 static void
 #if XIMCB_PROTO_BROKEN
 im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3)
 #else
   depth   = DefaultDepthOfScreen    (screen);
   visual  = DefaultVisualOfScreen   (screen);
   cmap    = DefaultColormapOfScreen (screen);
 }
+#if ENABLE_FRILLS
 void
-rxvt_screen::select_visual (int bitdepth)
+rxvt_screen::select_visual (int id)
 {
-#if XFT
   XVisualInfo vinfo;
+  vinfo.visualid = id;
+  int n;
+  if (XVisualInfo *vi = XGetVisualInfo (dpy, VisualIDMask, &vinfo, &n))
+    {
+      depth  = vi->depth;
+      visual = vi->visual;
+      XFree (vi);
+      cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
+    }
+  else
+    rxvt_warn ("no visual found for requested id 0x%02x, using default visual.\n", id);
+}
+void
+rxvt_screen::select_depth (int bitdepth)
+{
+  XVisualInfo vinfo;
   if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
-    {
-      depth  = bitdepth;
-      visual = vinfo.visual;
+    select_visual (vinfo.visualid);
-      cmap   = XCreateColormap (dpy, display->root, visual, AllocNone);
+  else
-    }
+    rxvt_warn ("no visual found for requested depth %d, using default visual.\n", bitdepth);
-#endif
 }
+#endif
 void
 rxvt_screen::clear ()
 {
 #if XFT
   flags = 0;
 #if XRENDER
   int major, minor;
   if (XRenderQueryVersion (dpy, &major, &minor))
-    {
-      flags |= DISPLAY_HAS_RENDER;
-      if (major > 0 || (major == 0 && minor >= 11))
+    if (major > 0 || (major == 0 && minor >= 11))
+      {
-        flags |= DISPLAY_HAS_RENDER_MUL;
+        flags |= DISPLAY_HAS_RENDER;
-      XFilters *filters = XRenderQueryFilters (dpy, root);
+        if (XFilters *filters = XRenderQueryFilters (dpy, root))
-      if (filters)
-        {
+          {
-          for (int i = 0; i < filters->nfilter; i++)
+            for (int i = 0; i < filters->nfilter; i++)
-            if (!strcmp (filters->filter[i], FilterConvolution))
+              if (!strcmp (filters->filter [i], FilterConvolution))
-              flags |= DISPLAY_HAS_RENDER_CONV;
+                flags |= DISPLAY_HAS_RENDER_CONV;
-          XFree (filters);
+            XFree (filters);
-        }
+          }
-    }
+      }
 #endif
   int fd = XConnectionNumber (dpy);
   // try to detect whether we have a local connection.
 #ifdef POINTER_BLANK
   XFreeCursor (dpy, blank_cursor);
 #endif
   x_ev.stop ();
   flush_ev.stop ();
-#ifdef USE_XIM
+#if USE_XIM
   xims.clear ();
 #endif
   XrmDestroyDatabase (XrmGetDatabase (dpy));
   XCloseDisplay (dpy);
 }
-#ifdef USE_XIM
+#if USE_XIM
 void rxvt_display::im_change_cb ()
 {
   for (im_watcher **i = imw.begin (); i != imw.end (); ++i)
     (*i)->call ();
 }
     do
       {
         XEvent xev;
         XNextEvent (dpy, &xev);
-#ifdef USE_XIM
+#if USE_XIM
         if (!XFilterEvent (&xev, None))
           {
             if (xev.type == PropertyNotify
                 && xev.xany.window == root
                 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
                 if (!xw[i])
                   xw.erase_unordered (i);
                 else if (xw[i]->window == xev.xany.window)
                   xw[i]->call (xev);
               }
-#ifdef USE_XIM
+#if USE_XIM
           }
 #endif
       }
     while (XEventsQueued (dpy, QueuedAlready));
     }
   cur_owner = owner;
 }
-#ifdef USE_XIM
+#if USE_XIM
 void rxvt_display::reg (im_watcher *w)
 {
   imw.push_back (w);
 }
   unsigned int alpha = color.a >= 0xff00 ? 0xffff : color.a;
 #if XFT
   XRenderPictFormat *format;
+  // not needed by XftColorAlloc, but by the other paths (ours
+  // and fallback), so just set all components here.
+  c.color.red   = color.r;
+  c.color.green = color.g;
+  c.color.blue  = color.b;
+  c.color.alpha = alpha;
   // FUCKING Xft gets it wrong, of course, so work around it.
   // Transparency users should eat shit and die, and then
   // XRenderQueryPictIndexValues themselves plenty.
   if ((screen->visual->c_class == TrueColor)
       && (format = XRenderFindVisualFormat (screen->dpy, screen->visual)))
     {
       // the fun lies in doing everything manually...
-      c.color.red   = color.r;
-      c.color.green = color.g;
-      c.color.blue  = color.b;
-      c.color.alpha = alpha;
       // Xft wants premultiplied alpha, but abuses the alpha channel
       // as blend factor, and doesn't allow us to set the alpha channel
       c.color.red   = c.color.red   * alpha / 0xffff;
       c.color.green = c.color.green * alpha / 0xffff;
       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
-  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
   return got;
 }
 void
-rxvt_color::get (rgba &color)
+rxvt_color::get (rgba &color) const
 {
 #if XFT
   color.r = c.color.red;
   color.g = c.color.green;
   color.b = c.color.blue;
   color.a = c.color.alpha;
+  if (IN_RANGE_INC (color.a, 0x0001, 0xfffe))
+    {
+      color.r = color.r * 0xffff / color.a;
+      color.g = color.g * 0xffff / color.a;
+      color.b = color.b * 0xffff / color.a;
+    }
 #else
   color.r = c.red;
   color.g = c.green;
   color.b = c.blue;
   color.a = rgba::MAX_CC;
-#endif
-}
+#endif
+}
 void
-rxvt_color::get (XColor &color)
+rxvt_color::get (XColor &color) const
 {
   rgba c;
   get (c);
   color.red   = c.r;

Diff Legend

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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents): Revision 1.133 by sf-exg, Sun Jun 3 17:48:28 2012 UTC vs. Revision 1.149 by root, Wed Dec 17 16:03:51 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.133 by sf-exg, Sun Jun 3 17:48:28 2012 UTC vs.
Revision 1.149 by root, Wed Dec 17 16:03:51 2014 UTC