… | |
… | |
49 | img->ref->ours = false; |
49 | img->ref->ours = false; |
50 | |
50 | |
51 | return img; |
51 | return img; |
52 | } |
52 | } |
53 | |
53 | |
|
|
54 | # if HAVE_PIXBUF |
54 | rxvt_img * |
55 | rxvt_img * |
55 | rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) |
56 | rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) |
56 | { |
57 | { |
57 | Display *dpy = s->display->dpy; |
58 | Display *dpy = s->display->dpy; |
58 | |
59 | |
… | |
… | |
166 | |
167 | |
167 | g_object_unref (pb); |
168 | g_object_unref (pb); |
168 | |
169 | |
169 | return img; |
170 | return img; |
170 | } |
171 | } |
|
|
172 | # endif |
171 | |
173 | |
172 | void |
174 | void |
173 | rxvt_img::destroy () |
175 | rxvt_img::destroy () |
174 | { |
176 | { |
175 | if (--ref->cnt) |
177 | if (--ref->cnt) |
… | |
… | |
321 | { |
323 | { |
322 | Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); |
324 | Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); |
323 | |
325 | |
324 | XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); |
326 | XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); |
325 | XRenderPictureAttributes pa; |
327 | XRenderPictureAttributes pa; |
326 | pa.repeat = True; |
328 | pa.repeat = RepeatNormal; |
327 | Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); |
329 | Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); |
328 | |
330 | |
329 | XFreePixmap (dpy, pixmap); |
331 | XFreePixmap (dpy, pixmap); |
330 | |
332 | |
331 | return mask; |
333 | return mask; |
332 | } |
334 | } |
333 | |
335 | |
|
|
336 | static void |
|
|
337 | extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) |
|
|
338 | { |
|
|
339 | int32_t x = clamp (c, cl0, cl1); |
|
|
340 | c -= x; |
|
|
341 | xc = x; |
|
|
342 | } |
|
|
343 | |
|
|
344 | static bool |
|
|
345 | extract (int32_t cl0, int32_t cl1, int32_t &r, int32_t &g, int32_t &b, int32_t &a, unsigned short &xr, unsigned short &xg, unsigned short &xb, unsigned short &xa) |
|
|
346 | { |
|
|
347 | extract (cl0, cl1, r, xr); |
|
|
348 | extract (cl0, cl1, g, xg); |
|
|
349 | extract (cl0, cl1, b, xb); |
|
|
350 | extract (cl0, cl1, a, xa); |
|
|
351 | |
|
|
352 | return xr | xg | xb | xa; |
|
|
353 | } |
|
|
354 | |
334 | void |
355 | void |
335 | rxvt_img::brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a) |
356 | rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a) |
336 | { |
357 | { |
|
|
358 | unshare (); |
|
|
359 | |
337 | Display *dpy = s->display->dpy; |
360 | Display *dpy = s->display->dpy; |
338 | Picture src = create_xrender_mask (dpy, pm, True); |
|
|
339 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
361 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
340 | |
362 | |
|
|
363 | // loop should not be needed for brightness, as only -1..1 makes sense |
|
|
364 | //while (r | g | b | a) |
|
|
365 | { |
|
|
366 | unsigned short xr, xg, xb, xa; |
341 | XRenderColor mask_c; |
367 | XRenderColor mask_c; |
342 | mask_c.red = r; |
368 | |
343 | mask_c.green = g; |
369 | if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
344 | mask_c.blue = b; |
370 | XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); |
345 | mask_c.alpha = a; |
371 | |
|
|
372 | if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
|
|
373 | { |
|
|
374 | XRenderColor mask_w = { 65535, 65535, 65535, 65535 }; |
|
|
375 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
|
|
376 | mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing |
|
|
377 | mask_c.green = -mask_c.green; |
|
|
378 | mask_c.blue = -mask_c.blue; |
|
|
379 | mask_c.alpha = -mask_c.alpha; |
|
|
380 | XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); |
|
|
381 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
|
|
382 | } |
|
|
383 | } |
|
|
384 | |
|
|
385 | XRenderFreePicture (dpy, dst); |
|
|
386 | } |
|
|
387 | |
|
|
388 | void |
|
|
389 | rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) |
|
|
390 | { |
|
|
391 | if (r < 0 || g < 0 || b < 0 || a < 0) |
|
|
392 | rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); |
|
|
393 | |
|
|
394 | rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); |
|
|
395 | img->alloc (); |
|
|
396 | |
|
|
397 | { |
|
|
398 | rxvt_color empty; |
|
|
399 | empty.set (s, rgba (0, 0, 0, 0)); |
|
|
400 | img->fill (empty); |
|
|
401 | } |
|
|
402 | |
|
|
403 | // premultiply (yeah, these are not exact, sue me or fix it) |
|
|
404 | r = (r * (a >> 8)) >> 8; |
|
|
405 | g = (g * (a >> 8)) >> 8; |
|
|
406 | b = (b * (a >> 8)) >> 8; |
|
|
407 | |
|
|
408 | Display *dpy = s->display->dpy; |
|
|
409 | |
|
|
410 | Picture src = src_picture (); |
|
|
411 | Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); |
|
|
412 | Picture mul = create_xrender_mask (dpy, pm, True); |
|
|
413 | |
|
|
414 | XRenderPictureAttributes pa; |
|
|
415 | pa.component_alpha = 1; |
|
|
416 | XRenderChangePicture (dpy, mul, CPComponentAlpha, &pa); |
|
|
417 | |
|
|
418 | //TODO: this operator does not yet implement some useful contrast |
|
|
419 | while (r | g | b | a) |
|
|
420 | { |
|
|
421 | unsigned short xr, xg, xb, xa; |
|
|
422 | XRenderColor mask_c; |
|
|
423 | |
|
|
424 | if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
|
|
425 | { |
346 | XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); |
426 | XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1); |
347 | |
|
|
348 | XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
427 | XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
428 | } |
|
|
429 | } |
349 | |
430 | |
|
|
431 | XRenderFreePicture (dpy, mul); |
|
|
432 | XRenderFreePicture (dpy, dst); |
350 | XRenderFreePicture (dpy, src); |
433 | XRenderFreePicture (dpy, src); |
351 | XRenderFreePicture (dpy, dst); |
|
|
352 | } |
|
|
353 | |
434 | |
354 | void |
435 | ::swap (img->ref, ref); |
355 | rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a) |
436 | ::swap (img->pm , pm ); |
356 | { |
|
|
357 | if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) |
|
|
358 | { |
|
|
359 | rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n"); |
|
|
360 | return; |
|
|
361 | } |
|
|
362 | |
437 | |
363 | Display *dpy = s->display->dpy; |
438 | delete img; |
364 | Picture src = create_xrender_mask (dpy, pm, True); |
|
|
365 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
|
|
366 | |
|
|
367 | XRenderColor mask_c; |
|
|
368 | mask_c.red = r; |
|
|
369 | mask_c.green = g; |
|
|
370 | mask_c.blue = b; |
|
|
371 | mask_c.alpha = a; |
|
|
372 | XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); |
|
|
373 | |
|
|
374 | XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
375 | |
|
|
376 | XRenderFreePicture (dpy, src); |
|
|
377 | XRenderFreePicture (dpy, dst); |
|
|
378 | } |
439 | } |
379 | |
440 | |
380 | rxvt_img * |
441 | rxvt_img * |
381 | rxvt_img::clone () |
442 | rxvt_img::clone () |
382 | { |
443 | { |
… | |
… | |
472 | |
533 | |
473 | for (int i = 0; i < 3; ++i) |
534 | for (int i = 0; i < 3; ++i) |
474 | for (int j = 0; j < 3; ++j) |
535 | for (int j = 0; j < 3; ++j) |
475 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
536 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
476 | |
537 | |
477 | #if 0 |
|
|
478 | xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO |
538 | xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO |
479 | xfrm.matrix [1][2] -= XDoubleToFixed (y); |
539 | xfrm.matrix [1][2] -= XDoubleToFixed (y); |
480 | #endif |
|
|
481 | |
540 | |
482 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
541 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
483 | XRenderSetPictureTransform (dpy, src, &xfrm); |
542 | XRenderSetPictureTransform (dpy, src, &xfrm); |
484 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
543 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
485 | |
544 | |
… | |
… | |
566 | { |
625 | { |
567 | rxvt_img *img2 = clone (); |
626 | rxvt_img *img2 = clone (); |
568 | Display *dpy = s->display->dpy; |
627 | Display *dpy = s->display->dpy; |
569 | Picture src = img->src_picture (); |
628 | Picture src = img->src_picture (); |
570 | Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); |
629 | Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); |
571 | Picture mask = create_xrender_mask (dpy, img->pm, False); |
630 | |
|
|
631 | Pixmap pixmap = XCreatePixmap (dpy, img->pm, 1, 1, 8); |
|
|
632 | XRenderPictFormat *format = XRenderFindStandardFormat (dpy, PictStandardA8); |
|
|
633 | XRenderPictureAttributes pa; |
|
|
634 | pa.repeat = True; |
|
|
635 | Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); |
|
|
636 | XFreePixmap (dpy, pixmap); |
572 | |
637 | |
573 | XRenderColor mask_c; |
638 | XRenderColor mask_c; |
574 | |
639 | |
575 | mask_c.alpha = float_to_component (factor); |
640 | mask_c.alpha = float_to_component (factor); |
576 | mask_c.red = |
641 | mask_c.red = |