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.70 by root, Sat Jun 9 11:41:28 2012 UTC vs.
Revision 1.80 by root, Tue Jun 12 18:25:57 2012 UTC

… …
49 img->ref->ours = false; 49 img->ref->ours = false;
50 50
51 return img; 51 return img;
52} 52}
53 53
54# if HAVE_PIXBUF
55
54rxvt_img * 56rxvt_img *
55rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 57rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
56{ 58{
57 Display *dpy = s->display->dpy; 59 Display *dpy = s->display->dpy;
58 60
… …
62 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 64 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"); 65 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
64 66
65 // since we require rgb24/argb32 formats from xrender we assume 67 // 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 68 // 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
69 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 70 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
70 71
71 XImage xi; 72 XImage xi;
72 73
… …
76 xi.format = ZPixmap; 77 xi.format = ZPixmap;
77 xi.byte_order = ImageByteOrder (dpy); 78 xi.byte_order = ImageByteOrder (dpy);
78 xi.bitmap_unit = 0; //XY only, unused 79 xi.bitmap_unit = 0; //XY only, unused
79 xi.bitmap_bit_order = 0; //XY only, unused 80 xi.bitmap_bit_order = 0; //XY only, unused
80 xi.bitmap_pad = BitmapPad (dpy); 81 xi.bitmap_pad = BitmapPad (dpy);
81 xi.depth = depth; 82 xi.depth = 32;
82 xi.bytes_per_line = 0; 83 xi.bytes_per_line = 0;
83 xi.bits_per_pixel = 32; //Z only 84 xi.bits_per_pixel = 32; //Z only
84 xi.red_mask = 0x00000000; //Z only, unused 85 xi.red_mask = 0x00000000; //Z only, unused
85 xi.green_mask = 0x00000000; //Z only, unused 86 xi.green_mask = 0x00000000; //Z only, unused
86 xi.blue_mask = 0x00000000; //Z only, unused 87 xi.blue_mask = 0x00000000; //Z only, unused
… …
95 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n"); 96 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
96 97
97 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); 98 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
98 99
99 int rowstride = gdk_pixbuf_get_rowstride (pb); 100 int rowstride = gdk_pixbuf_get_rowstride (pb);
100 101 bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
101 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
102 unsigned char *row = gdk_pixbuf_get_pixels (pb); 102 unsigned char *row = gdk_pixbuf_get_pixels (pb);
103
103 char *line = xi.data; 104 char *line = xi.data;
104 105
105 for (int y = 0; y < height; y++) 106 for (int y = 0; y < height; y++)
106 { 107 {
107 unsigned char *src = row; 108 unsigned char *src = row;
108 uint32_t *dst = (uint32_t *)line; 109 uint32_t *dst = (uint32_t *)line;
109 110
110 if (depth == 24) 111 if (!pb_has_alpha)
111 for (int x = 0; x < width; x++) 112 for (int x = 0; x < width; x++)
112 { 113 {
113 uint8_t r = *src++; 114 uint8_t r = *src++;
114 uint8_t g = *src++; 115 uint8_t g = *src++;
115 uint8_t b = *src++; 116 uint8_t b = *src++;
116 117
117 uint32_t v = (r << 16) | (g << 8) | b; 118 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
118 119
119 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 120 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
120 v = ecb_bswap32 (v); 121 v = ecb_bswap32 (v);
121 122
122 *dst++ = v; 123 *dst++ = v;
… …
139 140
140 row += rowstride; 141 row += rowstride;
141 line += xi.bytes_per_line; 142 line += xi.bytes_per_line;
142 } 143 }
143 144
144 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height); 145 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
145 img->alloc (); 146 img->alloc ();
146 147
147 GC gc = XCreateGC (dpy, img->pm, 0, 0); 148 GC gc = XCreateGC (dpy, img->pm, 0, 0);
148 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height); 149 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
149 XFreeGC (dpy, gc); 150 XFreeGC (dpy, gc);
… …
166 167
167 g_object_unref (pb); 168 g_object_unref (pb);
168 169
169 return img; 170 return img;
170} 171}
172
173# endif
171 174
172void 175void
173rxvt_img::destroy () 176rxvt_img::destroy ()
174{ 177{
175 if (--ref->cnt) 178 if (--ref->cnt)
… …
223} 226}
224 227
225void 228void
226rxvt_img::fill (const rxvt_color &c) 229rxvt_img::fill (const rxvt_color &c)
227{ 230{
228 XGCValues gcv; 231 rgba cc;
229 gcv.foreground = c; 232 c.get (cc);
230 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 233 XRenderColor rc = { cc.r, cc.g, cc.b, cc.a };
231 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 234
232 XFreeGC (s->display->dpy, gc); 235 Display *dpy = s->display->dpy;
236 Picture src = src_picture ();
237 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
238 XRenderFreePicture (dpy, src);
233} 239}
234 240
235static void 241static void
236get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 242get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
237{ 243{
… …
307 w, h); 313 w, h);
308 } 314 }
309 315
310 free (kernel); 316 free (kernel);
311 free (params); 317 free (params);
318
312 XRenderFreePicture (dpy, src); 319 XRenderFreePicture (dpy, src);
313 XRenderFreePicture (dpy, dst); 320 XRenderFreePicture (dpy, dst);
314 XRenderFreePicture (dpy, tmp); 321 XRenderFreePicture (dpy, tmp);
315 322
316 return img; 323 return img;
317} 324}
318 325
319static Picture 326static Picture
320create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 327create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
321{ 328{
322 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 329 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
323 330
324 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 331 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
325 XRenderPictureAttributes pa; 332 XRenderPictureAttributes pa;
326 pa.repeat = True; 333 pa.repeat = RepeatNormal;
334 pa.component_alpha = component_alpha;
327 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 335 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
328 336
329 XFreePixmap (dpy, pixmap); 337 XFreePixmap (dpy, pixmap);
330 338
331 return mask; 339 return mask;
332} 340}
… …
378 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); 386 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
379 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); 387 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
380 } 388 }
381 } 389 }
382 390
383
384 XRenderFreePicture (dpy, dst); 391 XRenderFreePicture (dpy, dst);
385} 392}
386 393
387void 394void
388rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) 395rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
389{ 396{
390 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 397 if (r < 0 || g < 0 || b < 0 || a < 0)
398 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
399
400 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
401 img->alloc ();
402
391 { 403 {
392 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n"); 404 rxvt_color empty;
393 return; 405 empty.set (s, rgba (0, 0, 0, 0));
406 img->fill (empty);
394 } 407 }
395 408
396 unshare (); 409 // premultiply (yeah, these are not exact, sue me or fix it)
410 r = (r * (a >> 8)) >> 8;
411 g = (g * (a >> 8)) >> 8;
412 b = (b * (a >> 8)) >> 8;
397 413
398 Display *dpy = s->display->dpy; 414 Display *dpy = s->display->dpy;
399 Picture src = create_xrender_mask (dpy, pm, True); 415
416 Picture src = src_picture ();
400 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 417 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
418 Picture mul = create_xrender_mask (dpy, pm, True, True);
401 419
420 //TODO: this operator does not yet implement some useful contrast
421 while (r | g | b | a)
422 {
423 unsigned short xr, xg, xb, xa;
402 XRenderColor mask_c; 424 XRenderColor mask_c;
403 mask_c.red = r; 425
404 mask_c.green = g; 426 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
405 mask_c.blue = b; 427 {
406 mask_c.alpha = a;
407 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 428 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
408
409 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 429 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
430 }
431 }
410 432
433 XRenderFreePicture (dpy, mul);
434 XRenderFreePicture (dpy, dst);
411 XRenderFreePicture (dpy, src); 435 XRenderFreePicture (dpy, src);
412 XRenderFreePicture (dpy, dst); 436
437 ::swap (img->ref, ref);
438 ::swap (img->pm , pm );
439
440 delete img;
413} 441}
414 442
415rxvt_img * 443rxvt_img *
416rxvt_img::clone () 444rxvt_img::clone ()
417{ 445{
… …
491 } 519 }
492 520
493 return img; 521 return img;
494} 522}
495 523
496rxvt_img * 524static void
497rxvt_img::transform (int new_width, int new_height, double matrix[9]) 525mat_invert (double mat[3][3], double (&inv)[3][3])
498{ 526{
527 double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
528 double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
529 double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
530
531 double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
532
533 inv [0][0] = invdet * s0;
534 inv [0][1] = invdet * s1;
535 inv [0][2] = invdet * s2;
536
537 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
538 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
539 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
540
541 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
542 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
543 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
544}
545
546static double
547mat_apply (double mat[3][3], int i, double x, double y)
548{
549 double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
550 double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
551
552 return v * (1. / w);
553}
554
555rxvt_img *
556rxvt_img::transform (double matrix[3][3])
557{
558 // find new offset
559 int ox = mat_apply (matrix, 0, x, y);
560 int oy = mat_apply (matrix, 1, x, y);
561
562 // calculate new pixel bounding box coordinates
563 double rmin[2], rmax[2];
564
565 for (int i = 0; i < 2; ++i)
566 {
567 double v;
568 v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v;
569 v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v);
570 v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v);
571 v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v);
572 }
573
574 int dx = floor (rmin [0]);
575 int dy = floor (rmin [1]);
576
577 int new_width = ceil (rmax [0] - dx);
578 int new_height = ceil (rmax [1] - dy);
579
580 double inv[3][3];
581 mat_invert (matrix, inv);
582
499 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); 583 rxvt_img *img = new rxvt_img (s, format, ox - dx, oy - dy, new_width, new_height, repeat);
500 img->alloc (); 584 img->alloc ();
501 585
502 Display *dpy = s->display->dpy; 586 Display *dpy = s->display->dpy;
503 Picture src = src_picture (); 587 Picture src = src_picture ();
504 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 588 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
505 589
506 XTransform xfrm; 590 XTransform xfrm;
507 591
508 for (int i = 0; i < 3; ++i) 592 for (int i = 0; i < 3; ++i)
509 for (int j = 0; j < 3; ++j) 593 for (int j = 0; j < 3; ++j)
510 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 594 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
511
512 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
513 xfrm.matrix [1][2] -= XDoubleToFixed (y);
514 595
515 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 596 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
516 XRenderSetPictureTransform (dpy, src, &xfrm); 597 XRenderSetPictureTransform (dpy, src, &xfrm);
517 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 598 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
518 599
519 XRenderFreePicture (dpy, src); 600 XRenderFreePicture (dpy, src);
520 XRenderFreePicture (dpy, dst); 601 XRenderFreePicture (dpy, dst);
521 602
522 return img; 603 return img;
… …
526rxvt_img::scale (int new_width, int new_height) 607rxvt_img::scale (int new_width, int new_height)
527{ 608{
528 if (w == new_width && h == new_height) 609 if (w == new_width && h == new_height)
529 return clone (); 610 return clone ();
530 611
531 double matrix[9] = { 612 double matrix[3][3] = {
532 w / (double)new_width, 0, 0, 613 { new_width / (double)w, 0, 0 },
533 0, h / (double)new_height, 0, 614 { 0, new_height / (double)h, 0 },
534 0, 0, 1 615 { 0, 0, 1 }
535 }; 616 };
536 617
537 int old_repeat_mode = repeat; 618 int old_repeat_mode = repeat;
538 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems 619 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
539 620
540 rxvt_img *img = transform (new_width, new_height, matrix); 621 rxvt_img *img = transform (matrix);
541 622
542 repeat = old_repeat_mode; 623 repeat = old_repeat_mode;
543 img->repeat = repeat; 624 img->repeat = repeat;
544 625
545 return img; 626 return img;
546} 627}
547 628
548rxvt_img * 629rxvt_img *
549rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 630rxvt_img::rotate (int cx, int cy, double phi)
550{ 631{
551 double s = sin (phi); 632 double s = sin (phi);
552 double c = cos (phi); 633 double c = cos (phi);
553 634
554 double matrix[9] = { 635 double matrix[3][3] = {
555 c, -s, -c * x + s * y + x, 636 //{ c, -s, cx - c * cx + s * cy },
556 s, c, -s * x - c * y + y, 637 //{ s, c, cy - s * cx - c * cy },
557 0, 0, 1 638 //{ 0, 0, 1 }
639 { c, -s, 0 },
640 { s, c, 0 },
641 { 0, 0, 1 }
558 }; 642 };
559 643
560 return transform (new_width, new_height, matrix); 644 move (-cx, -cy);
645 rxvt_img *img = transform (matrix);
646 move ( cx, cy);
647 img->move (cx, cy);
648
649 return img;
561} 650}
562 651
563rxvt_img * 652rxvt_img *
564rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 653rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
565{ 654{
… …
599{ 688{
600 rxvt_img *img2 = clone (); 689 rxvt_img *img2 = clone ();
601 Display *dpy = s->display->dpy; 690 Display *dpy = s->display->dpy;
602 Picture src = img->src_picture (); 691 Picture src = img->src_picture ();
603 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 692 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
604 Picture mask = create_xrender_mask (dpy, img->pm, False); 693 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
605 694
606 XRenderColor mask_c; 695 XRenderColor mask_c;
607 696
608 mask_c.alpha = float_to_component (factor); 697 mask_c.alpha = float_to_component (factor);
609 mask_c.red = 698 mask_c.red =

Diff Legend

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