1 | #include <math.h> |
1 | #include <math.h> |
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 | |
|
|
7 | #if 0 |
|
|
8 | struct pict |
|
|
9 | { |
|
|
10 | Display *dpy; |
|
|
11 | Picture pic; |
|
|
12 | |
|
|
13 | operator Picture () const |
|
|
14 | { |
|
|
15 | return pic; |
|
|
16 | } |
|
|
17 | |
|
|
18 | pict () |
|
|
19 | : pic (0) |
|
|
20 | { |
|
|
21 | } |
|
|
22 | |
|
|
23 | pict (rxvt_img *img, XRenderPictFormat *format = 0) |
|
|
24 | : dpy (img->s->display->dpy) |
|
|
25 | { |
|
|
26 | XRenderPictureAttributes pa; |
|
|
27 | pa.repeat = img->repeat; |
|
|
28 | pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa); |
|
|
29 | } |
|
|
30 | |
|
|
31 | ~pict () |
|
|
32 | { |
|
|
33 | if (pic) |
|
|
34 | XRenderFreePicture (dpy, pic); |
|
|
35 | } |
|
|
36 | }; |
|
|
37 | #endif |
|
|
38 | |
|
|
39 | static XRenderPictFormat * |
|
|
40 | find_alpha_format_for (Display *dpy, XRenderPictFormat *format) |
|
|
41 | { |
|
|
42 | if (format->direct.alphaMask) |
|
|
43 | return format; // already has alpha |
|
|
44 | |
|
|
45 | // try to find a suitable alpha format, one bit alpha is enough for our purposes |
|
|
46 | if (format->type == PictTypeDirect) |
|
|
47 | for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n) |
|
|
48 | if (f->direct.alphaMask |
|
|
49 | && f->type == PictTypeDirect |
|
|
50 | && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask ) |
|
|
51 | && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask) |
|
|
52 | && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask )) |
|
|
53 | return f; |
|
|
54 | |
|
|
55 | // should be a very good fallback |
|
|
56 | return XRenderFindStandardFormat (dpy, PictStandardARGB32); |
|
|
57 | } |
6 | |
58 | |
7 | rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat) |
59 | 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(repeat), |
60 | : s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat), |
9 | pm(0), ref(0) |
61 | pm(0), ref(0) |
10 | { |
62 | { |
… | |
… | |
50 | |
102 | |
51 | return img; |
103 | return img; |
52 | } |
104 | } |
53 | |
105 | |
54 | # if HAVE_PIXBUF |
106 | # if HAVE_PIXBUF |
|
|
107 | |
55 | rxvt_img * |
108 | rxvt_img * |
56 | rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) |
109 | rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) |
57 | { |
110 | { |
58 | Display *dpy = s->display->dpy; |
111 | Display *dpy = s->display->dpy; |
59 | |
112 | |
… | |
… | |
166 | |
219 | |
167 | g_object_unref (pb); |
220 | g_object_unref (pb); |
168 | |
221 | |
169 | return img; |
222 | return img; |
170 | } |
223 | } |
|
|
224 | |
171 | # endif |
225 | # endif |
172 | |
226 | |
173 | void |
227 | void |
174 | rxvt_img::destroy () |
228 | rxvt_img::destroy () |
175 | { |
229 | { |
… | |
… | |
193 | pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); |
247 | pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); |
194 | ref = new pixref (w, h); |
248 | ref = new pixref (w, h); |
195 | } |
249 | } |
196 | |
250 | |
197 | Picture |
251 | Picture |
198 | rxvt_img::src_picture () |
252 | rxvt_img::picture () |
199 | { |
253 | { |
200 | Display *dpy = s->display->dpy; |
254 | Display *dpy = s->display->dpy; |
201 | |
255 | |
202 | XRenderPictureAttributes pa; |
256 | XRenderPictureAttributes pa; |
203 | pa.repeat = repeat; |
257 | pa.repeat = repeat; |
… | |
… | |
222 | pm = pm2; |
276 | pm = pm2; |
223 | ref = new pixref (ref->w, ref->h); |
277 | ref = new pixref (ref->w, ref->h); |
224 | } |
278 | } |
225 | |
279 | |
226 | void |
280 | void |
227 | rxvt_img::fill (const rxvt_color &c) |
281 | rxvt_img::fill (const rgba &c) |
228 | { |
282 | { |
229 | XGCValues gcv; |
283 | XRenderColor rc = { c.r, c.g, c.b, c.a }; |
230 | gcv.foreground = c; |
284 | |
231 | GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); |
285 | Display *dpy = s->display->dpy; |
232 | XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); |
286 | Picture src = picture (); |
233 | XFreeGC (s->display->dpy, gc); |
287 | XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h); |
|
|
288 | XRenderFreePicture (dpy, src); |
|
|
289 | } |
|
|
290 | |
|
|
291 | void |
|
|
292 | rxvt_img::add_alpha () |
|
|
293 | { |
|
|
294 | if (format->direct.alphaMask) |
|
|
295 | return; |
|
|
296 | |
|
|
297 | Display *dpy = s->display->dpy; |
|
|
298 | |
|
|
299 | rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat); |
|
|
300 | img->alloc (); |
|
|
301 | |
|
|
302 | Picture src = picture (); |
|
|
303 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
|
|
304 | |
|
|
305 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
306 | |
|
|
307 | XRenderFreePicture (dpy, src); |
|
|
308 | XRenderFreePicture (dpy, dst); |
|
|
309 | |
|
|
310 | ::swap (img->ref, ref); |
|
|
311 | ::swap (img->pm , pm ); |
|
|
312 | |
|
|
313 | delete img; |
234 | } |
314 | } |
235 | |
315 | |
236 | static void |
316 | static void |
237 | get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) |
317 | get_gaussian_kernel (int radius, int width, rxvt_img::nv *kernel, XFixed *params) |
238 | { |
318 | { |
239 | double sigma = radius / 2.0; |
319 | rxvt_img::nv sigma = radius / 2.0; |
240 | double scale = sqrt (2.0 * M_PI) * sigma; |
320 | rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma; |
241 | double sum = 0.0; |
321 | rxvt_img::nv sum = 0.0; |
242 | |
322 | |
243 | for (int i = 0; i < width; i++) |
323 | for (int i = 0; i < width; i++) |
244 | { |
324 | { |
245 | double x = i - width / 2; |
325 | rxvt_img::nv x = i - width / 2; |
246 | kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; |
326 | kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; |
247 | sum += kernel[i]; |
327 | sum += kernel[i]; |
248 | } |
328 | } |
249 | |
329 | |
250 | params[0] = XDoubleToFixed (width); |
330 | params[0] = XDoubleToFixed (width); |
… | |
… | |
260 | if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) |
340 | if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) |
261 | return clone (); |
341 | return clone (); |
262 | |
342 | |
263 | Display *dpy = s->display->dpy; |
343 | Display *dpy = s->display->dpy; |
264 | int size = max (rh, rv) * 2 + 1; |
344 | int size = max (rh, rv) * 2 + 1; |
265 | double *kernel = (double *)malloc (size * sizeof (double)); |
345 | nv *kernel = (nv *)malloc (size * sizeof (nv)); |
266 | XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); |
346 | XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); |
267 | rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); |
347 | rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); |
268 | img->alloc (); |
348 | img->alloc (); |
269 | |
349 | |
270 | XRenderPictureAttributes pa; |
350 | XRenderPictureAttributes pa; |
… | |
… | |
308 | w, h); |
388 | w, h); |
309 | } |
389 | } |
310 | |
390 | |
311 | free (kernel); |
391 | free (kernel); |
312 | free (params); |
392 | free (params); |
|
|
393 | |
313 | XRenderFreePicture (dpy, src); |
394 | XRenderFreePicture (dpy, src); |
314 | XRenderFreePicture (dpy, dst); |
395 | XRenderFreePicture (dpy, dst); |
315 | XRenderFreePicture (dpy, tmp); |
396 | XRenderFreePicture (dpy, tmp); |
316 | |
397 | |
317 | return img; |
398 | return img; |
… | |
… | |
391 | if (r < 0 || g < 0 || b < 0 || a < 0) |
472 | if (r < 0 || g < 0 || b < 0 || a < 0) |
392 | rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); |
473 | rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); |
393 | |
474 | |
394 | rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); |
475 | rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); |
395 | img->alloc (); |
476 | img->alloc (); |
396 | |
477 | img->fill (rgba (0, 0, 0, 0)); |
397 | { |
|
|
398 | rxvt_color empty; |
|
|
399 | empty.set (s, rgba (0, 0, 0, 0)); |
|
|
400 | img->fill (empty); |
|
|
401 | } |
|
|
402 | |
478 | |
403 | // premultiply (yeah, these are not exact, sue me or fix it) |
479 | // premultiply (yeah, these are not exact, sue me or fix it) |
404 | r = (r * (a >> 8)) >> 8; |
480 | r = (r * (a >> 8)) >> 8; |
405 | g = (g * (a >> 8)) >> 8; |
481 | g = (g * (a >> 8)) >> 8; |
406 | b = (b * (a >> 8)) >> 8; |
482 | b = (b * (a >> 8)) >> 8; |
407 | |
483 | |
408 | Display *dpy = s->display->dpy; |
484 | Display *dpy = s->display->dpy; |
409 | |
485 | |
410 | Picture src = src_picture (); |
486 | Picture src = picture (); |
411 | Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); |
487 | Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); |
412 | Picture mul = create_xrender_mask (dpy, pm, True, True); |
488 | Picture mul = create_xrender_mask (dpy, pm, True, True); |
413 | |
489 | |
414 | //TODO: this operator does not yet implement some useful contrast |
490 | //TODO: this operator does not yet implement some useful contrast |
415 | while (r | g | b | a) |
491 | while (r | g | b | a) |
… | |
… | |
432 | ::swap (img->pm , pm ); |
508 | ::swap (img->pm , pm ); |
433 | |
509 | |
434 | delete img; |
510 | delete img; |
435 | } |
511 | } |
436 | |
512 | |
|
|
513 | void |
|
|
514 | rxvt_img::draw (rxvt_img *img, int op, nv mask) |
|
|
515 | { |
|
|
516 | unshare (); |
|
|
517 | |
|
|
518 | Display *dpy = s->display->dpy; |
|
|
519 | Picture src = img->picture (); |
|
|
520 | Picture dst = picture (); |
|
|
521 | Picture mask_p = 0; |
|
|
522 | |
|
|
523 | if (mask != 1.) |
|
|
524 | { |
|
|
525 | mask_p = create_xrender_mask (dpy, img->pm, False, False); |
|
|
526 | XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) }; |
|
|
527 | XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); |
|
|
528 | } |
|
|
529 | |
|
|
530 | XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h); |
|
|
531 | |
|
|
532 | XRenderFreePicture (dpy, src); |
|
|
533 | XRenderFreePicture (dpy, dst); |
|
|
534 | |
|
|
535 | if (mask_p) |
|
|
536 | XRenderFreePicture (dpy, mask_p); |
|
|
537 | } |
|
|
538 | |
437 | rxvt_img * |
539 | rxvt_img * |
438 | rxvt_img::clone () |
540 | rxvt_img::clone () |
439 | { |
541 | { |
440 | return new rxvt_img (*this); |
542 | return new rxvt_img (*this); |
441 | } |
|
|
442 | |
|
|
443 | static XRenderPictFormat * |
|
|
444 | find_alpha_format_for (Display *dpy, XRenderPictFormat *format) |
|
|
445 | { |
|
|
446 | if (format->direct.alphaMask) |
|
|
447 | return format; // already has alpha |
|
|
448 | |
|
|
449 | // try to find a suitable alpha format, one bit alpha is enough for our purposes |
|
|
450 | if (format->type == PictTypeDirect) |
|
|
451 | for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n) |
|
|
452 | if (f->direct.alphaMask |
|
|
453 | && f->type == PictTypeDirect |
|
|
454 | && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask ) |
|
|
455 | && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask) |
|
|
456 | && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask )) |
|
|
457 | return f; |
|
|
458 | |
|
|
459 | // should be a very good fallback |
|
|
460 | return XRenderFindStandardFormat (dpy, PictStandardARGB32); |
|
|
461 | } |
543 | } |
462 | |
544 | |
463 | rxvt_img * |
545 | rxvt_img * |
464 | rxvt_img::reify () |
546 | rxvt_img::reify () |
465 | { |
547 | { |
… | |
… | |
474 | && repeat == RepeatNone; // and we have no good pixels to fill with |
556 | && repeat == RepeatNone; // and we have no good pixels to fill with |
475 | |
557 | |
476 | rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); |
558 | rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); |
477 | img->alloc (); |
559 | img->alloc (); |
478 | |
560 | |
479 | Picture src = src_picture (); |
561 | Picture src = picture (); |
480 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
562 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
481 | |
563 | |
482 | if (alpha) |
564 | if (alpha) |
483 | { |
565 | { |
484 | XRenderColor rc = { 0, 0, 0, 0 }; |
566 | XRenderColor rc = { 0, 0, 0, 0 }; |
485 | XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles |
567 | XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles |
486 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); |
568 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h); |
487 | } |
569 | } |
488 | else |
570 | else |
489 | XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); |
571 | XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h); |
490 | |
572 | |
491 | XRenderFreePicture (dpy, src); |
573 | XRenderFreePicture (dpy, src); |
492 | XRenderFreePicture (dpy, dst); |
574 | XRenderFreePicture (dpy, dst); |
493 | |
575 | |
494 | return img; |
576 | return img; |
… | |
… | |
497 | rxvt_img * |
579 | rxvt_img * |
498 | rxvt_img::sub_rect (int x, int y, int width, int height) |
580 | rxvt_img::sub_rect (int x, int y, int width, int height) |
499 | { |
581 | { |
500 | rxvt_img *img = clone (); |
582 | rxvt_img *img = clone (); |
501 | |
583 | |
502 | img->x += x; |
584 | img->x -= x; |
503 | img->y += y; |
585 | img->y -= y; |
504 | |
586 | |
505 | if (w != width || h != height) |
587 | if (w != width || h != height) |
506 | { |
588 | { |
507 | img->w = width; |
589 | img->w = width; |
508 | img->h = height; |
590 | img->h = height; |
… | |
… | |
513 | } |
595 | } |
514 | |
596 | |
515 | return img; |
597 | return img; |
516 | } |
598 | } |
517 | |
599 | |
518 | rxvt_img * |
600 | static void |
519 | rxvt_img::transform (int new_width, int new_height, double matrix[9]) |
601 | mat_invert (rxvt_img::nv mat[3][3], rxvt_img::nv (&inv)[3][3]) |
520 | { |
602 | { |
|
|
603 | rxvt_img::nv s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2]; |
|
|
604 | rxvt_img::nv s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1]; |
|
|
605 | rxvt_img::nv s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2]; |
|
|
606 | |
|
|
607 | rxvt_img::nv invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2); |
|
|
608 | |
|
|
609 | inv [0][0] = invdet * s0; |
|
|
610 | inv [0][1] = invdet * s1; |
|
|
611 | inv [0][2] = invdet * s2; |
|
|
612 | |
|
|
613 | inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]); |
|
|
614 | inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]); |
|
|
615 | inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]); |
|
|
616 | |
|
|
617 | inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]); |
|
|
618 | inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]); |
|
|
619 | inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]); |
|
|
620 | } |
|
|
621 | |
|
|
622 | static rxvt_img::nv |
|
|
623 | mat_apply (rxvt_img::nv mat[3][3], int i, rxvt_img::nv x, rxvt_img::nv y) |
|
|
624 | { |
|
|
625 | rxvt_img::nv v = mat [i][0] * x + mat [i][1] * y + mat [i][2]; |
|
|
626 | rxvt_img::nv w = mat [2][0] * x + mat [2][1] * y + mat [2][2]; |
|
|
627 | |
|
|
628 | return v * (1. / w); |
|
|
629 | } |
|
|
630 | |
|
|
631 | rxvt_img * |
|
|
632 | rxvt_img::transform (nv matrix[3][3]) |
|
|
633 | { |
|
|
634 | // find new offset |
|
|
635 | int ox = mat_apply (matrix, 0, x, y); |
|
|
636 | int oy = mat_apply (matrix, 1, x, y); |
|
|
637 | |
|
|
638 | // calculate new pixel bounding box coordinates |
|
|
639 | nv d [2], rmin[2], rmax[2]; |
|
|
640 | |
|
|
641 | for (int i = 0; i < 2; ++i) |
|
|
642 | { |
|
|
643 | nv v; |
|
|
644 | v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v; |
|
|
645 | v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v); |
|
|
646 | v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v); |
|
|
647 | v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v); |
|
|
648 | } |
|
|
649 | |
|
|
650 | int dx = floor (rmin [0]); |
|
|
651 | int dy = floor (rmin [1]); |
|
|
652 | |
|
|
653 | int new_width = ceil (rmax [0] - dx); |
|
|
654 | int new_height = ceil (rmax [1] - dy); |
|
|
655 | |
|
|
656 | nv inv[3][3]; |
|
|
657 | mat_invert (matrix, inv); |
|
|
658 | |
521 | rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); |
659 | rxvt_img *img = new rxvt_img (s, format, dx + d [0] - ox, dy + d [1] - oy, new_width, new_height, repeat); |
522 | img->alloc (); |
660 | img->alloc (); |
523 | |
661 | |
524 | Display *dpy = s->display->dpy; |
662 | Display *dpy = s->display->dpy; |
525 | Picture src = src_picture (); |
663 | Picture src = picture (); |
526 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
664 | Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); |
527 | |
665 | |
528 | XTransform xfrm; |
666 | XTransform xfrm; |
529 | |
667 | |
530 | for (int i = 0; i < 3; ++i) |
668 | for (int i = 0; i < 3; ++i) |
531 | for (int j = 0; j < 3; ++j) |
669 | for (int j = 0; j < 3; ++j) |
532 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
670 | 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 | |
671 | |
537 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
672 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
538 | XRenderSetPictureTransform (dpy, src, &xfrm); |
673 | XRenderSetPictureTransform (dpy, src, &xfrm); |
539 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
674 | XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height); |
540 | |
675 | |
541 | XRenderFreePicture (dpy, src); |
676 | XRenderFreePicture (dpy, src); |
542 | XRenderFreePicture (dpy, dst); |
677 | XRenderFreePicture (dpy, dst); |
543 | |
678 | |
544 | return img; |
679 | return img; |
… | |
… | |
548 | rxvt_img::scale (int new_width, int new_height) |
683 | rxvt_img::scale (int new_width, int new_height) |
549 | { |
684 | { |
550 | if (w == new_width && h == new_height) |
685 | if (w == new_width && h == new_height) |
551 | return clone (); |
686 | return clone (); |
552 | |
687 | |
553 | double matrix[9] = { |
688 | nv matrix[3][3] = { |
554 | w / (double)new_width, 0, 0, |
689 | { new_width / (nv)w, 0, 0 }, |
555 | 0, h / (double)new_height, 0, |
690 | { 0, new_height / (nv)h, 0 }, |
556 | 0, 0, 1 |
691 | { 0, 0, 1 } |
557 | }; |
692 | }; |
558 | |
693 | |
559 | int old_repeat_mode = repeat; |
694 | int old_repeat_mode = repeat; |
560 | repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems |
695 | repeat = RepeatPad; // not right, but xrender can't properly scale it seems |
561 | |
696 | |
562 | rxvt_img *img = transform (new_width, new_height, matrix); |
697 | rxvt_img *img = transform (matrix); |
563 | |
698 | |
564 | repeat = old_repeat_mode; |
699 | repeat = old_repeat_mode; |
565 | img->repeat = repeat; |
700 | img->repeat = repeat; |
566 | |
701 | |
567 | return img; |
702 | return img; |
568 | } |
703 | } |
569 | |
704 | |
570 | rxvt_img * |
705 | rxvt_img * |
571 | rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) |
706 | rxvt_img::rotate (int cx, int cy, nv phi) |
572 | { |
707 | { |
573 | double s = sin (phi); |
708 | nv s = sin (phi); |
574 | double c = cos (phi); |
709 | nv c = cos (phi); |
575 | |
710 | |
576 | double matrix[9] = { |
711 | nv matrix[3][3] = { |
577 | c, -s, -c * x + s * y + x, |
712 | { c, -s, cx - c * cx + s * cy }, |
578 | s, c, -s * x - c * y + y, |
713 | { s, c, cy - s * cx - c * cy }, |
579 | 0, 0, 1 |
714 | { 0, 0, 1 } |
|
|
715 | //{ c, -s, 0 }, |
|
|
716 | //{ s, c, 0 }, |
|
|
717 | //{ 0, 0, 1 } |
580 | }; |
718 | }; |
581 | |
719 | |
582 | return transform (new_width, new_height, matrix); |
720 | //move (-cx, -cy); |
583 | } |
721 | rxvt_img *img = transform (matrix); |
|
|
722 | //move ( cx, cy); |
|
|
723 | //img->move (cx, cy); |
584 | |
724 | |
|
|
725 | return img; |
|
|
726 | } |
|
|
727 | |
585 | rxvt_img * |
728 | rxvt_img * |
586 | rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) |
729 | rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg) |
587 | { |
730 | { |
588 | if (new_format == format) |
731 | if (new_format == format) |
589 | return clone (); |
732 | return clone (); |
590 | |
733 | |
591 | rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); |
734 | rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); |
592 | img->alloc (); |
735 | img->alloc (); |
593 | |
736 | |
594 | Display *dpy = s->display->dpy; |
737 | Display *dpy = s->display->dpy; |
595 | Picture src = src_picture (); |
738 | Picture src = picture (); |
596 | Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); |
739 | Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); |
597 | int op = PictOpSrc; |
740 | int op = PictOpSrc; |
598 | |
741 | |
599 | if (format->direct.alphaMask && !new_format->direct.alphaMask) |
742 | if (format->direct.alphaMask && !new_format->direct.alphaMask) |
600 | { |
743 | { |
601 | // does it have to be that complicated |
744 | // does it have to be that complicated |
602 | rgba c; |
|
|
603 | bg.get (c); |
|
|
604 | |
|
|
605 | XRenderColor rc = { c.r, c.g, c.b, 0xffff }; |
745 | XRenderColor rc = { bg.r, bg.g, bg.b, bg.a }; |
606 | XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); |
746 | XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); |
607 | |
747 | |
608 | op = PictOpOver; |
748 | op = PictOpOver; |
609 | } |
749 | } |
610 | |
750 | |
… | |
… | |
615 | |
755 | |
616 | return img; |
756 | return img; |
617 | } |
757 | } |
618 | |
758 | |
619 | rxvt_img * |
759 | rxvt_img * |
620 | rxvt_img::blend (rxvt_img *img, double factor) |
760 | rxvt_img::blend (rxvt_img *img, nv factor) |
621 | { |
761 | { |
622 | rxvt_img *img2 = clone (); |
762 | rxvt_img *img2 = clone (); |
623 | Display *dpy = s->display->dpy; |
763 | Display *dpy = s->display->dpy; |
624 | Picture src = img->src_picture (); |
764 | Picture src = img->picture (); |
625 | Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); |
765 | Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); |
626 | Picture mask = create_xrender_mask (dpy, img->pm, False, False); |
766 | Picture mask = create_xrender_mask (dpy, img->pm, False, False); |
627 | |
767 | |
628 | XRenderColor mask_c; |
768 | XRenderColor mask_c; |
629 | |
769 | |