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.35 by root, Thu Jun 7 08:36:53 2012 UTC vs.
Revision 1.60 by sf-exg, Fri Jun 8 10:12:45 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 x, int y, 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(x), y(y), w(width), h(height), format(format), repeat(RepeatNormal), 8: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9 pm(0), ref(0) 9 pm(0), ref(0)
10{ 10{
11} 11}
12 12
13rxvt_img::rxvt_img (const rxvt_img &img) 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) 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 ++ref->cnt;
17} 17}
18
19#if 0
20rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap)
21: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
22{
23}
24#endif
25 18
26rxvt_img * 19rxvt_img *
27rxvt_img::new_from_root (rxvt_screen *s) 20rxvt_img::new_from_root (rxvt_screen *s)
28{ 21{
29 Display *dpy = s->display->dpy; 22 Display *dpy = s->display->dpy;
… …
57 50
58 return img; 51 return img;
59} 52}
60 53
61rxvt_img * 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);
152
153 return img;
154}
155
156rxvt_img *
62rxvt_img::new_from_file (rxvt_screen *s, const char *filename) 157rxvt_img::new_from_file (rxvt_screen *s, const char *filename)
63{ 158{
64 GError *err = 0; 159 GError *err = 0;
65 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 160 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
66 161
67 if (!pb) 162 if (!pb)
68 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 163 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
69 164
70 rxvt_img *img = new rxvt_img ( 165 rxvt_img *img = new_from_pixbuf (s, pb);
71 s,
72 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
73 0,
74 0,
75 gdk_pixbuf_get_width (pb),
76 gdk_pixbuf_get_height (pb)
77 );
78 img->alloc ();
79 img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
80 166
81 g_object_unref (pb); 167 g_object_unref (pb);
82 168
83 return img; 169 return img;
84} 170}
… …
113 Display *dpy = s->display->dpy; 199 Display *dpy = s->display->dpy;
114 200
115 XRenderPictureAttributes pa; 201 XRenderPictureAttributes pa;
116 pa.repeat = repeat; 202 pa.repeat = repeat;
117 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 203 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
118
119 XRectangle clip = { -x, -y, min (w, ref->w), min (h, ref->h) };
120 XRenderSetPictureClipRectangles (dpy, pic, 0, 0, &clip, 1);
121 204
122 return pic; 205 return pic;
123} 206}
124 207
125void 208void
… …
179 262
180 Display *dpy = s->display->dpy; 263 Display *dpy = s->display->dpy;
181 int size = max (rh, rv) * 2 + 1; 264 int size = max (rh, rv) * 2 + 1;
182 double *kernel = (double *)malloc (size * sizeof (double)); 265 double *kernel = (double *)malloc (size * sizeof (double));
183 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 266 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
184 rxvt_img *img = new rxvt_img (s, format, x, y, w, h); 267 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
185 img->alloc (); 268 img->alloc ();
186 269
187 Picture src = src_picture (); 270 Picture src = src_picture ();
188 271
189 XRenderPictureAttributes pa; 272 XRenderPictureAttributes pa;
… …
212 295
213 size = rv * 2 + 1; 296 size = rv * 2 + 1;
214 get_gaussian_kernel (rv, size, kernel, params); 297 get_gaussian_kernel (rv, size, kernel, params);
215 ::swap (params[0], params[1]); 298 ::swap (params[0], params[1]);
216 299
217 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 300 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
218 XRenderComposite (dpy, 301 XRenderComposite (dpy,
219 PictOpSrc, 302 PictOpSrc,
220 tmp, 303 tmp,
221 None, 304 None,
222 dst, 305 dst,
… …
291 374
292 XRenderFreePicture (dpy, src); 375 XRenderFreePicture (dpy, src);
293 XRenderFreePicture (dpy, dst); 376 XRenderFreePicture (dpy, dst);
294} 377}
295 378
296bool
297rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
298{
299 Display *dpy = s->display->dpy;
300
301 if (s->visual->c_class != TrueColor)
302 return false;
303
304 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
305
306 red_mask = (uint32_t)format->direct.redMask << format->direct.red;
307 green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
308 blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
309 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
310
311 int width_r = ecb_popcount32 (red_mask);
312 int width_g = ecb_popcount32 (green_mask);
313 int width_b = ecb_popcount32 (blue_mask);
314 int width_a = ecb_popcount32 (alpha_mask);
315
316 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
317 return false;
318
319 int sh_r = ecb_ctz32 (red_mask);
320 int sh_g = ecb_ctz32 (green_mask);
321 int sh_b = ecb_ctz32 (blue_mask);
322 int sh_a = ecb_ctz32 (alpha_mask);
323
324 if (width > 32767 || height > 32767)
325 return false;
326
327 XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
328 width, height, 32, 0);
329 if (!ximage)
330 return false;
331
332 if (height > INT_MAX / ximage->bytes_per_line
333 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
334 {
335 XDestroyImage (ximage);
336 return false;
337 }
338
339 GC gc = XCreateGC (dpy, pm, 0, 0);
340
341 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
342
343 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
344 int channels = gdk_pixbuf_get_n_channels (pixbuf);
345 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
346 char *line = ximage->data;
347
348 for (int y = 0; y < height; y++)
349 {
350 for (int x = 0; x < width; x++)
351 {
352 unsigned char *pixel = row + x * channels;
353 uint32_t value;
354 unsigned char r, g, b, a;
355
356 if (channels == 4)
357 {
358 a = pixel[3];
359 r = pixel[0] * a / 0xff;
360 g = pixel[1] * a / 0xff;
361 b = pixel[2] * a / 0xff;
362 }
363 else
364 {
365 a = 0xff;
366 r = pixel[0];
367 g = pixel[1];
368 b = pixel[2];
369 }
370
371 value = ((r >> (8 - width_r)) << sh_r)
372 | ((g >> (8 - width_g)) << sh_g)
373 | ((b >> (8 - width_b)) << sh_b)
374 | ((a >> (8 - width_a)) << sh_a);
375
376 if (ximage->bits_per_pixel == 32)
377 ((uint32_t *)line)[x] = value;
378 else
379 XPutPixel (ximage, x, y, value);
380 }
381
382 row += rowstride;
383 line += ximage->bytes_per_line;
384 }
385
386 XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
387 XDestroyImage (ximage);
388 XFreeGC (dpy, gc);
389
390 return true;
391}
392
393rxvt_img * 379rxvt_img *
394rxvt_img::clone () 380rxvt_img::clone ()
395{ 381{
396 return new rxvt_img (*this); 382 return new rxvt_img (*this);
383}
384
385static XRenderPictFormat *
386find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
387{
388 if (format->direct.alphaMask)
389 return format; // already has alpha
390
391 // try to find a suitable alpha format, one bit alpha is enough for our purposes
392 if (format->type == PictTypeDirect)
393 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
394 if (f->direct.alphaMask
395 && f->type == PictTypeDirect
396 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
397 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
398 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
399 return f;
400
401 // should be a very good fallback
402 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
397} 403}
398 404
399rxvt_img * 405rxvt_img *
400rxvt_img::reify () 406rxvt_img::reify ()
401{ 407{
402 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 408 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
403 return clone (); 409 return clone ();
404 410
405 rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h); 411 Display *dpy = s->display->dpy;
412
413 bool alpha = !format->direct.alphaMask
414 && (x || y)
415 && repeat == RepeatNone;
416
417 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
406 img->alloc (); 418 img->alloc ();
407
408 Display *dpy = s->display->dpy;
409 419
410 Picture src = src_picture (); 420 Picture src = src_picture ();
411 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 421 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
412 422
423 if (alpha)
424 {
425 XRenderColor rc = { 0, 0, 0, 0 };
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);
428 }
429 else
413 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 430 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
414 431
415 XRenderFreePicture (dpy, src); 432 XRenderFreePicture (dpy, src);
416 XRenderFreePicture (dpy, dst); 433 XRenderFreePicture (dpy, dst);
417 434
418 return img; 435 return img;
419} 436}
420 437
421rxvt_img * 438rxvt_img *
422rxvt_img::sub_rect (int x, int y, int width, int height) 439rxvt_img::sub_rect (int x, int y, int width, int height)
423{ 440{
424 rxvt_img *img = clone (); 441 rxvt_img *img = clone ();
425
426 //TODO: width > w, must reify
427 442
428 img->x += x; 443 img->x += x;
429 img->y += y; 444 img->y += y;
445
446 if (w != width || h != height)
447 {
430 img->w = width; 448 img->w = width;
431 img->h = height; 449 img->h = height;
450
451 rxvt_img *img2 = img->reify ();
452 delete img;
453 img = img2;
454 }
432 455
433 return img; 456 return img;
434} 457}
435 458
436rxvt_img * 459rxvt_img *
437rxvt_img::transform (int new_width, int new_height, double matrix[9]) 460rxvt_img::transform (int new_width, int new_height, double matrix[9])
438{ 461{
439 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height); 462 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
440 img->alloc (); 463 img->alloc ();
441 464
442 Display *dpy = s->display->dpy; 465 Display *dpy = s->display->dpy;
443 Picture src = src_picture (); 466 Picture src = src_picture ();
444 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 467 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
… …
447 470
448 for (int i = 0; i < 3; ++i) 471 for (int i = 0; i < 3; ++i)
449 for (int j = 0; j < 3; ++j) 472 for (int j = 0; j < 3; ++j)
450 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 473 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
451 474
475#if 0
452 xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO 476 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
453 xfrm.matrix [0][3] += XDoubleToFixed (y); 477 xfrm.matrix [1][2] -= XDoubleToFixed (y);
478#endif
454 479
455 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 480 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
456 XRenderSetPictureTransform (dpy, src, &xfrm); 481 XRenderSetPictureTransform (dpy, src, &xfrm);
457 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);
458 483
… …
463} 488}
464 489
465rxvt_img * 490rxvt_img *
466rxvt_img::scale (int new_width, int new_height) 491rxvt_img::scale (int new_width, int new_height)
467{ 492{
493 if (w == new_width && h == new_height)
494 return clone ();
495
468 double matrix[9] = { 496 double matrix[9] = {
469 w / (double)new_width, 0, 0, 497 w / (double)new_width, 0, 0,
470 0, h / (double)new_height, 0, 498 0, h / (double)new_height, 0,
471 0, 0, 1 499 0, 0, 1
472 }; 500 };
473 501
502 int old_repeat_mode = repeat;
503 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
504
474 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;
475} 511}
476 512
477rxvt_img * 513rxvt_img *
478rxvt_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)
479{ 515{
… …
488 524
489 return transform (new_width, new_height, matrix); 525 return transform (new_width, new_height, matrix);
490} 526}
491 527
492rxvt_img * 528rxvt_img *
493rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 529rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
494{ 530{
495 if (new_format == format) 531 if (new_format == format)
496 return clone (); 532 return clone ();
497 533
498 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h); 534 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
499 img->alloc (); 535 img->alloc ();
500 536
501 Display *dpy = s->display->dpy; 537 Display *dpy = s->display->dpy;
502 Picture src = src_picture (); 538 Picture src = src_picture ();
503 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 539 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
… …
526rxvt_img * 562rxvt_img *
527rxvt_img::blend (rxvt_img *img, double factor) 563rxvt_img::blend (rxvt_img *img, double factor)
528{ 564{
529 rxvt_img *img2 = clone (); 565 rxvt_img *img2 = clone ();
530 Display *dpy = s->display->dpy; 566 Display *dpy = s->display->dpy;
531 Picture src = src_picture (); 567 Picture src = img->src_picture ();
532 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 568 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
533 Picture mask = create_xrender_mask (dpy, img->pm, False); 569 Picture mask = create_xrender_mask (dpy, img->pm, False);
534 570
535 XRenderColor mask_c; 571 XRenderColor mask_c;
536 572

Diff Legend

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