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.33 by root, Thu Jun 7 08:12:55 2012 UTC vs.
Revision 1.65 by root, Fri Jun 8 21:41:45 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), refcnt(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)
14: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), refcnt(img.refcnt) 14: 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)
15{ 15{
16 if (refcnt)
17 ++*refcnt; 16 ++ref->cnt;
18} 17}
19
20#if 0
21rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap)
22: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
23{
24}
25#endif
26 18
27rxvt_img * 19rxvt_img *
28rxvt_img::new_from_root (rxvt_screen *s) 20rxvt_img::new_from_root (rxvt_screen *s)
29{ 21{
30 Display *dpy = s->display->dpy; 22 Display *dpy = s->display->dpy;
… …
51 root_pm_w, 43 root_pm_w,
52 root_pm_h 44 root_pm_h
53 ); 45 );
54 46
55 img->pm = root_pixmap; 47 img->pm = root_pixmap;
48 img->ref = new pixref (root_pm_w, root_pm_h);
49 img->ref->ours = false;
50
51 return img;
52}
53
54rxvt_img *
55rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
56{
57 Display *dpy = s->display->dpy;
58
59 int width = gdk_pixbuf_get_width (pb);
60 int height = gdk_pixbuf_get_height (pb);
61
62 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
63 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
64
65 // since we require rgb24/argb32 formats from xrender we assume
66 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender
67 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
68
69 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
70
71 XImage xi;
72
73 xi.width = width;
74 xi.height = height;
75 xi.xoffset = 0;
76 xi.format = ZPixmap;
77 xi.byte_order = ImageByteOrder (dpy);
78 xi.bitmap_unit = 0; //XY only, unused
79 xi.bitmap_bit_order = 0; //XY only, unused
80 xi.bitmap_pad = BitmapPad (dpy);
81 xi.depth = depth;
82 xi.bytes_per_line = 0;
83 xi.bits_per_pixel = 32; //Z only
84 xi.red_mask = 0x00000000; //Z only, unused
85 xi.green_mask = 0x00000000; //Z only, unused
86 xi.blue_mask = 0x00000000; //Z only, unused
87 xi.obdata = 0; // probably unused
88
89 bool byte_order_mismatch = byte_order != xi.byte_order;
90
91 if (!XInitImage (&xi))
92 rxvt_fatal ("unable to initialise ximage, please report.\n");
93
94 if (height > INT_MAX / xi.bytes_per_line)
95 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
96
97 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
98
99 int rowstride = gdk_pixbuf_get_rowstride (pb);
100
101 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
102 unsigned char *row = gdk_pixbuf_get_pixels (pb);
103 char *line = xi.data;
104
105 for (int y = 0; y < height; y++)
106 {
107 unsigned char *src = row;
108 uint32_t *dst = (uint32_t *)line;
109
110 if (depth == 24)
111 for (int x = 0; x < width; x++)
112 {
113 uint8_t r = *src++;
114 uint8_t g = *src++;
115 uint8_t b = *src++;
116
117 uint32_t v = (r << 16) | (g << 8) | b;
118
119 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
120 v = ecb_bswap32 (v);
121
122 *dst++ = v;
123 }
124 else
125 for (int x = 0; x < width; x++)
126 {
127 uint32_t v = *(uint32_t *)src; src += 4;
128
129 if (ecb_big_endian ())
130 v = ecb_bswap32 (v);
131
132 v = ecb_rotl32 (v, 8); // abgr to bgra
133
134 if (!byte_order_mismatch)
135 v = ecb_bswap32 (v);
136
137 *dst++ = v;
138 }
139
140 row += rowstride;
141 line += xi.bytes_per_line;
142 }
143
144 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
145 img->alloc ();
146
147 GC gc = XCreateGC (dpy, img->pm, 0, 0);
148 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
149 XFreeGC (dpy, gc);
150
151 free (xi.data);
56 152
57 return img; 153 return img;
58} 154}
59 155
60rxvt_img * 156rxvt_img *
… …
64 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 160 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
65 161
66 if (!pb) 162 if (!pb)
67 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 163 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
68 164
69 rxvt_img *img = new rxvt_img ( 165 rxvt_img *img = new_from_pixbuf (s, pb);
70 s,
71 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
72 0,
73 0,
74 gdk_pixbuf_get_width (pb),
75 gdk_pixbuf_get_height (pb)
76 );
77 img->alloc ();
78 img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
79 166
80 g_object_unref (pb); 167 g_object_unref (pb);
81 168
82 return img; 169 return img;
83} 170}
84 171
85void 172void
86rxvt_img::destroy () 173rxvt_img::destroy ()
87{ 174{
88 if (!refcnt || --*refcnt) 175 if (--ref->cnt)
89 return; 176 return;
90 177
91 if (pm) 178 if (pm && ref->ours)
92 XFreePixmap (s->display->dpy, pm); 179 XFreePixmap (s->display->dpy, pm);
93 180
94 delete refcnt; 181 delete ref;
95} 182}
96 183
97rxvt_img::~rxvt_img () 184rxvt_img::~rxvt_img ()
98{ 185{
99 destroy (); 186 destroy ();
… …
101 188
102void 189void
103rxvt_img::alloc () 190rxvt_img::alloc ()
104{ 191{
105 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 192 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
106 refcnt = new int (1); 193 ref = new pixref (w, h);
194}
195
196Picture
197rxvt_img::src_picture ()
198{
199 Display *dpy = s->display->dpy;
200
201 XRenderPictureAttributes pa;
202 pa.repeat = repeat;
203 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
204
205 return pic;
107} 206}
108 207
109void 208void
110rxvt_img::unshare () 209rxvt_img::unshare ()
111{ 210{
112 if (refcnt && *refcnt == 1) 211 if (ref->cnt == 1 && ref->ours)
113 return; 212 return;
114 213
115 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 214 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
116 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 215 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
117 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0); 216 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
118 XFreeGC (s->display->dpy, gc); 217 XFreeGC (s->display->dpy, gc);
119 218
120 destroy (); 219 destroy ();
121 220
122 pm = pm2; 221 pm = pm2;
123 refcnt = new int (1); 222 ref = new pixref (ref->w, ref->h);
124} 223}
125 224
126void 225void
127rxvt_img::fill (const rxvt_color &c) 226rxvt_img::fill (const rxvt_color &c)
128{ 227{
… …
162 261
163 Display *dpy = s->display->dpy; 262 Display *dpy = s->display->dpy;
164 int size = max (rh, rv) * 2 + 1; 263 int size = max (rh, rv) * 2 + 1;
165 double *kernel = (double *)malloc (size * sizeof (double)); 264 double *kernel = (double *)malloc (size * sizeof (double));
166 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 265 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
167 rxvt_img *img = new rxvt_img (s, format, x, y, w, h); 266 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
168 img->alloc (); 267 img->alloc ();
169 268
170 XRenderPictureAttributes pa; 269 XRenderPictureAttributes pa;
171
172 pa.repeat = RepeatPad; 270 pa.repeat = RepeatPad;
173 Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa); 271 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
174 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 272 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
175 273
176 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 274 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
177 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 275 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
178 XFreePixmap (dpy, tmp_pm); 276 XFreePixmap (dpy, tmp_pm);
179 277
… …
195 293
196 size = rv * 2 + 1; 294 size = rv * 2 + 1;
197 get_gaussian_kernel (rv, size, kernel, params); 295 get_gaussian_kernel (rv, size, kernel, params);
198 ::swap (params[0], params[1]); 296 ::swap (params[0], params[1]);
199 297
200 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 298 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
201 XRenderComposite (dpy, 299 XRenderComposite (dpy,
202 PictOpSrc, 300 PictOpSrc,
203 tmp, 301 tmp,
204 None, 302 None,
205 dst, 303 dst,
… …
232 330
233 return mask; 331 return mask;
234} 332}
235 333
236void 334void
237rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 335rxvt_img::brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a)
238{ 336{
239 Display *dpy = s->display->dpy; 337 Display *dpy = s->display->dpy;
240 Picture src = create_xrender_mask (dpy, pm, True); 338 Picture src = create_xrender_mask (dpy, pm, True);
241 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 339 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
242 340
… …
252 XRenderFreePicture (dpy, src); 350 XRenderFreePicture (dpy, src);
253 XRenderFreePicture (dpy, dst); 351 XRenderFreePicture (dpy, dst);
254} 352}
255 353
256void 354void
257rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 355rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a)
258{ 356{
259 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 357 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
358 {
359 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
260 return; 360 return;
361 }
261 362
262 Display *dpy = s->display->dpy; 363 Display *dpy = s->display->dpy;
263 Picture src = create_xrender_mask (dpy, pm, True); 364 Picture src = create_xrender_mask (dpy, pm, True);
264 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 365 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
265 366
… …
274 375
275 XRenderFreePicture (dpy, src); 376 XRenderFreePicture (dpy, src);
276 XRenderFreePicture (dpy, dst); 377 XRenderFreePicture (dpy, dst);
277} 378}
278 379
279bool
280rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
281{
282 Display *dpy = s->display->dpy;
283
284 if (s->visual->c_class != TrueColor)
285 return false;
286
287 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
288
289 red_mask = (uint32_t)format->direct.redMask << format->direct.red;
290 green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
291 blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
292 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
293
294 int width_r = ecb_popcount32 (red_mask);
295 int width_g = ecb_popcount32 (green_mask);
296 int width_b = ecb_popcount32 (blue_mask);
297 int width_a = ecb_popcount32 (alpha_mask);
298
299 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
300 return false;
301
302 int sh_r = ecb_ctz32 (red_mask);
303 int sh_g = ecb_ctz32 (green_mask);
304 int sh_b = ecb_ctz32 (blue_mask);
305 int sh_a = ecb_ctz32 (alpha_mask);
306
307 if (width > 32767 || height > 32767)
308 return false;
309
310 XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
311 width, height, 32, 0);
312 if (!ximage)
313 return false;
314
315 if (height > INT_MAX / ximage->bytes_per_line
316 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
317 {
318 XDestroyImage (ximage);
319 return false;
320 }
321
322 GC gc = XCreateGC (dpy, pm, 0, 0);
323
324 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
325
326 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
327 int channels = gdk_pixbuf_get_n_channels (pixbuf);
328 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
329 char *line = ximage->data;
330
331 for (int y = 0; y < height; y++)
332 {
333 for (int x = 0; x < width; x++)
334 {
335 unsigned char *pixel = row + x * channels;
336 uint32_t value;
337 unsigned char r, g, b, a;
338
339 if (channels == 4)
340 {
341 a = pixel[3];
342 r = pixel[0] * a / 0xff;
343 g = pixel[1] * a / 0xff;
344 b = pixel[2] * a / 0xff;
345 }
346 else
347 {
348 a = 0xff;
349 r = pixel[0];
350 g = pixel[1];
351 b = pixel[2];
352 }
353
354 value = ((r >> (8 - width_r)) << sh_r)
355 | ((g >> (8 - width_g)) << sh_g)
356 | ((b >> (8 - width_b)) << sh_b)
357 | ((a >> (8 - width_a)) << sh_a);
358
359 if (ximage->bits_per_pixel == 32)
360 ((uint32_t *)line)[x] = value;
361 else
362 XPutPixel (ximage, x, y, value);
363 }
364
365 row += rowstride;
366 line += ximage->bytes_per_line;
367 }
368
369 XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
370 XDestroyImage (ximage);
371 XFreeGC (dpy, gc);
372
373 return true;
374}
375
376rxvt_img * 380rxvt_img *
377rxvt_img::clone () 381rxvt_img::clone ()
378{ 382{
379 return new rxvt_img (*this); 383 return new rxvt_img (*this);
380} 384}
381 385
386static XRenderPictFormat *
387find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
388{
389 if (format->direct.alphaMask)
390 return format; // already has alpha
391
392 // try to find a suitable alpha format, one bit alpha is enough for our purposes
393 if (format->type == PictTypeDirect)
394 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
395 if (f->direct.alphaMask
396 && f->type == PictTypeDirect
397 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
398 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
399 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
400 return f;
401
402 // should be a very good fallback
403 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
404}
405
382rxvt_img * 406rxvt_img *
383rxvt_img::reify () 407rxvt_img::reify ()
384{ 408{
385 rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h); 409 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
410 return clone ();
411
412 Display *dpy = s->display->dpy;
413
414 // add an alpha channel if...
415 bool alpha = !format->direct.alphaMask // pixmap has none yet
416 && (x || y) // we need one because of non-zero offset
417 && repeat == RepeatNone; // and we have no good pixels to fill with
418
419 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
386 img->alloc (); 420 img->alloc ();
387 421
388 // todo, if x==0 and y==0 and w==real width we could clone 422 Picture src = src_picture ();
389 // but that involves an rtt to find pixmap width.
390
391 Display *dpy = s->display->dpy;
392 XRenderPictureAttributes pa;
393 pa.repeat = repeat;
394 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
395 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 423 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
396 424
425 if (alpha)
426 {
427 XRenderColor rc = { 0, 0, 0, 0 };
428 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
429 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
430 }
431 else
397 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 432 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
398 433
399 XRenderFreePicture (dpy, src); 434 XRenderFreePicture (dpy, src);
400 XRenderFreePicture (dpy, dst); 435 XRenderFreePicture (dpy, dst);
401 436
402 return img; 437 return img;
403} 438}
… …
407{ 442{
408 rxvt_img *img = clone (); 443 rxvt_img *img = clone ();
409 444
410 img->x += x; 445 img->x += x;
411 img->y += y; 446 img->y += y;
447
448 if (w != width || h != height)
449 {
412 img->w = width; 450 img->w = width;
413 img->h = height; 451 img->h = height;
452
453 rxvt_img *img2 = img->reify ();
454 delete img;
455 img = img2;
456 }
414 457
415 return img; 458 return img;
416} 459}
417 460
418rxvt_img * 461rxvt_img *
419rxvt_img::transform (int new_width, int new_height, double matrix[9]) 462rxvt_img::transform (int new_width, int new_height, double matrix[9])
420{ 463{
421 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height); 464 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
422 img->alloc (); 465 img->alloc ();
423 466
424 Display *dpy = s->display->dpy; 467 Display *dpy = s->display->dpy;
425 XRenderPictureAttributes pa; 468 Picture src = src_picture ();
426 pa.repeat = repeat;
427 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
428 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 469 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
429 470
430 XTransform xfrm; 471 XTransform xfrm;
431 472
432 for (int i = 0; i < 3; ++i) 473 for (int i = 0; i < 3; ++i)
433 for (int j = 0; j < 3; ++j) 474 for (int j = 0; j < 3; ++j)
434 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 475 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
435 476
477#if 0
436 xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO 478 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
437 xfrm.matrix [0][3] += XDoubleToFixed (y); 479 xfrm.matrix [1][2] -= XDoubleToFixed (y);
480#endif
438 481
439 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 482 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
440 XRenderSetPictureTransform (dpy, src, &xfrm); 483 XRenderSetPictureTransform (dpy, src, &xfrm);
441 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 484 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
442 485
… …
447} 490}
448 491
449rxvt_img * 492rxvt_img *
450rxvt_img::scale (int new_width, int new_height) 493rxvt_img::scale (int new_width, int new_height)
451{ 494{
495 if (w == new_width && h == new_height)
496 return clone ();
497
452 double matrix[9] = { 498 double matrix[9] = {
453 w / (double)new_width, 0, 0, 499 w / (double)new_width, 0, 0,
454 0, h / (double)new_height, 0, 500 0, h / (double)new_height, 0,
455 0, 0, 1 501 0, 0, 1
456 }; 502 };
457 503
504 int old_repeat_mode = repeat;
505 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
506
458 return transform (new_width, new_height, matrix); 507 rxvt_img *img = transform (new_width, new_height, matrix);
508
509 repeat = old_repeat_mode;
510 img->repeat = repeat;
511
512 return img;
459} 513}
460 514
461rxvt_img * 515rxvt_img *
462rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 516rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
463{ 517{
… …
472 526
473 return transform (new_width, new_height, matrix); 527 return transform (new_width, new_height, matrix);
474} 528}
475 529
476rxvt_img * 530rxvt_img *
477rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 531rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
478{ 532{
479 if (new_format == format) 533 if (new_format == format)
480 return clone (); 534 return clone ();
481 535
482 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h); 536 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
483 img->alloc (); 537 img->alloc ();
484 538
485 Display *dpy = s->display->dpy; 539 Display *dpy = s->display->dpy;
486 Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0); 540 Picture src = src_picture ();
487 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 541 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
488 int op = PictOpSrc; 542 int op = PictOpSrc;
489 543
490 if (format->direct.alphaMask && !new_format->direct.alphaMask) 544 if (format->direct.alphaMask && !new_format->direct.alphaMask)
491 { 545 {
… …
510rxvt_img * 564rxvt_img *
511rxvt_img::blend (rxvt_img *img, double factor) 565rxvt_img::blend (rxvt_img *img, double factor)
512{ 566{
513 rxvt_img *img2 = clone (); 567 rxvt_img *img2 = clone ();
514 Display *dpy = s->display->dpy; 568 Display *dpy = s->display->dpy;
515 Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 569 Picture src = img->src_picture ();
516 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 570 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
517 Picture mask = create_xrender_mask (dpy, img->pm, False); 571 Picture mask = create_xrender_mask (dpy, img->pm, False);
518 572
519 XRenderColor mask_c; 573 XRenderColor mask_c;
520 574

Diff Legend

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