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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.34 by root, Thu Jun 7 08:36:09 2012 UTC vs.
Revision 1.36 by root, Thu Jun 7 08:45:34 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::reify ()
 {
+  if (x == 0 && y == 0 && w == ref->w && h == ref->h)
+    return clone ();
   rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h);
   img->alloc ();
-  // todo, if x==0  and y==0 and w==real width we could clone
-  // but that involves an rtt to find pixmap width.
   Display *dpy = s->display->dpy;
   Picture src = src_picture ();
   Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
 }
 rxvt_img *
 rxvt_img::sub_rect (int x, int y, int width, int height)
 {
+  bool need_reify = w < width || h < height;
   rxvt_img *img = clone ();
-  //TODO: width > w, must reify
   img->x += x;
   img->y += y;
   img->w = width;
   img->h = height;
+  if (need_reify)
+    img->reify ();
   return img;
 }
 rxvt_img *

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