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.40 by root, Thu Jun 7 11:27:08 2012 UTC vs.
Revision 1.42 by root, Thu Jun 7 11:52: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)
… …
176 176
177 Display *dpy = s->display->dpy; 177 Display *dpy = s->display->dpy;
178 int size = max (rh, rv) * 2 + 1; 178 int size = max (rh, rv) * 2 + 1;
179 double *kernel = (double *)malloc (size * sizeof (double)); 179 double *kernel = (double *)malloc (size * sizeof (double));
180 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 180 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
181 rxvt_img *img = new rxvt_img (s, format, x, y, w, h); 181 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
182 img->alloc (); 182 img->alloc ();
183 183
184 Picture src = src_picture (); 184 Picture src = src_picture ();
185 185
186 XRenderPictureAttributes pa; 186 XRenderPictureAttributes pa;
… …
403 403
404 bool alpha = !format->direct.alphaMask 404 bool alpha = !format->direct.alphaMask
405 && (x || y) 405 && (x || y)
406 && repeat == RepeatNone; 406 && repeat == RepeatNone;
407 407
408 rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h); 408 rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h, repeat);
409 img->alloc (); 409 img->alloc ();
410 410
411 Picture src = src_picture (); 411 Picture src = src_picture ();
412 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 412 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
413 413
414 if (alpha)
415 {
416 XRenderColor rc = { 0, 0, 0, 0 };
417 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
418 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
419 }
420 else
414 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 421 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
415 422
416 XRenderFreePicture (dpy, src); 423 XRenderFreePicture (dpy, src);
417 XRenderFreePicture (dpy, dst); 424 XRenderFreePicture (dpy, dst);
418 425
419 return img; 426 return img;
420} 427}
… …
441} 448}
442 449
443rxvt_img * 450rxvt_img *
444rxvt_img::transform (int new_width, int new_height, double matrix[9]) 451rxvt_img::transform (int new_width, int new_height, double matrix[9])
445{ 452{
446 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height); 453 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
447 img->alloc (); 454 img->alloc ();
448 455
449 Display *dpy = s->display->dpy; 456 Display *dpy = s->display->dpy;
450 Picture src = src_picture (); 457 Picture src = src_picture ();
451 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 458 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
… …
476 w / (double)new_width, 0, 0, 483 w / (double)new_width, 0, 0,
477 0, h / (double)new_height, 0, 484 0, h / (double)new_height, 0,
478 0, 0, 1 485 0, 0, 1
479 }; 486 };
480 487
488 int old_repeat_mode = repeat;
489 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
490
481 return transform (new_width, new_height, matrix); 491 rxvt_img *img = transform (new_width, new_height, matrix);
492
493 repeat = old_repeat_mode;
494 img->repeat = repeat;
495
496 return img;
482} 497}
483 498
484rxvt_img * 499rxvt_img *
485rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 500rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
486{ 501{
… …
500rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 515rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
501{ 516{
502 if (new_format == format) 517 if (new_format == format)
503 return clone (); 518 return clone ();
504 519
505 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h); 520 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h, repeat);
506 img->alloc (); 521 img->alloc ();
522
523 printf ("convert %d to %d\n", format->direct.alphaMask, new_format->direct.alphaMask);//D
507 524
508 Display *dpy = s->display->dpy; 525 Display *dpy = s->display->dpy;
509 Picture src = src_picture (); 526 Picture src = src_picture ();
510 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 527 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
511 int op = PictOpSrc; 528 int op = PictOpSrc;

Diff Legend

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