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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.98 by root, Sun Jun 17 21:58:18 2012 UTC vs.
Revision 1.108 by sf-exg, Fri Nov 7 13:45:55 2014 UTC

  * Copyright (c) 2012      Marc Lehmann <schmorp@schmorp.de>
  * Copyright (c) 2012      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
       src =       srcimg->picture ();
       dst = this->dstimg->picture ();
     }
     ecb_noinline
-    void mask (bool rgb = true, int x = 1, int y = 1)
+    void mask (bool rgb = true, int w = 1, int h = 1)
     {
-      Pixmap pixmap = XCreatePixmap (dpy, srcimg->pm, x, y, rgb ? 32 : 8);
+      Pixmap pixmap = XCreatePixmap (dpy, srcimg->pm, w, h, rgb ? 32 : 8);
       XRenderPictFormat *format = XRenderFindStandardFormat (dpy, rgb ? PictStandardARGB32 : PictStandardA8);
       XRenderPictureAttributes pa;
       pa.repeat = RepeatNormal;
       pa.component_alpha = rgb;
     }
     // CreateSolidFill creates a very very very weird picture
     void mask (const rgba &c)
     {
+      // the casts are needed in C++11 (see 8.5.1)
       XRenderColor rc = {
-        c.r * c.a / 65535,
+        (unsigned short)(c.r * c.a / 65535),
-        c.g * c.a / 65535,
+        (unsigned short)(c.g * c.a / 65535),
-        c.b * c.a / 65535,
+        (unsigned short)(c.b * c.a / 65535),
-              c.a
+        c.a
       };
       msk = XRenderCreateSolidFill (dpy, &rc);
       ecb_assume (msk);
     }
     void fill (const rgba &c)
     {
       XRenderColor rc = {
-        c.r * c.a / 65535,
+        (unsigned short)(c.r * c.a / 65535),
-        c.g * c.a / 65535,
+        (unsigned short)(c.g * c.a / 65535),
-        c.b * c.a / 65535,
+        (unsigned short)(c.b * c.a / 65535),
-              c.a
+        c.a
       };
       XRenderFillRectangle (dpy, PictOpSrc, msk, &rc, 0, 0, 1, 1);
     }
   for (int y = 0; y < height; y++)
     {
       unsigned char *src = row;
       uint32_t      *dst = (uint32_t *)line;
-      if (!pb_has_alpha)
-        for (int x = 0; x < width; x++)
+      for (int x = 0; x < width; x++)
-          {
+        {
-            uint8_t r = *src++;
+          uint8_t r = *src++;
-            uint8_t g = *src++;
+          uint8_t g = *src++;
-            uint8_t b = *src++;
+          uint8_t b = *src++;
+          uint8_t a = *src;
+          // this is done so it can be jump-free, but newer gcc's clone inner the loop
+          a = pb_has_alpha ? a : 255;
+          src += pb_has_alpha;
+          r = (r * a + 127) / 255;
+          g = (g * a + 127) / 255;
+          b = (b * a + 127) / 255;
-            uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
+          uint32_t v = (a << 24) | (r << 16) | (g << 8) | b;
-            if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
+          if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
-              v = ecb_bswap32 (v);
+            v = ecb_bswap32 (v);
-            *dst++ = v;
+          *dst++ = v;
-          }
+        }
-      else
-        for (int x = 0; x < width; x++)
-          {
-            uint32_t v = *(uint32_t *)src; src += 4;
-            if (ecb_big_endian ())
-              v = ecb_bswap32 (v);
-            v = ecb_rotl32 (v, 8); // abgr to bgra
-            if (!byte_order_mismatch)
-              v = ecb_bswap32 (v);
-            *dst++ = v;
-          }
       row += rowstride;
       line += xi.bytes_per_line;
     }
   pm = pm2;
   ref = new pixref (ref->w, ref->h);
 }
 void
-rxvt_img::fill (const rgba &c)
+rxvt_img::fill (const rgba &c, int x, int y, int w, int h)
 {
   XRenderColor rc = { c.r, c.g, c.b, c.a };
   Display *dpy = s->dpy;
   Picture src = picture ();
-  XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
+  XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
   XRenderFreePicture (dpy, src);
+}
+void
+rxvt_img::fill (const rgba &c)
+{
+  fill (c, 0, 0, w, h);
 }
 void
 rxvt_img::add_alpha ()
 {
     return clone ();
   Display *dpy = s->dpy;
   int size = max (rh, rv) * 2 + 1;
   nv *kernel = (nv *)malloc (size * sizeof (nv));
-  XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
+  XFixed *params = rxvt_temp_buf<XFixed> (size + 2);
   rxvt_img *img = new_empty ();
   XRenderPictureAttributes pa;
   pa.repeat = RepeatPad;
   Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
                         0, 0,
                         w, h);
     }
   free (kernel);
-  free (params);
   XRenderFreePicture (dpy, src);
   XRenderFreePicture (dpy, dst);
   XRenderFreePicture (dpy, tmp);
   return img;
+}
+rxvt_img *
+rxvt_img::muladd (nv mul, nv add)
+{
+  // STEP 1: double the image width, fill all odd columns with white (==1)
+  composer cc (this, new rxvt_img (s, format, 0, 0, w * 2, h, repeat));
+  // why the hell does XRenderSetPictureTransform want a writable matrix :(
+  // that keeps us from just static const'ing this matrix.
+  XTransform h_double = {
+    0x08000, 0,     0,
+    0, 0x10000,     0,
+    0,     0, 0x10000
+  };
+  XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
+  XRenderSetPictureTransform (cc.dpy, cc.src, &h_double);
+  XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
+  cc.mask (false, 2, 1);
+  static const XRenderColor c0 = {     0,     0,     0,     0 };
+  XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c0, 0, 0, 1, 1);
+  static const XRenderColor c1 = { 65535, 65535, 65535, 65535 };
+  XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c1, 1, 0, 1, 1);
+  Picture white = XRenderCreateSolidFill (cc.dpy, &c1);
+  XRenderComposite (cc.dpy, PictOpOver, white, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
+  XRenderFreePicture (cc.dpy, white);
+  // STEP 2: convolve the image with a 3x1 filter
+  // a 2x1 filter would obviously suffice, but given the total lack of specification
+  // for xrender, I expect different xrender implementations to randomly diverge.
+  // we also halve the image, and hope for the best (again, for lack of specs).
+  composer cc2 (cc.dstimg);
+  XFixed kernel [] = {
+    XDoubleToFixed (3), XDoubleToFixed (1),
+    XDoubleToFixed (0), XDoubleToFixed (mul), XDoubleToFixed (add)
+  };
+  XTransform h_halve = {
+    0x20000, 0,      0,
+    0, 0x10000,      0,
+    0,      0, 0x10000
+  };
+  XRenderSetPictureFilter (cc.dpy, cc2.src, "nearest", 0, 0);
+  XRenderSetPictureTransform (cc.dpy, cc2.src, &h_halve);
+  XRenderSetPictureFilter (cc.dpy, cc2.src, FilterConvolution, kernel, ecb_array_length (kernel));
+  XRenderComposite (cc.dpy, PictOpSrc, cc2.src, None, cc2.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
+  return cc2;
 }
 ecb_noinline static void
 extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
 {
 rxvt_img::reify ()
 {
   if (x == 0 && y == 0 && w == ref->w && h == ref->h)
     return clone ();
-  Display *dpy = s->dpy;
   // add an alpha channel if...
   bool alpha = !format->direct.alphaMask // pixmap has none yet
                && (x || y)               // we need one because of non-zero offset
                && repeat == RepeatNone;  // and we have no good pixels to fill with
   composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
                                    0, 0, w, h, repeat));
-  if (alpha)
+  if (repeat == RepeatNone)
     {
       XRenderColor rc = { 0, 0, 0, 0 };
       XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
       XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
     }
 }
 rxvt_img *
 rxvt_img::rotate (int cx, int cy, nv phi)
 {
-#if 0
-    { c, -s, cx - c * cx + s * cy },
-    { s,  c, cy - s * cx - c * cy },
-    { 0,  0,                    1 }
-#endif
   move (-cx, -cy);
   rxvt_img *img = transform (mat3x3::rotate (phi));
   move ( cx,  cy);
   img->move (cx, cy);
   return cc;
 }
 rxvt_img *
+rxvt_img::shade (nv factor, rgba c)
+{
+  clamp_it (factor, -1., 1.);
+  factor++;
+  if (factor > 1)
+    {
+      c.r = c.r * (2 - factor);
+      c.g = c.g * (2 - factor);
+      c.b = c.b * (2 - factor);
+    }
+  else
+    {
+      c.r = c.r * factor;
+      c.g = c.g * factor;
+      c.b = c.b * factor;
+    }
+  rxvt_img *img = this->tint (c);
+  if (factor > 1)
+    {
+      c.a = 0xffff;
+      c.r =
+      c.g =
+      c.b = 0xffff * (factor - 1);
+      img->brightness (c.r, c.g, c.b, c.a);
+    }
+  return img;
+}
+rxvt_img *
 rxvt_img::filter (const char *name, int nparams, nv *params)
 {
-  rxvt_img *img = new_empty ();
-  composer cc (img);
+  composer cc (this);
   XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
   for (int i = 0; i < nparams; ++i)
     xparams [i] = XDoubleToFixed (params [i]);

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.98 by root, Sun Jun 17 21:58:18 2012 UTC vs. Revision 1.108 by sf-exg, Fri Nov 7 13:45:55 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.98 by root, Sun Jun 17 21:58:18 2012 UTC vs.
Revision 1.108 by sf-exg, Fri Nov 7 13:45:55 2014 UTC