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.29 by root, Wed Jun 6 20:55:36 2012 UTC vs.
Revision 1.50 by root, Thu Jun 7 19:42: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
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), w(width), h(height), format(format), 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), pm(pixmap), w(width), h(height), format(format), shared(false) 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 XImage xi;
77
78 xi.width = width;
79 xi.height = height;
80 xi.xoffset = 0;
81 xi.format = ZPixmap;
82 xi.byte_order = LSBFirst; // maybe go for host byte order, because servers are usually local?
83 xi.bitmap_unit = 32;
84 xi.bitmap_bit_order = LSBFirst;
85 xi.bitmap_pad = BitmapPad (dpy);
86 xi.depth = depth;
87 xi.bytes_per_line = 0;
88 xi.bits_per_pixel = 32;
89 xi.red_mask = 0x000000ff;
90 xi.green_mask = 0x0000ff00;
91 xi.blue_mask = 0x00ff0000;
92
93 if (!XInitImage (&xi))
94 rxvt_fatal ("unable to initialise ximage, please report.\n");
95
96 if (height > INT_MAX / xi.bytes_per_line)
97 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
98
99 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
100
101 int rowstride = gdk_pixbuf_get_rowstride (pb);
102
103 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
104 unsigned char *row = gdk_pixbuf_get_pixels (pb);
105 char *line = xi.data;
106
107 for (int y = 0; y < height; y++)
108 {
109 unsigned char *src = row;
110 uint32_t *dst = (uint32_t *)line;
111
112 if (depth == 24)
113 for (int x = 0; x < width; x++)
114 {
115 uint8_t r = *src++;
116 uint8_t g = *src++;
117 uint8_t b = *src++;
118
119 uint32_t v = r | (g << 8) | (b << 16);
120
121 if (ecb_big_endian ())
122 v = ecb_bswap32 (v);
123
124 *dst++ = x;
125 }
126 else
127 for (int x = 0; x < width; x++)
128 {
129 uint32_t v = *(uint32_t *)src; src += 4;
130 v = ecb_big_endian () ? ecb_rotr32 (v, 8) : ecb_rotl32 (v, 8);
131 *dst++ = ecb_bswap32 (v);
132 }
133
134 row += rowstride;
135 line += xi.bytes_per_line;
136 }
137
138 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
139 img->alloc ();
140
141 GC gc = XCreateGC (dpy, img->pm, 0, 0);
142 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
143 XFreeGC (dpy, gc);
144
145 free (xi.data);
48 146
49 return img; 147 return img;
50} 148}
51 149
52rxvt_img * 150rxvt_img *
… …
56 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 154 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
57 155
58 if (!pb) 156 if (!pb)
59 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 157 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
60 158
61 rxvt_img *img = new rxvt_img ( 159 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 160
70 g_object_unref (pb); 161 g_object_unref (pb);
71 162
72 return img; 163 return img;
73} 164}
74 165
166void
167rxvt_img::destroy ()
168{
169 if (--ref->cnt)
170 return;
171
172 if (pm && ref->ours)
173 XFreePixmap (s->display->dpy, pm);
174
175 delete ref;
176}
177
75rxvt_img::~rxvt_img () 178rxvt_img::~rxvt_img ()
76{ 179{
77 if (!shared) 180 destroy ();
78 XFreePixmap (s->display->dpy, pm); 181}
182
183void
184rxvt_img::alloc ()
185{
186 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
187 ref = new pixref (w, h);
188}
189
190Picture
191rxvt_img::src_picture ()
192{
193 Display *dpy = s->display->dpy;
194
195 XRenderPictureAttributes pa;
196 pa.repeat = repeat;
197 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
198
199 return pic;
79} 200}
80 201
81void 202void
82rxvt_img::unshare () 203rxvt_img::unshare ()
83{ 204{
84 if (!shared) 205 if (ref->cnt == 1 && ref->ours)
85 return; 206 return;
86 207
87 rxvt_img *img = clone (); 208 //TODO: maybe should reify instead
209 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
210 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
211 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
212 XFreeGC (s->display->dpy, gc);
88 213
89 ::swap (pm , img->pm); 214 destroy ();
90 ::swap (shared, img->shared);
91 215
92 delete img; 216 pm = pm2;
217 ref = new pixref (ref->w, ref->h);
93} 218}
94 219
95void 220void
96rxvt_img::fill (const rxvt_color &c) 221rxvt_img::fill (const rxvt_color &c)
97{ 222{
… …
131 256
132 Display *dpy = s->display->dpy; 257 Display *dpy = s->display->dpy;
133 int size = max (rh, rv) * 2 + 1; 258 int size = max (rh, rv) * 2 + 1;
134 double *kernel = (double *)malloc (size * sizeof (double)); 259 double *kernel = (double *)malloc (size * sizeof (double));
135 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 260 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
136 rxvt_img *img = new rxvt_img (s, format, w, h); 261 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
262 img->alloc ();
263
264 Picture src = src_picture ();
137 265
138 XRenderPictureAttributes pa; 266 XRenderPictureAttributes pa;
139
140 pa.repeat = RepeatPad; 267 pa.repeat = RepeatPad;
141 Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);
142 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 268 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
143 269
144 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 270 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
145 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 271 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
146 XFreePixmap (dpy, tmp_pm); 272 XFreePixmap (dpy, tmp_pm);
… …
200 326
201 return mask; 327 return mask;
202} 328}
203 329
204void 330void
205rxvt_img::brightness (double r, double g, double b, double a) 331rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
206{ 332{
207 Display *dpy = s->display->dpy; 333 Display *dpy = s->display->dpy;
208 Picture src = create_xrender_mask (dpy, pm, True); 334 Picture src = create_xrender_mask (dpy, pm, True);
209 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 335 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
210 336
211 XRenderColor mask_c; 337 XRenderColor mask_c;
212 mask_c.red = float_to_component (r); 338 mask_c.red = r;
213 mask_c.green = float_to_component (g); 339 mask_c.green = g;
214 mask_c.blue = float_to_component (b); 340 mask_c.blue = b;
215 mask_c.alpha = float_to_component (a); 341 mask_c.alpha = a;
216 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 342 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
217 343
218 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 344 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
219 345
220 XRenderFreePicture (dpy, src); 346 XRenderFreePicture (dpy, src);
221 XRenderFreePicture (dpy, dst); 347 XRenderFreePicture (dpy, dst);
222} 348}
223 349
224void 350void
225rxvt_img::contrast (double r, double g, double b, double a) 351rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
226{ 352{
227 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 353 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
228 return; 354 return;
229 355
230 Display *dpy = s->display->dpy; 356 Display *dpy = s->display->dpy;
231 Picture src = create_xrender_mask (dpy, pm, True); 357 Picture src = create_xrender_mask (dpy, pm, True);
232 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 358 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
233 359
234 XRenderColor mask_c; 360 XRenderColor mask_c;
235 mask_c.red = float_to_component (r); 361 mask_c.red = r;
236 mask_c.green = float_to_component (g); 362 mask_c.green = g;
237 mask_c.blue = float_to_component (b); 363 mask_c.blue = b;
238 mask_c.alpha = float_to_component (a); 364 mask_c.alpha = a;
239 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 365 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
240 366
241 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 367 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
242 368
243 XRenderFreePicture (dpy, src); 369 XRenderFreePicture (dpy, src);
244 XRenderFreePicture (dpy, dst); 370 XRenderFreePicture (dpy, dst);
245} 371}
246 372
247bool 373rxvt_img *
248rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y) 374rxvt_img::clone ()
249{ 375{
250 Display *dpy = s->display->dpy; 376 return new rxvt_img (*this);
377}
251 378
252 if (s->visual->c_class != TrueColor) 379static XRenderPictFormat *
380find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
381{
382 if (format->direct.alphaMask)
383 return format; // already has alpha
384
385 // try to find a suitable alpha format, one bit alpha is enough for our purposes
386 if (format->type == PictTypeDirect)
387 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
388 if (f->direct.alphaMask
389 && f->type == PictTypeDirect
390 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
391 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
392 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
253 return false; 393 return f;
254 394
255 uint32_t red_mask, green_mask, blue_mask, alpha_mask; 395 // should be a very good fallback
396 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
397}
256 398
257 red_mask = (uint32_t)format->direct.redMask << format->direct.red; 399rxvt_img *
258 green_mask = (uint32_t)format->direct.greenMask << format->direct.green; 400rxvt_img::reify ()
259 blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue; 401{
260 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha; 402 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; 403 return clone ();
269 404
270 int sh_r = ecb_ctz32 (red_mask); 405 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 406
275 if (width > 32767 || height > 32767) 407 bool alpha = !format->direct.alphaMask
276 return false; 408 && (x || y)
409 && repeat == RepeatNone;
277 410
278 XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0, 411 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); 412 img->alloc ();
280 if (!ximage)
281 return false;
282 413
283 if (height > INT_MAX / ximage->bytes_per_line 414 Picture src = src_picture ();
284 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line))) 415 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
416
417 if (alpha)
285 { 418 {
286 XDestroyImage (ximage); 419 XRenderColor rc = { 0, 0, 0, 0 };
287 return false; 420 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
421 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
288 } 422 }
423 else
424 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
289 425
290 GC gc = XCreateGC (dpy, pm, 0, 0); 426 XRenderFreePicture (dpy, src);
427 XRenderFreePicture (dpy, dst);
291 428
292 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 429 return img;
430}
293 431
294 int rowstride = gdk_pixbuf_get_rowstride (pixbuf); 432rxvt_img *
295 int channels = gdk_pixbuf_get_n_channels (pixbuf); 433rxvt_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; 434{
297 char *line = ximage->data; 435 rxvt_img *img = clone ();
298 436
299 for (int y = 0; y < height; y++) 437 img->x += x;
438 img->y += y;
439
440 if (w != width || h != height)
300 { 441 {
301 for (int x = 0; x < width; x++) 442 img->w = width;
302 { 443 img->h = height;
303 unsigned char *pixel = row + x * channels;
304 uint32_t value;
305 unsigned char r, g, b, a;
306 444
307 if (channels == 4) 445 rxvt_img *img2 = img->reify ();
308 { 446 delete img;
309 a = pixel[3]; 447 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 } 448 }
336 449
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; 450 return img;
354} 451}
355 452
356rxvt_img * 453rxvt_img *
357rxvt_img::sub_rect (int x, int y, int width, int height, int repeat) 454rxvt_img::transform (int new_width, int new_height, double matrix[9])
358{ 455{
359 rxvt_img *img = new rxvt_img (s, format, width, height); 456 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
457 img->alloc ();
360 458
361 Display *dpy = s->display->dpy; 459 Display *dpy = s->display->dpy;
362 XRenderPictureAttributes pa; 460 Picture src = src_picture ();
363 pa.repeat = repeat;
364 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
365 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 461 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;
373}
374
375rxvt_img *
376rxvt_img::transform (int new_width, int new_height, double matrix[9], int repeat)
377{
378 rxvt_img *img = new rxvt_img (s, format, new_width, new_height);
379
380 Display *dpy = s->display->dpy;
381 XRenderPictureAttributes pa;
382 pa.repeat = repeat;
383 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
384 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
385 462
386 XTransform xfrm; 463 XTransform xfrm;
387 464
388 for (int i = 0; i < 3; ++i) 465 for (int i = 0; i < 3; ++i)
389 for (int j = 0; j < 3; ++j) 466 for (int j = 0; j < 3; ++j)
390 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 467 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
391 468
469#if 0
470 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
471 xfrm.matrix [1][2] -= XDoubleToFixed (y);
472#endif
473
392 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 474 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
393 XRenderSetPictureTransform (dpy, src, &xfrm); 475 XRenderSetPictureTransform (dpy, src, &xfrm);
394 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 476 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
395 477
396 XRenderFreePicture (dpy, src); 478 XRenderFreePicture (dpy, src);
… …
400} 482}
401 483
402rxvt_img * 484rxvt_img *
403rxvt_img::scale (int new_width, int new_height) 485rxvt_img::scale (int new_width, int new_height)
404{ 486{
487 if (w == new_width && h == new_height)
488 return clone ();
489
405 double matrix[9] = { 490 double matrix[9] = {
406 w / (double)new_width, 0, 0, 491 w / (double)new_width, 0, 0,
407 0, h / (double)new_height, 0, 492 0, h / (double)new_height, 0,
408 0, 0, 1 493 0, 0, 1
409 }; 494 };
410 495
496 int old_repeat_mode = repeat;
497 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
498
411 return transform (new_width, new_height, matrix); 499 rxvt_img *img = transform (new_width, new_height, matrix);
412}
413 500
501 repeat = old_repeat_mode;
502 img->repeat = repeat;
503
504 return img;
505}
506
414rxvt_img * 507rxvt_img *
415rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat) 508rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
416{ 509{
417 double s = sin (phi); 510 double s = sin (phi);
418 double c = cos (phi); 511 double c = cos (phi);
419 512
420 double matrix[9] = { 513 double matrix[9] = {
421 c, -s, -c * x + s * y + x, 514 c, -s, -c * x + s * y + x,
422 s, c, -s * x - c * y + y, 515 s, c, -s * x - c * y + y,
423 0, 0, 1 516 0, 0, 1
424 }; 517 };
425 518
426 return transform (new_width, new_height, matrix, repeat); 519 return transform (new_width, new_height, matrix);
427} 520}
428 521
429rxvt_img * 522rxvt_img *
430rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 523rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
431{ 524{
525 if (new_format == format)
526 return clone ();
527
432 rxvt_img *img = new rxvt_img (s, new_format, w, h); 528 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
529 img->alloc ();
433 530
434 Display *dpy = s->display->dpy; 531 Display *dpy = s->display->dpy;
435 Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0); 532 Picture src = src_picture ();
436 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 533 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
437 int op = PictOpSrc; 534 int op = PictOpSrc;
438 535
439 if (format->direct.alphaMask && !new_format->direct.alphaMask) 536 if (format->direct.alphaMask && !new_format->direct.alphaMask)
440 { 537 {
… …
459rxvt_img * 556rxvt_img *
460rxvt_img::blend (rxvt_img *img, double factor) 557rxvt_img::blend (rxvt_img *img, double factor)
461{ 558{
462 rxvt_img *img2 = clone (); 559 rxvt_img *img2 = clone ();
463 Display *dpy = s->display->dpy; 560 Display *dpy = s->display->dpy;
464 Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 561 Picture src = img->src_picture ();
465 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 562 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
466 Picture mask = create_xrender_mask (dpy, img->pm, False); 563 Picture mask = create_xrender_mask (dpy, img->pm, False);
467 564
468 XRenderColor mask_c; 565 XRenderColor mask_c;
469 566

Diff Legend

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