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.76 by root, Sun Jun 10 10:29:26 2012 UTC vs.
Revision 1.80 by root, Tue Jun 12 18:25: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
… …
166 167
167 g_object_unref (pb); 168 g_object_unref (pb);
168 169
169 return img; 170 return img;
170} 171}
172
171# endif 173# endif
172 174
173void 175void
174rxvt_img::destroy () 176rxvt_img::destroy ()
175{ 177{
… …
224} 226}
225 227
226void 228void
227rxvt_img::fill (const rxvt_color &c) 229rxvt_img::fill (const rxvt_color &c)
228{ 230{
229 XGCValues gcv; 231 rgba cc;
230 gcv.foreground = c; 232 c.get (cc);
231 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 233 XRenderColor rc = { cc.r, cc.g, cc.b, cc.a };
232 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 234
233 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);
234} 239}
235 240
236static void 241static void
237get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 242get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
238{ 243{
… …
308 w, h); 313 w, h);
309 } 314 }
310 315
311 free (kernel); 316 free (kernel);
312 free (params); 317 free (params);
318
313 XRenderFreePicture (dpy, src); 319 XRenderFreePicture (dpy, src);
314 XRenderFreePicture (dpy, dst); 320 XRenderFreePicture (dpy, dst);
315 XRenderFreePicture (dpy, tmp); 321 XRenderFreePicture (dpy, tmp);
316 322
317 return img; 323 return img;
… …
513 } 519 }
514 520
515 return img; 521 return img;
516} 522}
517 523
518rxvt_img * 524static void
519rxvt_img::transform (int new_width, int new_height, double matrix[9]) 525mat_invert (double mat[3][3], double (&inv)[3][3])
520{ 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
521 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);
522 img->alloc (); 584 img->alloc ();
523 585
524 Display *dpy = s->display->dpy; 586 Display *dpy = s->display->dpy;
525 Picture src = src_picture (); 587 Picture src = src_picture ();
526 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 588 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
527 589
528 XTransform xfrm; 590 XTransform xfrm;
529 591
530 for (int i = 0; i < 3; ++i) 592 for (int i = 0; i < 3; ++i)
531 for (int j = 0; j < 3; ++j) 593 for (int j = 0; j < 3; ++j)
532 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 594 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
533
534 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
535 xfrm.matrix [1][2] -= XDoubleToFixed (y);
536 595
537 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 596 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
538 XRenderSetPictureTransform (dpy, src, &xfrm); 597 XRenderSetPictureTransform (dpy, src, &xfrm);
539 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);
540 599
541 XRenderFreePicture (dpy, src); 600 XRenderFreePicture (dpy, src);
542 XRenderFreePicture (dpy, dst); 601 XRenderFreePicture (dpy, dst);
543 602
544 return img; 603 return img;
… …
548rxvt_img::scale (int new_width, int new_height) 607rxvt_img::scale (int new_width, int new_height)
549{ 608{
550 if (w == new_width && h == new_height) 609 if (w == new_width && h == new_height)
551 return clone (); 610 return clone ();
552 611
553 double matrix[9] = { 612 double matrix[3][3] = {
554 w / (double)new_width, 0, 0, 613 { new_width / (double)w, 0, 0 },
555 0, h / (double)new_height, 0, 614 { 0, new_height / (double)h, 0 },
556 0, 0, 1 615 { 0, 0, 1 }
557 }; 616 };
558 617
559 int old_repeat_mode = repeat; 618 int old_repeat_mode = repeat;
560 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
561 620
562 rxvt_img *img = transform (new_width, new_height, matrix); 621 rxvt_img *img = transform (matrix);
563 622
564 repeat = old_repeat_mode; 623 repeat = old_repeat_mode;
565 img->repeat = repeat; 624 img->repeat = repeat;
566 625
567 return img; 626 return img;
568} 627}
569 628
570rxvt_img * 629rxvt_img *
571rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 630rxvt_img::rotate (int cx, int cy, double phi)
572{ 631{
573 double s = sin (phi); 632 double s = sin (phi);
574 double c = cos (phi); 633 double c = cos (phi);
575 634
576 double matrix[9] = { 635 double matrix[3][3] = {
577 c, -s, -c * x + s * y + x, 636 //{ c, -s, cx - c * cx + s * cy },
578 s, c, -s * x - c * y + y, 637 //{ s, c, cy - s * cx - c * cy },
579 0, 0, 1 638 //{ 0, 0, 1 }
639 { c, -s, 0 },
640 { s, c, 0 },
641 { 0, 0, 1 }
580 }; 642 };
581 643
582 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;
583} 650}
584 651
585rxvt_img * 652rxvt_img *
586rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 653rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
587{ 654{

Diff Legend

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