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.37 by root, Thu Jun 7 09:25:23 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;
… …
397rxvt_img::reify () 397rxvt_img::reify ()
398{ 398{
399 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 399 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
400 return clone (); 400 return clone ();
401 401
402 rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h); 402 Display *dpy = s->display->dpy;
403
404 bool alpha = !format->direct.alphaMask
405 && (x || y)
406 && repeat == RepeatNone;
407
408 rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h, repeat);
403 img->alloc (); 409 img->alloc ();
404
405 Display *dpy = s->display->dpy;
406 410
407 Picture src = src_picture (); 411 Picture src = src_picture ();
408 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 412 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
409 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
410 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);
411 422
412 XRenderFreePicture (dpy, src); 423 XRenderFreePicture (dpy, src);
413 XRenderFreePicture (dpy, dst); 424 XRenderFreePicture (dpy, dst);
414 425
415 return img; 426 return img;
416} 427}
… …
426 if (w != width || h != height) 437 if (w != width || h != height)
427 { 438 {
428 img->w = width; 439 img->w = width;
429 img->h = height; 440 img->h = height;
430 441
431 img->reify (); 442 rxvt_img *img2 = img->reify ();
443 delete img;
444 img = img2;
432 } 445 }
433 446
434 return img; 447 return img;
435} 448}
436 449
437rxvt_img * 450rxvt_img *
438rxvt_img::transform (int new_width, int new_height, double matrix[9]) 451rxvt_img::transform (int new_width, int new_height, double matrix[9])
439{ 452{
440 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);
441 img->alloc (); 454 img->alloc ();
442 455
443 Display *dpy = s->display->dpy; 456 Display *dpy = s->display->dpy;
444 Picture src = src_picture (); 457 Picture src = src_picture ();
445 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 458 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
… …
470 w / (double)new_width, 0, 0, 483 w / (double)new_width, 0, 0,
471 0, h / (double)new_height, 0, 484 0, h / (double)new_height, 0,
472 0, 0, 1 485 0, 0, 1
473 }; 486 };
474 487
488 int old_repeat_mode = repeat;
489 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
490
475 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;
476} 497}
477 498
478rxvt_img * 499rxvt_img *
479rxvt_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)
480{ 501{
… …
494rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 515rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
495{ 516{
496 if (new_format == format) 517 if (new_format == format)
497 return clone (); 518 return clone ();
498 519
499 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);
500 img->alloc (); 521 img->alloc ();
522
523 printf ("convert %d to %d\n", format->direct.alphaMask, new_format->direct.alphaMask);//D
501 524
502 Display *dpy = s->display->dpy; 525 Display *dpy = s->display->dpy;
503 Picture src = src_picture (); 526 Picture src = src_picture ();
504 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 527 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
505 int op = PictOpSrc; 528 int op = PictOpSrc;
… …
527rxvt_img * 550rxvt_img *
528rxvt_img::blend (rxvt_img *img, double factor) 551rxvt_img::blend (rxvt_img *img, double factor)
529{ 552{
530 rxvt_img *img2 = clone (); 553 rxvt_img *img2 = clone ();
531 Display *dpy = s->display->dpy; 554 Display *dpy = s->display->dpy;
532 Picture src = src_picture (); 555 Picture src = img->src_picture ();
533 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 556 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
534 Picture mask = create_xrender_mask (dpy, img->pm, False); 557 Picture mask = create_xrender_mask (dpy, img->pm, False);
535 558
536 XRenderColor mask_c; 559 XRenderColor mask_c;
537 560

Diff Legend

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