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.71 by sf-exg, Sat Jun 9 14:18:53 2012 UTC vs.
Revision 1.82 by root, Thu Jun 14 17:06: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)
… …
221 pm = pm2; 224 pm = pm2;
222 ref = new pixref (ref->w, ref->h); 225 ref = new pixref (ref->w, ref->h);
223} 226}
224 227
225void 228void
226rxvt_img::fill (const rxvt_color &c) 229rxvt_img::fill (const rgba &c)
227{ 230{
228 XGCValues gcv; 231 XRenderColor rc = { c.r, c.g, c.b, c.a };
229 gcv.foreground = c; 232
230 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 233 Display *dpy = s->display->dpy;
231 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 234 Picture src = src_picture ();
232 XFreeGC (s->display->dpy, gc); 235 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
236 XRenderFreePicture (dpy, src);
233} 237}
234 238
235static void 239static void
236get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 240get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
237{ 241{
… …
307 w, h); 311 w, h);
308 } 312 }
309 313
310 free (kernel); 314 free (kernel);
311 free (params); 315 free (params);
316
312 XRenderFreePicture (dpy, src); 317 XRenderFreePicture (dpy, src);
313 XRenderFreePicture (dpy, dst); 318 XRenderFreePicture (dpy, dst);
314 XRenderFreePicture (dpy, tmp); 319 XRenderFreePicture (dpy, tmp);
315 320
316 return img; 321 return img;
317} 322}
318 323
319static Picture 324static Picture
320create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 325create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
321{ 326{
322 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 327 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
323 328
324 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 329 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
325 XRenderPictureAttributes pa; 330 XRenderPictureAttributes pa;
326 pa.repeat = True; 331 pa.repeat = RepeatNormal;
332 pa.component_alpha = component_alpha;
327 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 333 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
328 334
329 XFreePixmap (dpy, pixmap); 335 XFreePixmap (dpy, pixmap);
330 336
331 return mask; 337 return mask;
332} 338}
… …
378 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); 384 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
379 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); 385 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
380 } 386 }
381 } 387 }
382 388
383
384 XRenderFreePicture (dpy, dst); 389 XRenderFreePicture (dpy, dst);
385} 390}
386 391
387void 392void
388rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) 393rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
389{ 394{
390 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 395 if (r < 0 || g < 0 || b < 0 || a < 0)
391 { 396 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
392 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
393 return;
394 }
395 397
396 unshare (); 398 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
399 img->alloc ();
400 img->fill (rgba (0, 0, 0, 0));
397 401
402 // premultiply (yeah, these are not exact, sue me or fix it)
403 r = (r * (a >> 8)) >> 8;
404 g = (g * (a >> 8)) >> 8;
405 b = (b * (a >> 8)) >> 8;
406
398 Display *dpy = s->display->dpy; 407 Display *dpy = s->display->dpy;
408
409 Picture src = src_picture ();
399 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 410 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
411 Picture mul = create_xrender_mask (dpy, pm, True, True);
400 412
413 //TODO: this operator does not yet implement some useful contrast
414 while (r | g | b | a)
415 {
416 unsigned short xr, xg, xb, xa;
401 XRenderColor mask_c; 417 XRenderColor mask_c;
402 mask_c.red = r; 418
403 mask_c.green = g; 419 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
404 mask_c.blue = b; 420 {
405 mask_c.alpha = a;
406 XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h); 421 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
422 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
423 }
424 }
407 425
426 XRenderFreePicture (dpy, mul);
408 XRenderFreePicture (dpy, dst); 427 XRenderFreePicture (dpy, dst);
428 XRenderFreePicture (dpy, src);
429
430 ::swap (img->ref, ref);
431 ::swap (img->pm , pm );
432
433 delete img;
409} 434}
410 435
411rxvt_img * 436rxvt_img *
412rxvt_img::clone () 437rxvt_img::clone ()
413{ 438{
… …
487 } 512 }
488 513
489 return img; 514 return img;
490} 515}
491 516
492rxvt_img * 517static void
493rxvt_img::transform (int new_width, int new_height, double matrix[9]) 518mat_invert (double mat[3][3], double (&inv)[3][3])
494{ 519{
520 double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
521 double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
522 double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
523
524 double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
525
526 inv [0][0] = invdet * s0;
527 inv [0][1] = invdet * s1;
528 inv [0][2] = invdet * s2;
529
530 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
531 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
532 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
533
534 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
535 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
536 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
537}
538
539static double
540mat_apply (double mat[3][3], int i, double x, double y)
541{
542 double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
543 double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
544
545 return v * (1. / w);
546}
547
548rxvt_img *
549rxvt_img::transform (double matrix[3][3])
550{
551 // find new offset
552 int ox = mat_apply (matrix, 0, x, y);
553 int oy = mat_apply (matrix, 1, x, y);
554
555 // calculate new pixel bounding box coordinates
556 double d [2], rmin[2], rmax[2];
557
558 for (int i = 0; i < 2; ++i)
559 {
560 double v;
561 v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v;
562 v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v);
563 v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v);
564 v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v);
565 }
566
567 int dx = floor (rmin [0]);
568 int dy = floor (rmin [1]);
569
570 int new_width = ceil (rmax [0] - dx);
571 int new_height = ceil (rmax [1] - dy);
572
573 double inv[3][3];
574 mat_invert (matrix, inv);
575
495 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); 576 rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat);
496 img->alloc (); 577 img->alloc ();
497 578
498 Display *dpy = s->display->dpy; 579 Display *dpy = s->display->dpy;
499 Picture src = src_picture (); 580 Picture src = src_picture ();
500 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 581 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
501 582
502 XTransform xfrm; 583 XTransform xfrm;
503 584
504 for (int i = 0; i < 3; ++i) 585 for (int i = 0; i < 3; ++i)
505 for (int j = 0; j < 3; ++j) 586 for (int j = 0; j < 3; ++j)
506 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 587 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
507
508 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
509 xfrm.matrix [1][2] -= XDoubleToFixed (y);
510 588
511 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 589 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
512 XRenderSetPictureTransform (dpy, src, &xfrm); 590 XRenderSetPictureTransform (dpy, src, &xfrm);
513 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 591 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
514 592
515 XRenderFreePicture (dpy, src); 593 XRenderFreePicture (dpy, src);
516 XRenderFreePicture (dpy, dst); 594 XRenderFreePicture (dpy, dst);
517 595
518 return img; 596 return img;
… …
522rxvt_img::scale (int new_width, int new_height) 600rxvt_img::scale (int new_width, int new_height)
523{ 601{
524 if (w == new_width && h == new_height) 602 if (w == new_width && h == new_height)
525 return clone (); 603 return clone ();
526 604
527 double matrix[9] = { 605 double matrix[3][3] = {
528 w / (double)new_width, 0, 0, 606 { new_width / (double)w, 0, 0 },
529 0, h / (double)new_height, 0, 607 { 0, new_height / (double)h, 0 },
530 0, 0, 1 608 { 0, 0, 1 }
531 }; 609 };
532 610
533 int old_repeat_mode = repeat; 611 int old_repeat_mode = repeat;
534 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems 612 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
535 613
536 rxvt_img *img = transform (new_width, new_height, matrix); 614 rxvt_img *img = transform (matrix);
537 615
538 repeat = old_repeat_mode; 616 repeat = old_repeat_mode;
539 img->repeat = repeat; 617 img->repeat = repeat;
540 618
541 return img; 619 return img;
542} 620}
543 621
544rxvt_img * 622rxvt_img *
545rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 623rxvt_img::rotate (int cx, int cy, double phi)
546{ 624{
547 double s = sin (phi); 625 double s = sin (phi);
548 double c = cos (phi); 626 double c = cos (phi);
549 627
550 double matrix[9] = { 628 double matrix[3][3] = {
551 c, -s, -c * x + s * y + x, 629 { c, -s, cx - c * cx + s * cy },
552 s, c, -s * x - c * y + y, 630 { s, c, cy - s * cx - c * cy },
553 0, 0, 1 631 { 0, 0, 1 }
632 //{ c, -s, 0 },
633 //{ s, c, 0 },
634 //{ 0, 0, 1 }
554 }; 635 };
555 636
556 return transform (new_width, new_height, matrix); 637 //move (-cx, -cy);
557} 638 rxvt_img *img = transform (matrix);
639 //move ( cx, cy);
640 //img->move (cx, cy);
558 641
642 return img;
643}
644
559rxvt_img * 645rxvt_img *
560rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 646rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
561{ 647{
562 if (new_format == format) 648 if (new_format == format)
563 return clone (); 649 return clone ();
564 650
565 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 651 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
… …
571 int op = PictOpSrc; 657 int op = PictOpSrc;
572 658
573 if (format->direct.alphaMask && !new_format->direct.alphaMask) 659 if (format->direct.alphaMask && !new_format->direct.alphaMask)
574 { 660 {
575 // does it have to be that complicated 661 // does it have to be that complicated
576 rgba c;
577 bg.get (c);
578
579 XRenderColor rc = { c.r, c.g, c.b, 0xffff }; 662 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
580 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 663 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
581 664
582 op = PictOpOver; 665 op = PictOpOver;
583 } 666 }
584 667
… …
595{ 678{
596 rxvt_img *img2 = clone (); 679 rxvt_img *img2 = clone ();
597 Display *dpy = s->display->dpy; 680 Display *dpy = s->display->dpy;
598 Picture src = img->src_picture (); 681 Picture src = img->src_picture ();
599 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 682 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
600 Picture mask = create_xrender_mask (dpy, img->pm, False); 683 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
601 684
602 XRenderColor mask_c; 685 XRenderColor mask_c;
603 686
604 mask_c.alpha = float_to_component (factor); 687 mask_c.alpha = float_to_component (factor);
605 mask_c.red = 688 mask_c.red =

Diff Legend

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