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

Diff Legend

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