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.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
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 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);
147
148 return img;
149}
150
151rxvt_img *
62rxvt_img::new_from_file (rxvt_screen *s, const char *filename) 152rxvt_img::new_from_file (rxvt_screen *s, const char *filename)
63{ 153{
64 GError *err = 0; 154 GError *err = 0;
65 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 155 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
66 156
67 if (!pb) 157 if (!pb)
68 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 158 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
69 159
70 rxvt_img *img = new rxvt_img ( 160 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 161
81 g_object_unref (pb); 162 g_object_unref (pb);
82 163
83 return img; 164 return img;
84} 165}
… …
113 Display *dpy = s->display->dpy; 194 Display *dpy = s->display->dpy;
114 195
115 XRenderPictureAttributes pa; 196 XRenderPictureAttributes pa;
116 pa.repeat = repeat; 197 pa.repeat = repeat;
117 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 198 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 199
122 return pic; 200 return pic;
123} 201}
124 202
125void 203void
… …
179 257
180 Display *dpy = s->display->dpy; 258 Display *dpy = s->display->dpy;
181 int size = max (rh, rv) * 2 + 1; 259 int size = max (rh, rv) * 2 + 1;
182 double *kernel = (double *)malloc (size * sizeof (double)); 260 double *kernel = (double *)malloc (size * sizeof (double));
183 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 261 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
184 rxvt_img *img = new rxvt_img (s, format, x, y, w, h); 262 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
185 img->alloc (); 263 img->alloc ();
186 264
187 Picture src = src_picture (); 265 Picture src = src_picture ();
188 266
189 XRenderPictureAttributes pa; 267 XRenderPictureAttributes pa;
… …
291 369
292 XRenderFreePicture (dpy, src); 370 XRenderFreePicture (dpy, src);
293 XRenderFreePicture (dpy, dst); 371 XRenderFreePicture (dpy, dst);
294} 372}
295 373
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 * 374rxvt_img *
394rxvt_img::clone () 375rxvt_img::clone ()
395{ 376{
396 return new rxvt_img (*this); 377 return new rxvt_img (*this);
378}
379
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 ))
394 return f;
395
396 // should be a very good fallback
397 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
397} 398}
398 399
399rxvt_img * 400rxvt_img *
400rxvt_img::reify () 401rxvt_img::reify ()
401{ 402{
402 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 403 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
403 return clone (); 404 return clone ();
404 405
405 rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h); 406 Display *dpy = s->display->dpy;
407
408 bool alpha = !format->direct.alphaMask
409 && (x || y)
410 && repeat == RepeatNone;
411
412 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
406 img->alloc (); 413 img->alloc ();
407
408 Display *dpy = s->display->dpy;
409 414
410 Picture src = src_picture (); 415 Picture src = src_picture ();
411 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 416 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
412 417
418 if (alpha)
419 {
420 XRenderColor rc = { 0, 0, 0, 0 };
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);
423 }
424 else
413 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 425 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
414 426
415 XRenderFreePicture (dpy, src); 427 XRenderFreePicture (dpy, src);
416 XRenderFreePicture (dpy, dst); 428 XRenderFreePicture (dpy, dst);
417 429
418 return img; 430 return img;
419} 431}
420 432
421rxvt_img * 433rxvt_img *
422rxvt_img::sub_rect (int x, int y, int width, int height) 434rxvt_img::sub_rect (int x, int y, int width, int height)
423{ 435{
424 rxvt_img *img = clone (); 436 rxvt_img *img = clone ();
425
426 //TODO: width > w, must reify
427 437
428 img->x += x; 438 img->x += x;
429 img->y += y; 439 img->y += y;
440
441 if (w != width || h != height)
442 {
430 img->w = width; 443 img->w = width;
431 img->h = height; 444 img->h = height;
445
446 rxvt_img *img2 = img->reify ();
447 delete img;
448 img = img2;
449 }
432 450
433 return img; 451 return img;
434} 452}
435 453
436rxvt_img * 454rxvt_img *
437rxvt_img::transform (int new_width, int new_height, double matrix[9]) 455rxvt_img::transform (int new_width, int new_height, double matrix[9])
438{ 456{
439 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height); 457 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
440 img->alloc (); 458 img->alloc ();
441 459
442 Display *dpy = s->display->dpy; 460 Display *dpy = s->display->dpy;
443 Picture src = src_picture (); 461 Picture src = src_picture ();
444 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 462 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
… …
447 465
448 for (int i = 0; i < 3; ++i) 466 for (int i = 0; i < 3; ++i)
449 for (int j = 0; j < 3; ++j) 467 for (int j = 0; j < 3; ++j)
450 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 468 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
451 469
470#if 0
452 xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO 471 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
453 xfrm.matrix [0][3] += XDoubleToFixed (y); 472 xfrm.matrix [1][2] -= XDoubleToFixed (y);
473#endif
454 474
455 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 475 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
456 XRenderSetPictureTransform (dpy, src, &xfrm); 476 XRenderSetPictureTransform (dpy, src, &xfrm);
457 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);
458 478
… …
463} 483}
464 484
465rxvt_img * 485rxvt_img *
466rxvt_img::scale (int new_width, int new_height) 486rxvt_img::scale (int new_width, int new_height)
467{ 487{
488 if (w == new_width && h == new_height)
489 return clone ();
490
468 double matrix[9] = { 491 double matrix[9] = {
469 w / (double)new_width, 0, 0, 492 w / (double)new_width, 0, 0,
470 0, h / (double)new_height, 0, 493 0, h / (double)new_height, 0,
471 0, 0, 1 494 0, 0, 1
472 }; 495 };
473 496
497 int old_repeat_mode = repeat;
498 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
499
474 return transform (new_width, new_height, matrix); 500 rxvt_img *img = transform (new_width, new_height, matrix);
501
502 repeat = old_repeat_mode;
503 img->repeat = repeat;
504
505 return img;
475} 506}
476 507
477rxvt_img * 508rxvt_img *
478rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 509rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
479{ 510{
… …
488 519
489 return transform (new_width, new_height, matrix); 520 return transform (new_width, new_height, matrix);
490} 521}
491 522
492rxvt_img * 523rxvt_img *
493rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 524rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
494{ 525{
495 if (new_format == format) 526 if (new_format == format)
496 return clone (); 527 return clone ();
497 528
498 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h); 529 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
499 img->alloc (); 530 img->alloc ();
500 531
501 Display *dpy = s->display->dpy; 532 Display *dpy = s->display->dpy;
502 Picture src = src_picture (); 533 Picture src = src_picture ();
503 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 534 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
… …
526rxvt_img * 557rxvt_img *
527rxvt_img::blend (rxvt_img *img, double factor) 558rxvt_img::blend (rxvt_img *img, double factor)
528{ 559{
529 rxvt_img *img2 = clone (); 560 rxvt_img *img2 = clone ();
530 Display *dpy = s->display->dpy; 561 Display *dpy = s->display->dpy;
531 Picture src = src_picture (); 562 Picture src = img->src_picture ();
532 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 563 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
533 Picture mask = create_xrender_mask (dpy, img->pm, False); 564 Picture mask = create_xrender_mask (dpy, img->pm, False);
534 565
535 XRenderColor mask_c; 566 XRenderColor mask_c;
536 567

Diff Legend

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