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

Diff Legend

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