… | |
… | |
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 | |
7 | rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height) |
7 | rxvt_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 | |
13 | rxvt_img::rxvt_img (const rxvt_img &img) |
13 | rxvt_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; |
… | |
… | |
397 | rxvt_img::reify () |
397 | rxvt_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);//TODO: split into four fillrectangles |
|
|
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 | |
437 | rxvt_img * |
450 | rxvt_img * |
438 | rxvt_img::transform (int new_width, int new_height, double matrix[9]) |
451 | rxvt_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); |
… | |
… | |
448 | |
461 | |
449 | for (int i = 0; i < 3; ++i) |
462 | for (int i = 0; i < 3; ++i) |
450 | for (int j = 0; j < 3; ++j) |
463 | for (int j = 0; j < 3; ++j) |
451 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
464 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
452 | |
465 | |
|
|
466 | #if 0 |
453 | xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO |
467 | xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO |
454 | xfrm.matrix [0][3] += XDoubleToFixed (y); |
468 | xfrm.matrix [1][2] -= XDoubleToFixed (y); |
|
|
469 | #endif |
455 | |
470 | |
456 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
471 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
457 | XRenderSetPictureTransform (dpy, src, &xfrm); |
472 | XRenderSetPictureTransform (dpy, src, &xfrm); |
458 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
473 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
459 | |
474 | |
… | |
… | |
464 | } |
479 | } |
465 | |
480 | |
466 | rxvt_img * |
481 | rxvt_img * |
467 | rxvt_img::scale (int new_width, int new_height) |
482 | rxvt_img::scale (int new_width, int new_height) |
468 | { |
483 | { |
|
|
484 | if (w == new_width && h == new_height) |
|
|
485 | return clone (); |
|
|
486 | |
469 | double matrix[9] = { |
487 | double matrix[9] = { |
470 | w / (double)new_width, 0, 0, |
488 | w / (double)new_width, 0, 0, |
471 | 0, h / (double)new_height, 0, |
489 | 0, h / (double)new_height, 0, |
472 | 0, 0, 1 |
490 | 0, 0, 1 |
473 | }; |
491 | }; |
474 | |
492 | |
|
|
493 | int old_repeat_mode = repeat; |
|
|
494 | repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems |
|
|
495 | |
475 | return transform (new_width, new_height, matrix); |
496 | rxvt_img *img = transform (new_width, new_height, matrix); |
|
|
497 | |
|
|
498 | repeat = old_repeat_mode; |
|
|
499 | img->repeat = repeat; |
|
|
500 | |
|
|
501 | return img; |
476 | } |
502 | } |
477 | |
503 | |
478 | rxvt_img * |
504 | rxvt_img * |
479 | rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) |
505 | rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) |
480 | { |
506 | { |
… | |
… | |
494 | rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) |
520 | rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) |
495 | { |
521 | { |
496 | if (new_format == format) |
522 | if (new_format == format) |
497 | return clone (); |
523 | return clone (); |
498 | |
524 | |
499 | rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h); |
525 | rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h, repeat); |
500 | img->alloc (); |
526 | img->alloc (); |
501 | |
527 | |
502 | Display *dpy = s->display->dpy; |
528 | Display *dpy = s->display->dpy; |
503 | Picture src = src_picture (); |
529 | Picture src = src_picture (); |
504 | Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); |
530 | Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); |