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.37 by root, Thu Jun 7 09:25:23 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
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 = 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);
142
143 return img;
144}
145
146rxvt_img *
62rxvt_img::new_from_file (rxvt_screen *s, const char *filename) 147rxvt_img::new_from_file (rxvt_screen *s, const char *filename)
63{ 148{
64 GError *err = 0; 149 GError *err = 0;
65 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 150 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
66 151
67 if (!pb) 152 if (!pb)
68 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 153 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
69 154
70 rxvt_img *img = new rxvt_img ( 155 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 156
81 g_object_unref (pb); 157 g_object_unref (pb);
82 158
83 return img; 159 return img;
84} 160}
… …
176 252
177 Display *dpy = s->display->dpy; 253 Display *dpy = s->display->dpy;
178 int size = max (rh, rv) * 2 + 1; 254 int size = max (rh, rv) * 2 + 1;
179 double *kernel = (double *)malloc (size * sizeof (double)); 255 double *kernel = (double *)malloc (size * sizeof (double));
180 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 256 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
181 rxvt_img *img = new rxvt_img (s, format, x, y, w, h); 257 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
182 img->alloc (); 258 img->alloc ();
183 259
184 Picture src = src_picture (); 260 Picture src = src_picture ();
185 261
186 XRenderPictureAttributes pa; 262 XRenderPictureAttributes pa;
… …
288 364
289 XRenderFreePicture (dpy, src); 365 XRenderFreePicture (dpy, src);
290 XRenderFreePicture (dpy, dst); 366 XRenderFreePicture (dpy, dst);
291} 367}
292 368
293bool
294rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
295{
296 Display *dpy = s->display->dpy;
297
298 if (s->visual->c_class != TrueColor)
299 return false;
300
301 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
302
303 red_mask = (uint32_t)format->direct.redMask << format->direct.red;
304 green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
305 blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
306 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
307
308 int width_r = ecb_popcount32 (red_mask);
309 int width_g = ecb_popcount32 (green_mask);
310 int width_b = ecb_popcount32 (blue_mask);
311 int width_a = ecb_popcount32 (alpha_mask);
312
313 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
314 return false;
315
316 int sh_r = ecb_ctz32 (red_mask);
317 int sh_g = ecb_ctz32 (green_mask);
318 int sh_b = ecb_ctz32 (blue_mask);
319 int sh_a = ecb_ctz32 (alpha_mask);
320
321 if (width > 32767 || height > 32767)
322 return false;
323
324 XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
325 width, height, 32, 0);
326 if (!ximage)
327 return false;
328
329 if (height > INT_MAX / ximage->bytes_per_line
330 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
331 {
332 XDestroyImage (ximage);
333 return false;
334 }
335
336 GC gc = XCreateGC (dpy, pm, 0, 0);
337
338 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
339
340 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
341 int channels = gdk_pixbuf_get_n_channels (pixbuf);
342 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
343 char *line = ximage->data;
344
345 for (int y = 0; y < height; y++)
346 {
347 for (int x = 0; x < width; x++)
348 {
349 unsigned char *pixel = row + x * channels;
350 uint32_t value;
351 unsigned char r, g, b, a;
352
353 if (channels == 4)
354 {
355 a = pixel[3];
356 r = pixel[0] * a / 0xff;
357 g = pixel[1] * a / 0xff;
358 b = pixel[2] * a / 0xff;
359 }
360 else
361 {
362 a = 0xff;
363 r = pixel[0];
364 g = pixel[1];
365 b = pixel[2];
366 }
367
368 value = ((r >> (8 - width_r)) << sh_r)
369 | ((g >> (8 - width_g)) << sh_g)
370 | ((b >> (8 - width_b)) << sh_b)
371 | ((a >> (8 - width_a)) << sh_a);
372
373 if (ximage->bits_per_pixel == 32)
374 ((uint32_t *)line)[x] = value;
375 else
376 XPutPixel (ximage, x, y, value);
377 }
378
379 row += rowstride;
380 line += ximage->bytes_per_line;
381 }
382
383 XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
384 XDestroyImage (ximage);
385 XFreeGC (dpy, gc);
386
387 return true;
388}
389
390rxvt_img * 369rxvt_img *
391rxvt_img::clone () 370rxvt_img::clone ()
392{ 371{
393 return new rxvt_img (*this); 372 return new rxvt_img (*this);
373}
374
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 ))
389 return f;
390
391 // should be a very good fallback
392 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
394} 393}
395 394
396rxvt_img * 395rxvt_img *
397rxvt_img::reify () 396rxvt_img::reify ()
398{ 397{
399 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 398 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
400 return clone (); 399 return clone ();
401 400
402 rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h); 401 Display *dpy = s->display->dpy;
402
403 bool alpha = !format->direct.alphaMask
404 && (x || y)
405 && repeat == RepeatNone;
406
407 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
403 img->alloc (); 408 img->alloc ();
404
405 Display *dpy = s->display->dpy;
406 409
407 Picture src = src_picture (); 410 Picture src = src_picture ();
408 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 411 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
409 412
413 if (alpha)
414 {
415 XRenderColor rc = { 0, 0, 0, 0 };
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);
418 }
419 else
410 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 420 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
411 421
412 XRenderFreePicture (dpy, src); 422 XRenderFreePicture (dpy, src);
413 XRenderFreePicture (dpy, dst); 423 XRenderFreePicture (dpy, dst);
414 424
415 return img; 425 return img;
416} 426}
… …
426 if (w != width || h != height) 436 if (w != width || h != height)
427 { 437 {
428 img->w = width; 438 img->w = width;
429 img->h = height; 439 img->h = height;
430 440
431 img->reify (); 441 rxvt_img *img2 = img->reify ();
442 delete img;
443 img = img2;
432 } 444 }
433 445
434 return img; 446 return img;
435} 447}
436 448
437rxvt_img * 449rxvt_img *
438rxvt_img::transform (int new_width, int new_height, double matrix[9]) 450rxvt_img::transform (int new_width, int new_height, double matrix[9])
439{ 451{
440 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height); 452 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
441 img->alloc (); 453 img->alloc ();
442 454
443 Display *dpy = s->display->dpy; 455 Display *dpy = s->display->dpy;
444 Picture src = src_picture (); 456 Picture src = src_picture ();
445 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 457 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
… …
448 460
449 for (int i = 0; i < 3; ++i) 461 for (int i = 0; i < 3; ++i)
450 for (int j = 0; j < 3; ++j) 462 for (int j = 0; j < 3; ++j)
451 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 463 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
452 464
465#if 0
453 xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO 466 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
454 xfrm.matrix [0][3] += XDoubleToFixed (y); 467 xfrm.matrix [1][2] -= XDoubleToFixed (y);
468#endif
455 469
456 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 470 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
457 XRenderSetPictureTransform (dpy, src, &xfrm); 471 XRenderSetPictureTransform (dpy, src, &xfrm);
458 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);
459 473
… …
464} 478}
465 479
466rxvt_img * 480rxvt_img *
467rxvt_img::scale (int new_width, int new_height) 481rxvt_img::scale (int new_width, int new_height)
468{ 482{
483 if (w == new_width && h == new_height)
484 return clone ();
485
469 double matrix[9] = { 486 double matrix[9] = {
470 w / (double)new_width, 0, 0, 487 w / (double)new_width, 0, 0,
471 0, h / (double)new_height, 0, 488 0, h / (double)new_height, 0,
472 0, 0, 1 489 0, 0, 1
473 }; 490 };
474 491
492 int old_repeat_mode = repeat;
493 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
494
475 return transform (new_width, new_height, matrix); 495 rxvt_img *img = transform (new_width, new_height, matrix);
496
497 repeat = old_repeat_mode;
498 img->repeat = repeat;
499
500 return img;
476} 501}
477 502
478rxvt_img * 503rxvt_img *
479rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 504rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
480{ 505{
… …
489 514
490 return transform (new_width, new_height, matrix); 515 return transform (new_width, new_height, matrix);
491} 516}
492 517
493rxvt_img * 518rxvt_img *
494rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 519rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
495{ 520{
496 if (new_format == format) 521 if (new_format == format)
497 return clone (); 522 return clone ();
498 523
499 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h); 524 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
500 img->alloc (); 525 img->alloc ();
501 526
502 Display *dpy = s->display->dpy; 527 Display *dpy = s->display->dpy;
503 Picture src = src_picture (); 528 Picture src = src_picture ();
504 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 529 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
… …
527rxvt_img * 552rxvt_img *
528rxvt_img::blend (rxvt_img *img, double factor) 553rxvt_img::blend (rxvt_img *img, double factor)
529{ 554{
530 rxvt_img *img2 = clone (); 555 rxvt_img *img2 = clone ();
531 Display *dpy = s->display->dpy; 556 Display *dpy = s->display->dpy;
532 Picture src = src_picture (); 557 Picture src = img->src_picture ();
533 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 558 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
534 Picture mask = create_xrender_mask (dpy, img->pm, False); 559 Picture mask = create_xrender_mask (dpy, img->pm, False);
535 560
536 XRenderColor mask_c; 561 XRenderColor mask_c;
537 562

Diff Legend

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