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.34 by root, Thu Jun 7 08:36:09 2012 UTC vs.
Revision 1.51 by root, Thu Jun 7 20:04:54 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)
… …
57 57
58 return img; 58 return img;
59} 59}
60 60
61rxvt_img * 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; //XY only, unused
84 xi.bitmap_bit_order = LSBFirst; //XY only, unused
85 xi.bitmap_pad = BitmapPad (dpy);
86 xi.depth = depth;
87 xi.bytes_per_line = 0;
88 xi.bits_per_pixel = 32; //Z only
89 xi.red_mask = 0x000000ff; //Z only
90 xi.green_mask = 0x0000ff00; //Z only
91 xi.blue_mask = 0x00ff0000; //Z only
92 xi.obdata = 0; // probbaly unused
93
94 if (!XInitImage (&xi))
95 rxvt_fatal ("unable to initialise ximage, please report.\n");
96
97 if (height > INT_MAX / xi.bytes_per_line)
98 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
99
100 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
101
102 int rowstride = gdk_pixbuf_get_rowstride (pb);
103
104 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
105 unsigned char *row = gdk_pixbuf_get_pixels (pb);
106 char *line = xi.data;
107
108 for (int y = 0; y < height; y++)
109 {
110 unsigned char *src = row;
111 uint32_t *dst = (uint32_t *)line;
112
113 if (depth == 24)
114 for (int x = 0; x < width; x++)
115 {
116 uint8_t r = *src++;
117 uint8_t g = *src++;
118 uint8_t b = *src++;
119
120 uint32_t v = r | (g << 8) | (b << 16);
121
122 if (ecb_big_endian ())
123 v = ecb_bswap32 (v);
124
125 *dst++ = v;
126 }
127 else
128 for (int x = 0; x < width; x++)
129 {
130 uint32_t v = *(uint32_t *)src; src += 4;
131
132 if (ecb_big_endian ())
133 v = ecb_bswap32 (v);
134
135 *dst++ = v;
136 }
137
138 row += rowstride;
139 line += xi.bytes_per_line;
140 }
141
142 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
143 img->alloc ();
144
145 GC gc = XCreateGC (dpy, img->pm, 0, 0);
146 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
147 XFreeGC (dpy, gc);
148
149 free (xi.data);
150
151 return img;
152}
153
154rxvt_img *
62rxvt_img::new_from_file (rxvt_screen *s, const char *filename) 155rxvt_img::new_from_file (rxvt_screen *s, const char *filename)
63{ 156{
64 GError *err = 0; 157 GError *err = 0;
65 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 158 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
66 159
67 if (!pb) 160 if (!pb)
68 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 161 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
69 162
70 rxvt_img *img = new rxvt_img ( 163 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 164
81 g_object_unref (pb); 165 g_object_unref (pb);
82 166
83 return img; 167 return img;
84} 168}
… …
113 Display *dpy = s->display->dpy; 197 Display *dpy = s->display->dpy;
114 198
115 XRenderPictureAttributes pa; 199 XRenderPictureAttributes pa;
116 pa.repeat = repeat; 200 pa.repeat = repeat;
117 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 201 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 202
122 return pic; 203 return pic;
123} 204}
124 205
125void 206void
… …
179 260
180 Display *dpy = s->display->dpy; 261 Display *dpy = s->display->dpy;
181 int size = max (rh, rv) * 2 + 1; 262 int size = max (rh, rv) * 2 + 1;
182 double *kernel = (double *)malloc (size * sizeof (double)); 263 double *kernel = (double *)malloc (size * sizeof (double));
183 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 264 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
184 rxvt_img *img = new rxvt_img (s, format, x, y, w, h); 265 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
185 img->alloc (); 266 img->alloc ();
186 267
187 Picture src = src_picture (); 268 Picture src = src_picture ();
188 269
189 XRenderPictureAttributes pa; 270 XRenderPictureAttributes pa;
… …
291 372
292 XRenderFreePicture (dpy, src); 373 XRenderFreePicture (dpy, src);
293 XRenderFreePicture (dpy, dst); 374 XRenderFreePicture (dpy, dst);
294} 375}
295 376
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 * 377rxvt_img *
394rxvt_img::clone () 378rxvt_img::clone ()
395{ 379{
396 return new rxvt_img (*this); 380 return new rxvt_img (*this);
397} 381}
398 382
383static XRenderPictFormat *
384find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
385{
386 if (format->direct.alphaMask)
387 return format; // already has alpha
388
389 // try to find a suitable alpha format, one bit alpha is enough for our purposes
390 if (format->type == PictTypeDirect)
391 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
392 if (f->direct.alphaMask
393 && f->type == PictTypeDirect
394 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
395 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
396 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
397 return f;
398
399 // should be a very good fallback
400 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
401}
402
399rxvt_img * 403rxvt_img *
400rxvt_img::reify () 404rxvt_img::reify ()
401{ 405{
402 rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h); 406 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
407 return clone ();
408
409 Display *dpy = s->display->dpy;
410
411 bool alpha = !format->direct.alphaMask
412 && (x || y)
413 && repeat == RepeatNone;
414
415 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
403 img->alloc (); 416 img->alloc ();
404
405 // todo, if x==0 and y==0 and w==real width we could clone
406 // but that involves an rtt to find pixmap width.
407
408 Display *dpy = s->display->dpy;
409 417
410 Picture src = src_picture (); 418 Picture src = src_picture ();
411 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 419 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
412 420
421 if (alpha)
422 {
423 XRenderColor rc = { 0, 0, 0, 0 };
424 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
425 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
426 }
427 else
413 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 428 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
414 429
415 XRenderFreePicture (dpy, src); 430 XRenderFreePicture (dpy, src);
416 XRenderFreePicture (dpy, dst); 431 XRenderFreePicture (dpy, dst);
417 432
418 return img; 433 return img;
419} 434}
420 435
421rxvt_img * 436rxvt_img *
422rxvt_img::sub_rect (int x, int y, int width, int height) 437rxvt_img::sub_rect (int x, int y, int width, int height)
423{ 438{
424 rxvt_img *img = clone (); 439 rxvt_img *img = clone ();
425
426 //TODO: width > w, must reify
427 440
428 img->x += x; 441 img->x += x;
429 img->y += y; 442 img->y += y;
443
444 if (w != width || h != height)
445 {
430 img->w = width; 446 img->w = width;
431 img->h = height; 447 img->h = height;
448
449 rxvt_img *img2 = img->reify ();
450 delete img;
451 img = img2;
452 }
432 453
433 return img; 454 return img;
434} 455}
435 456
436rxvt_img * 457rxvt_img *
437rxvt_img::transform (int new_width, int new_height, double matrix[9]) 458rxvt_img::transform (int new_width, int new_height, double matrix[9])
438{ 459{
439 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height); 460 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
440 img->alloc (); 461 img->alloc ();
441 462
442 Display *dpy = s->display->dpy; 463 Display *dpy = s->display->dpy;
443 Picture src = src_picture (); 464 Picture src = src_picture ();
444 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 465 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
… …
447 468
448 for (int i = 0; i < 3; ++i) 469 for (int i = 0; i < 3; ++i)
449 for (int j = 0; j < 3; ++j) 470 for (int j = 0; j < 3; ++j)
450 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 471 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
451 472
473#if 0
452 xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO 474 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
453 xfrm.matrix [0][3] += XDoubleToFixed (y); 475 xfrm.matrix [1][2] -= XDoubleToFixed (y);
476#endif
454 477
455 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 478 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
456 XRenderSetPictureTransform (dpy, src, &xfrm); 479 XRenderSetPictureTransform (dpy, src, &xfrm);
457 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 480 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
458 481
… …
463} 486}
464 487
465rxvt_img * 488rxvt_img *
466rxvt_img::scale (int new_width, int new_height) 489rxvt_img::scale (int new_width, int new_height)
467{ 490{
491 if (w == new_width && h == new_height)
492 return clone ();
493
468 double matrix[9] = { 494 double matrix[9] = {
469 w / (double)new_width, 0, 0, 495 w / (double)new_width, 0, 0,
470 0, h / (double)new_height, 0, 496 0, h / (double)new_height, 0,
471 0, 0, 1 497 0, 0, 1
472 }; 498 };
473 499
500 int old_repeat_mode = repeat;
501 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
502
474 return transform (new_width, new_height, matrix); 503 rxvt_img *img = transform (new_width, new_height, matrix);
504
505 repeat = old_repeat_mode;
506 img->repeat = repeat;
507
508 return img;
475} 509}
476 510
477rxvt_img * 511rxvt_img *
478rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 512rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
479{ 513{
… …
488 522
489 return transform (new_width, new_height, matrix); 523 return transform (new_width, new_height, matrix);
490} 524}
491 525
492rxvt_img * 526rxvt_img *
493rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 527rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
494{ 528{
495 if (new_format == format) 529 if (new_format == format)
496 return clone (); 530 return clone ();
497 531
498 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h); 532 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
499 img->alloc (); 533 img->alloc ();
500 534
501 Display *dpy = s->display->dpy; 535 Display *dpy = s->display->dpy;
502 Picture src = src_picture (); 536 Picture src = src_picture ();
503 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 537 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
… …
526rxvt_img * 560rxvt_img *
527rxvt_img::blend (rxvt_img *img, double factor) 561rxvt_img::blend (rxvt_img *img, double factor)
528{ 562{
529 rxvt_img *img2 = clone (); 563 rxvt_img *img2 = clone ();
530 Display *dpy = s->display->dpy; 564 Display *dpy = s->display->dpy;
531 Picture src = src_picture (); 565 Picture src = img->src_picture ();
532 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 566 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
533 Picture mask = create_xrender_mask (dpy, img->pm, False); 567 Picture mask = create_xrender_mask (dpy, img->pm, False);
534 568
535 XRenderColor mask_c; 569 XRenderColor mask_c;
536 570

Diff Legend

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