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.35 by root, Thu Jun 7 08:36:53 2012 UTC vs.
Revision 1.43 by sf-exg, Thu Jun 7 13:02:50 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)
… …
114 114
115 XRenderPictureAttributes pa; 115 XRenderPictureAttributes pa;
116 pa.repeat = repeat; 116 pa.repeat = repeat;
117 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 117 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
118 118
119 XRectangle clip = { -x, -y, min (w, ref->w), min (h, ref->h) };
120 XRenderSetPictureClipRectangles (dpy, pic, 0, 0, &clip, 1);
121
122 return pic; 119 return pic;
123} 120}
124 121
125void 122void
126rxvt_img::unshare () 123rxvt_img::unshare ()
… …
179 176
180 Display *dpy = s->display->dpy; 177 Display *dpy = s->display->dpy;
181 int size = max (rh, rv) * 2 + 1; 178 int size = max (rh, rv) * 2 + 1;
182 double *kernel = (double *)malloc (size * sizeof (double)); 179 double *kernel = (double *)malloc (size * sizeof (double));
183 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 180 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
184 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);
185 img->alloc (); 182 img->alloc ();
186 183
187 Picture src = src_picture (); 184 Picture src = src_picture ();
188 185
189 XRenderPictureAttributes pa; 186 XRenderPictureAttributes pa;
… …
400rxvt_img::reify () 397rxvt_img::reify ()
401{ 398{
402 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 399 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
403 return clone (); 400 return clone ();
404 401
405 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);
406 img->alloc (); 409 img->alloc ();
407
408 Display *dpy = s->display->dpy;
409 410
410 Picture src = src_picture (); 411 Picture src = src_picture ();
411 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 412 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
412 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
413 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);
414 422
415 XRenderFreePicture (dpy, src); 423 XRenderFreePicture (dpy, src);
416 XRenderFreePicture (dpy, dst); 424 XRenderFreePicture (dpy, dst);
417 425
418 return img; 426 return img;
419} 427}
420 428
421rxvt_img * 429rxvt_img *
422rxvt_img::sub_rect (int x, int y, int width, int height) 430rxvt_img::sub_rect (int x, int y, int width, int height)
423{ 431{
424 rxvt_img *img = clone (); 432 rxvt_img *img = clone ();
425
426 //TODO: width > w, must reify
427 433
428 img->x += x; 434 img->x += x;
429 img->y += y; 435 img->y += y;
436
437 if (w != width || h != height)
438 {
430 img->w = width; 439 img->w = width;
431 img->h = height; 440 img->h = height;
441
442 rxvt_img *img2 = img->reify ();
443 delete img;
444 img = img2;
445 }
432 446
433 return img; 447 return img;
434} 448}
435 449
436rxvt_img * 450rxvt_img *
437rxvt_img::transform (int new_width, int new_height, double matrix[9]) 451rxvt_img::transform (int new_width, int new_height, double matrix[9])
438{ 452{
439 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);
440 img->alloc (); 454 img->alloc ();
441 455
442 Display *dpy = s->display->dpy; 456 Display *dpy = s->display->dpy;
443 Picture src = src_picture (); 457 Picture src = src_picture ();
444 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 458 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
… …
463} 477}
464 478
465rxvt_img * 479rxvt_img *
466rxvt_img::scale (int new_width, int new_height) 480rxvt_img::scale (int new_width, int new_height)
467{ 481{
482 if (w == new_width && h == new_height)
483 return clone ();
484
468 double matrix[9] = { 485 double matrix[9] = {
469 w / (double)new_width, 0, 0, 486 w / (double)new_width, 0, 0,
470 0, h / (double)new_height, 0, 487 0, h / (double)new_height, 0,
471 0, 0, 1 488 0, 0, 1
472 }; 489 };
473 490
491 int old_repeat_mode = repeat;
492 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
493
474 return transform (new_width, new_height, matrix); 494 rxvt_img *img = transform (new_width, new_height, matrix);
495
496 repeat = old_repeat_mode;
497 img->repeat = repeat;
498
499 return img;
475} 500}
476 501
477rxvt_img * 502rxvt_img *
478rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 503rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
479{ 504{
… …
493rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 518rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
494{ 519{
495 if (new_format == format) 520 if (new_format == format)
496 return clone (); 521 return clone ();
497 522
498 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h); 523 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h, repeat);
499 img->alloc (); 524 img->alloc ();
525
526 printf ("convert %d to %d\n", format->direct.alphaMask, new_format->direct.alphaMask);//D
500 527
501 Display *dpy = s->display->dpy; 528 Display *dpy = s->display->dpy;
502 Picture src = src_picture (); 529 Picture src = src_picture ();
503 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 530 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
504 int op = PictOpSrc; 531 int op = PictOpSrc;
… …
526rxvt_img * 553rxvt_img *
527rxvt_img::blend (rxvt_img *img, double factor) 554rxvt_img::blend (rxvt_img *img, double factor)
528{ 555{
529 rxvt_img *img2 = clone (); 556 rxvt_img *img2 = clone ();
530 Display *dpy = s->display->dpy; 557 Display *dpy = s->display->dpy;
531 Picture src = src_picture (); 558 Picture src = img->src_picture ();
532 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 559 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
533 Picture mask = create_xrender_mask (dpy, img->pm, False); 560 Picture mask = create_xrender_mask (dpy, img->pm, False);
534 561
535 XRenderColor mask_c; 562 XRenderColor mask_c;
536 563

Diff Legend

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