… | |
… | |
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) |
… | |
… | |
209 | rxvt_img::unshare () |
211 | rxvt_img::unshare () |
210 | { |
212 | { |
211 | if (ref->cnt == 1 && ref->ours) |
213 | if (ref->cnt == 1 && ref->ours) |
212 | return; |
214 | return; |
213 | |
215 | |
214 | //TODO: maybe should reify instead |
|
|
215 | Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); |
216 | Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); |
216 | GC gc = XCreateGC (s->display->dpy, pm, 0, 0); |
217 | GC gc = XCreateGC (s->display->dpy, pm, 0, 0); |
217 | XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); |
218 | XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); |
218 | XFreeGC (s->display->dpy, gc); |
219 | XFreeGC (s->display->dpy, gc); |
219 | |
220 | |
… | |
… | |
315 | XRenderFreePicture (dpy, tmp); |
316 | XRenderFreePicture (dpy, tmp); |
316 | |
317 | |
317 | return img; |
318 | return img; |
318 | } |
319 | } |
319 | |
320 | |
320 | static Picture |
321 | static void |
321 | create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) |
322 | extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) |
322 | { |
323 | { |
323 | Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); |
324 | int32_t x = clamp (c, cl0, cl1); |
|
|
325 | c -= x; |
|
|
326 | xc = x; |
|
|
327 | } |
324 | |
328 | |
325 | XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); |
329 | static bool |
326 | XRenderPictureAttributes pa; |
330 | 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) |
327 | pa.repeat = True; |
331 | { |
328 | Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); |
332 | extract (cl0, cl1, r, xr); |
|
|
333 | extract (cl0, cl1, g, xg); |
|
|
334 | extract (cl0, cl1, b, xb); |
|
|
335 | extract (cl0, cl1, a, xa); |
329 | |
336 | |
330 | XFreePixmap (dpy, pixmap); |
337 | return xr | xg | xb | xa; |
331 | |
|
|
332 | return mask; |
|
|
333 | } |
338 | } |
334 | |
339 | |
335 | void |
340 | void |
336 | rxvt_img::brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a) |
341 | rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a) |
337 | { |
342 | { |
|
|
343 | unshare (); |
|
|
344 | |
338 | Display *dpy = s->display->dpy; |
345 | Display *dpy = s->display->dpy; |
339 | Picture src = create_xrender_mask (dpy, pm, True); |
346 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
|
|
347 | |
|
|
348 | // loop should not be needed for brightness, as only -1..1 makes sense |
|
|
349 | //while (r | g | b | a) |
|
|
350 | { |
|
|
351 | unsigned short xr, xg, xb, xa; |
|
|
352 | XRenderColor mask_c; |
|
|
353 | |
|
|
354 | if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
|
|
355 | XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); |
|
|
356 | |
|
|
357 | if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
|
|
358 | { |
|
|
359 | XRenderColor mask_w = { 65535, 65535, 65535, 65535 }; |
|
|
360 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
|
|
361 | mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing |
|
|
362 | mask_c.green = -mask_c.green; |
|
|
363 | mask_c.blue = -mask_c.blue; |
|
|
364 | mask_c.alpha = -mask_c.alpha; |
|
|
365 | XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); |
|
|
366 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
|
|
367 | } |
|
|
368 | } |
|
|
369 | |
|
|
370 | |
|
|
371 | XRenderFreePicture (dpy, dst); |
|
|
372 | } |
|
|
373 | |
|
|
374 | void |
|
|
375 | rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) |
|
|
376 | { |
|
|
377 | if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) |
|
|
378 | { |
|
|
379 | rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n"); |
|
|
380 | return; |
|
|
381 | } |
|
|
382 | |
|
|
383 | unshare (); |
|
|
384 | |
|
|
385 | Display *dpy = s->display->dpy; |
340 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
386 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
341 | |
387 | |
342 | XRenderColor mask_c; |
388 | XRenderColor mask_c; |
343 | mask_c.red = r; |
389 | mask_c.red = r; |
344 | mask_c.green = g; |
390 | mask_c.green = g; |
345 | mask_c.blue = b; |
391 | mask_c.blue = b; |
346 | mask_c.alpha = a; |
392 | mask_c.alpha = a; |
347 | XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); |
393 | XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h); |
348 | |
394 | |
349 | XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
350 | |
|
|
351 | XRenderFreePicture (dpy, src); |
|
|
352 | XRenderFreePicture (dpy, dst); |
|
|
353 | } |
|
|
354 | |
|
|
355 | void |
|
|
356 | rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a) |
|
|
357 | { |
|
|
358 | if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) |
|
|
359 | { |
|
|
360 | rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n"); |
|
|
361 | return; |
|
|
362 | } |
|
|
363 | |
|
|
364 | Display *dpy = s->display->dpy; |
|
|
365 | Picture src = create_xrender_mask (dpy, pm, True); |
|
|
366 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
|
|
367 | |
|
|
368 | XRenderColor mask_c; |
|
|
369 | mask_c.red = r; |
|
|
370 | mask_c.green = g; |
|
|
371 | mask_c.blue = b; |
|
|
372 | mask_c.alpha = a; |
|
|
373 | XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); |
|
|
374 | |
|
|
375 | XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
376 | |
|
|
377 | XRenderFreePicture (dpy, src); |
|
|
378 | XRenderFreePicture (dpy, dst); |
395 | XRenderFreePicture (dpy, dst); |
379 | } |
396 | } |
380 | |
397 | |
381 | rxvt_img * |
398 | rxvt_img * |
382 | rxvt_img::clone () |
399 | rxvt_img::clone () |
… | |
… | |
473 | |
490 | |
474 | for (int i = 0; i < 3; ++i) |
491 | for (int i = 0; i < 3; ++i) |
475 | for (int j = 0; j < 3; ++j) |
492 | for (int j = 0; j < 3; ++j) |
476 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
493 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
477 | |
494 | |
478 | #if 0 |
|
|
479 | xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO |
495 | xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO |
480 | xfrm.matrix [1][2] -= XDoubleToFixed (y); |
496 | xfrm.matrix [1][2] -= XDoubleToFixed (y); |
481 | #endif |
|
|
482 | |
497 | |
483 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
498 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
484 | XRenderSetPictureTransform (dpy, src, &xfrm); |
499 | XRenderSetPictureTransform (dpy, src, &xfrm); |
485 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
500 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
486 | |
501 | |
… | |
… | |
567 | { |
582 | { |
568 | rxvt_img *img2 = clone (); |
583 | rxvt_img *img2 = clone (); |
569 | Display *dpy = s->display->dpy; |
584 | Display *dpy = s->display->dpy; |
570 | Picture src = img->src_picture (); |
585 | Picture src = img->src_picture (); |
571 | Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); |
586 | Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); |
572 | Picture mask = create_xrender_mask (dpy, img->pm, False); |
587 | |
|
|
588 | Pixmap pixmap = XCreatePixmap (dpy, img->pm, 1, 1, 8); |
|
|
589 | XRenderPictFormat *format = XRenderFindStandardFormat (dpy, PictStandardA8); |
|
|
590 | XRenderPictureAttributes pa; |
|
|
591 | pa.repeat = True; |
|
|
592 | Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); |
|
|
593 | XFreePixmap (dpy, pixmap); |
573 | |
594 | |
574 | XRenderColor mask_c; |
595 | XRenderColor mask_c; |
575 | |
596 | |
576 | mask_c.alpha = float_to_component (factor); |
597 | mask_c.alpha = float_to_component (factor); |
577 | mask_c.red = |
598 | mask_c.red = |