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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.35 by root, Thu Jun 7 08:36:53 2012 UTC vs.
Revision 1.38 by sf-exg, Thu Jun 7 09:57:09 2012 UTC

   Display *dpy = s->display->dpy;
   XRenderPictureAttributes pa;
   pa.repeat = repeat;
   Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
-  XRectangle clip = { -x, -y, min (w, ref->w), min (h, ref->h) };
-  XRenderSetPictureClipRectangles (dpy, pic, 0, 0, &clip, 1);
   return pic;
 }
 void
 rxvt_img *
 rxvt_img::sub_rect (int x, int y, int width, int height)
 {
   rxvt_img *img = clone ();
-  //TODO: width > w, must reify
   img->x += x;
   img->y += y;
+  if (w != width || h != height)
+    {
-  img->w = width;
+      img->w = width;
-  img->h = height;
+      img->h = height;
+      img->reify ();
+    }
   return img;
 }
 rxvt_img *
 rxvt_img *
 rxvt_img::blend (rxvt_img *img, double factor)
 {
   rxvt_img *img2 = clone ();
   Display *dpy = s->display->dpy;
-  Picture src = src_picture ();
+  Picture src = img->src_picture ();
   Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
   Picture mask = create_xrender_mask (dpy, img->pm, False);
   XRenderColor mask_c;

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