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

Diff Legend

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