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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.105 by sf-exg, Sat Jan 19 10:04:34 2013 UTC vs.
Revision 1.112 by root, Tue Sep 17 18:31:32 2019 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
       if (!this->dstimg)
         this->dstimg = srcimg->new_empty ();
       else if (!this->dstimg->pm) // somewhat unsatisfying
         this->dstimg->alloc ();
-      dpy =       srcimg->s->dpy;
+      dpy =       srcimg->d->dpy;
       src =       srcimg->picture ();
       dst = this->dstimg->picture ();
     }
     ecb_noinline
     }
     // 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);
     }
   // should be a very good fallback
   return XRenderFindStandardFormat (dpy, PictStandardARGB32);
 }
 rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
-: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
+: d(screen->display), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
   pm(0), ref(0)
 {
 }
+rxvt_img::rxvt_img (rxvt_display *display, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
+: d(display), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
+  pm(0), ref(0)
+{
+}
 rxvt_img::rxvt_img (const rxvt_img &img)
-: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
+: d(img.d), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
 {
   ++ref->cnt;
 }
 rxvt_img *
 {
   GError *err = 0;
   GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
   if (!pb)
+    try
+      {
-    rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
+        rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
+      }
+    catch (...)
+      {
+        g_error_free (err);
+        throw;
+      }
   rxvt_img *img = new_from_pixbuf (s, pb);
   g_object_unref (pb);
 {
   if (--ref->cnt)
     return;
   if (pm && ref->ours)
-    XFreePixmap (s->dpy, pm);
+    XFreePixmap (d->dpy, pm);
   delete ref;
 }
 rxvt_img::~rxvt_img ()
 }
 void
 rxvt_img::alloc ()
 {
-  pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
+  pm = XCreatePixmap (d->dpy, d->root, w, h, format->depth);
   ref = new pixref (w, h);
 }
 rxvt_img *
 rxvt_img::new_empty ()
 {
-  rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
+  rxvt_img *img = new rxvt_img (d, format, x, y, w, h, repeat);
   img->alloc ();
   return img;
 }
 Picture
 rxvt_img::picture ()
 {
-  Display *dpy = s->dpy;
+  Display *dpy = d->dpy;
   XRenderPictureAttributes pa;
   pa.repeat = repeat;
   Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
 rxvt_img::unshare ()
 {
   if (ref->cnt == 1 && ref->ours)
     return;
-  Pixmap pm2 = XCreatePixmap (s->dpy, s->display->root, ref->w, ref->h, format->depth);
+  Pixmap pm2 = XCreatePixmap (d->dpy, d->root, ref->w, ref->h, format->depth);
-  GC gc = XCreateGC (s->dpy, pm, 0, 0);
+  GC gc = XCreateGC (d->dpy, pm, 0, 0);
-  XCopyArea (s->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
+  XCopyArea (d->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
-  XFreeGC (s->dpy, gc);
+  XFreeGC (d->dpy, gc);
   destroy ();
   pm = pm2;
   ref = new pixref (ref->w, ref->h);
 void
 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;
+  Display *dpy = d->dpy;
   Picture src = picture ();
   XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
   XRenderFreePicture (dpy, src);
 }
 rxvt_img::add_alpha ()
 {
   if (format->direct.alphaMask)
     return;
-  composer cc (this, new rxvt_img (s, find_alpha_format_for (s->dpy, format), x, y, w, h, repeat));
+  composer cc (this, new rxvt_img (d, find_alpha_format_for (d->dpy, format), x, y, w, h, repeat));
   XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
   rxvt_img *img = cc;
 }
 rxvt_img *
 rxvt_img::blur (int rh, int rv)
 {
-  if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
+  if (!(d->flags & DISPLAY_HAS_RENDER_CONV))
     return clone ();
-  Display *dpy = s->dpy;
+  Display *dpy = d->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);
 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));
+  composer cc (this, new rxvt_img (d, 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,
 void
 rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
 {
   unshare ();
-  Display *dpy = s->dpy;
+  Display *dpy = d->dpy;
   Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
   // loop should not be needed for brightness, as only -1..1 makes sense
   //while (r | g | b | a)
     {
   // 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,
+  composer cc (this, new rxvt_img (d, alpha ? find_alpha_format_for (d->dpy, format) : format,
                                    0, 0, w, h, repeat));
   if (repeat == RepeatNone)
     {
       XRenderColor rc = { 0, 0, 0, 0 };
   int new_width  = ceil (rmax [0] - rmin [0]);
   int new_height = ceil (rmax [1] - rmin [1]);
   mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
-  composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat));
+  composer cc (this, new rxvt_img (d, format, nx, ny, new_width, new_height, repeat));
   XTransform xfrm;
   for (int i = 0; i < 3; ++i)
     for (int j = 0; j < 3; ++j)
 rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
 {
   if (new_format == format)
     return clone ();
-  composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
+  composer cc (this, new rxvt_img (d, new_format, x, y, w, h, repeat));
   int op = PictOpSrc;
   if (format->direct.alphaMask && !new_format->direct.alphaMask)
     {

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.105 by sf-exg, Sat Jan 19 10:04:34 2013 UTC vs. Revision 1.112 by root, Tue Sep 17 18:31:32 2019 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.105 by sf-exg, Sat Jan 19 10:04:34 2013 UTC vs.
Revision 1.112 by root, Tue Sep 17 18:31:32 2019 UTC