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.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC vs.
Revision 1.81 by root, Tue Jun 12 19:00:57 2012 UTC

… …
50 50
51 return img; 51 return img;
52} 52}
53 53
54# if HAVE_PIXBUF 54# if HAVE_PIXBUF
55
55rxvt_img * 56rxvt_img *
56rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 57rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
57{ 58{
58 Display *dpy = s->display->dpy; 59 Display *dpy = s->display->dpy;
59 60
… …
63 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 64 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
64 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");
65 66
66 // since we require rgb24/argb32 formats from xrender we assume 67 // since we require rgb24/argb32 formats from xrender we assume
67 // 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
68 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
69 69
70 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 70 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
71 71
72 XImage xi; 72 XImage xi;
73 73
… …
77 xi.format = ZPixmap; 77 xi.format = ZPixmap;
78 xi.byte_order = ImageByteOrder (dpy); 78 xi.byte_order = ImageByteOrder (dpy);
79 xi.bitmap_unit = 0; //XY only, unused 79 xi.bitmap_unit = 0; //XY only, unused
80 xi.bitmap_bit_order = 0; //XY only, unused 80 xi.bitmap_bit_order = 0; //XY only, unused
81 xi.bitmap_pad = BitmapPad (dpy); 81 xi.bitmap_pad = BitmapPad (dpy);
82 xi.depth = depth; 82 xi.depth = 32;
83 xi.bytes_per_line = 0; 83 xi.bytes_per_line = 0;
84 xi.bits_per_pixel = 32; //Z only 84 xi.bits_per_pixel = 32; //Z only
85 xi.red_mask = 0x00000000; //Z only, unused 85 xi.red_mask = 0x00000000; //Z only, unused
86 xi.green_mask = 0x00000000; //Z only, unused 86 xi.green_mask = 0x00000000; //Z only, unused
87 xi.blue_mask = 0x00000000; //Z only, unused 87 xi.blue_mask = 0x00000000; //Z only, unused
… …
96 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");
97 97
98 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); 98 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
99 99
100 int rowstride = gdk_pixbuf_get_rowstride (pb); 100 int rowstride = gdk_pixbuf_get_rowstride (pb);
101 101 bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
102 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
103 unsigned char *row = gdk_pixbuf_get_pixels (pb); 102 unsigned char *row = gdk_pixbuf_get_pixels (pb);
103
104 char *line = xi.data; 104 char *line = xi.data;
105 105
106 for (int y = 0; y < height; y++) 106 for (int y = 0; y < height; y++)
107 { 107 {
108 unsigned char *src = row; 108 unsigned char *src = row;
109 uint32_t *dst = (uint32_t *)line; 109 uint32_t *dst = (uint32_t *)line;
110 110
111 if (depth == 24) 111 if (!pb_has_alpha)
112 for (int x = 0; x < width; x++) 112 for (int x = 0; x < width; x++)
113 { 113 {
114 uint8_t r = *src++; 114 uint8_t r = *src++;
115 uint8_t g = *src++; 115 uint8_t g = *src++;
116 uint8_t b = *src++; 116 uint8_t b = *src++;
117 117
118 uint32_t v = (r << 16) | (g << 8) | b; 118 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
119 119
120 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 120 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
121 v = ecb_bswap32 (v); 121 v = ecb_bswap32 (v);
122 122
123 *dst++ = v; 123 *dst++ = v;
… …
140 140
141 row += rowstride; 141 row += rowstride;
142 line += xi.bytes_per_line; 142 line += xi.bytes_per_line;
143 } 143 }
144 144
145 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);
146 img->alloc (); 146 img->alloc ();
147 147
148 GC gc = XCreateGC (dpy, img->pm, 0, 0); 148 GC gc = XCreateGC (dpy, img->pm, 0, 0);
149 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);
150 XFreeGC (dpy, gc); 150 XFreeGC (dpy, gc);
… …
167 167
168 g_object_unref (pb); 168 g_object_unref (pb);
169 169
170 return img; 170 return img;
171} 171}
172
172# endif 173# endif
173 174
174void 175void
175rxvt_img::destroy () 176rxvt_img::destroy ()
176{ 177{
… …
225} 226}
226 227
227void 228void
228rxvt_img::fill (const rxvt_color &c) 229rxvt_img::fill (const rxvt_color &c)
229{ 230{
230 XGCValues gcv; 231 rgba cc;
231 gcv.foreground = c; 232 c.get (cc);
232 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 233 XRenderColor rc = { cc.r, cc.g, cc.b, cc.a };
233 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 234
234 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);
235} 239}
236 240
237static void 241static void
238get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 242get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
239{ 243{
… …
309 w, h); 313 w, h);
310 } 314 }
311 315
312 free (kernel); 316 free (kernel);
313 free (params); 317 free (params);
318
314 XRenderFreePicture (dpy, src); 319 XRenderFreePicture (dpy, src);
315 XRenderFreePicture (dpy, dst); 320 XRenderFreePicture (dpy, dst);
316 XRenderFreePicture (dpy, tmp); 321 XRenderFreePicture (dpy, tmp);
317 322
318 return img; 323 return img;
… …
514 } 519 }
515 520
516 return img; 521 return img;
517} 522}
518 523
519rxvt_img * 524static void
520rxvt_img::transform (int new_width, int new_height, double matrix[9]) 525mat_invert (double mat[3][3], double (&inv)[3][3])
521{ 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 d [2], 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; d [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
522 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 - d [0], oy - dy - d [1], new_width, new_height, repeat);
523 img->alloc (); 584 img->alloc ();
524 585
525 Display *dpy = s->display->dpy; 586 Display *dpy = s->display->dpy;
526 Picture src = src_picture (); 587 Picture src = src_picture ();
527 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 588 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
528 589
529 XTransform xfrm; 590 XTransform xfrm;
530 591
531 for (int i = 0; i < 3; ++i) 592 for (int i = 0; i < 3; ++i)
532 for (int j = 0; j < 3; ++j) 593 for (int j = 0; j < 3; ++j)
533 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 594 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
534
535 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
536 xfrm.matrix [1][2] -= XDoubleToFixed (y);
537 595
538 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 596 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
539 XRenderSetPictureTransform (dpy, src, &xfrm); 597 XRenderSetPictureTransform (dpy, src, &xfrm);
540 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);
541 599
542 XRenderFreePicture (dpy, src); 600 XRenderFreePicture (dpy, src);
543 XRenderFreePicture (dpy, dst); 601 XRenderFreePicture (dpy, dst);
544 602
545 return img; 603 return img;
… …
549rxvt_img::scale (int new_width, int new_height) 607rxvt_img::scale (int new_width, int new_height)
550{ 608{
551 if (w == new_width && h == new_height) 609 if (w == new_width && h == new_height)
552 return clone (); 610 return clone ();
553 611
554 double matrix[9] = { 612 double matrix[3][3] = {
555 w / (double)new_width, 0, 0, 613 { new_width / (double)w, 0, 0 },
556 0, h / (double)new_height, 0, 614 { 0, new_height / (double)h, 0 },
557 0, 0, 1 615 { 0, 0, 1 }
558 }; 616 };
559 617
560 int old_repeat_mode = repeat; 618 int old_repeat_mode = repeat;
561 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
562 620
563 rxvt_img *img = transform (new_width, new_height, matrix); 621 rxvt_img *img = transform (matrix);
564 622
565 repeat = old_repeat_mode; 623 repeat = old_repeat_mode;
566 img->repeat = repeat; 624 img->repeat = repeat;
567 625
568 return img; 626 return img;
569} 627}
570 628
571rxvt_img * 629rxvt_img *
572rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 630rxvt_img::rotate (int cx, int cy, double phi)
573{ 631{
574 double s = sin (phi); 632 double s = sin (phi);
575 double c = cos (phi); 633 double c = cos (phi);
576 634
577 double matrix[9] = { 635 double matrix[3][3] = {
578 c, -s, -c * x + s * y + x, 636 { c, -s, cx - c * cx + s * cy },
579 s, c, -s * x - c * y + y, 637 { s, c, cy - s * cx - c * cy },
580 0, 0, 1 638 { 0, 0, 1 }
639 //{ c, -s, 0 },
640 //{ s, c, 0 },
641 //{ 0, 0, 1 }
581 }; 642 };
582 643
583 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;
584} 650}
585 651
586rxvt_img * 652rxvt_img *
587rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 653rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
588{ 654{

Diff Legend

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