ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtimg.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.40 by root, Thu Jun 7 11:27:08 2012 UTC vs.
Revision 1.41 by root, Thu Jun 7 11:34:09 2012 UTC

… …
2#include "../config.h" 2#include "../config.h"
3#include "rxvt.h" 3#include "rxvt.h"
4 4
5#if HAVE_IMG 5#if HAVE_IMG
6 6
7rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height) 7rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
8: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(RepeatNormal), 8: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9 pm(0), ref(0) 9 pm(0), ref(0)
10{ 10{
11} 11}
12 12
13rxvt_img::rxvt_img (const rxvt_img &img) 13rxvt_img::rxvt_img (const rxvt_img &img)
… …
176 176
177 Display *dpy = s->display->dpy; 177 Display *dpy = s->display->dpy;
178 int size = max (rh, rv) * 2 + 1; 178 int size = max (rh, rv) * 2 + 1;
179 double *kernel = (double *)malloc (size * sizeof (double)); 179 double *kernel = (double *)malloc (size * sizeof (double));
180 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 180 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
181 rxvt_img *img = new rxvt_img (s, format, x, y, w, h); 181 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
182 img->alloc (); 182 img->alloc ();
183 183
184 Picture src = src_picture (); 184 Picture src = src_picture ();
185 185
186 XRenderPictureAttributes pa; 186 XRenderPictureAttributes pa;
… …
403 403
404 bool alpha = !format->direct.alphaMask 404 bool alpha = !format->direct.alphaMask
405 && (x || y) 405 && (x || y)
406 && repeat == RepeatNone; 406 && repeat == RepeatNone;
407 407
408 rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h); 408 rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h, repeat);
409 img->alloc (); 409 img->alloc ();
410 410
411 Picture src = src_picture (); 411 Picture src = src_picture ();
412 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 412 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
413 413
… …
441} 441}
442 442
443rxvt_img * 443rxvt_img *
444rxvt_img::transform (int new_width, int new_height, double matrix[9]) 444rxvt_img::transform (int new_width, int new_height, double matrix[9])
445{ 445{
446 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height); 446 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
447 img->alloc (); 447 img->alloc ();
448 448
449 Display *dpy = s->display->dpy; 449 Display *dpy = s->display->dpy;
450 Picture src = src_picture (); 450 Picture src = src_picture ();
451 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 451 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
… …
500rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 500rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
501{ 501{
502 if (new_format == format) 502 if (new_format == format)
503 return clone (); 503 return clone ();
504 504
505 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h); 505 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h, repeat);
506 img->alloc (); 506 img->alloc ();
507 507
508 Display *dpy = s->display->dpy; 508 Display *dpy = s->display->dpy;
509 Picture src = src_picture (); 509 Picture src = src_picture ();
510 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 510 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);

Diff Legend

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