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

Diff Legend

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