| … | |
… | |
| 209 | rxvt_img::unshare () |
209 | rxvt_img::unshare () |
| 210 | { |
210 | { |
| 211 | if (ref->cnt == 1 && ref->ours) |
211 | if (ref->cnt == 1 && ref->ours) |
| 212 | return; |
212 | return; |
| 213 | |
213 | |
| 214 | //TODO: maybe should reify instead |
|
|
| 215 | Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); |
214 | 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); |
215 | 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); |
216 | XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); |
| 218 | XFreeGC (s->display->dpy, gc); |
217 | XFreeGC (s->display->dpy, gc); |
| 219 | |
218 | |
| … | |
… | |
| 330 | XFreePixmap (dpy, pixmap); |
329 | XFreePixmap (dpy, pixmap); |
| 331 | |
330 | |
| 332 | return mask; |
331 | return mask; |
| 333 | } |
332 | } |
| 334 | |
333 | |
|
|
334 | static void |
|
|
335 | extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) |
|
|
336 | { |
|
|
337 | int32_t x = clamp (c, cl0, cl1); |
|
|
338 | c -= x; |
|
|
339 | xc = x; |
|
|
340 | } |
|
|
341 | |
|
|
342 | static bool |
|
|
343 | 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) |
|
|
344 | { |
|
|
345 | extract (cl0, cl1, r, xr); |
|
|
346 | extract (cl0, cl1, g, xg); |
|
|
347 | extract (cl0, cl1, b, xb); |
|
|
348 | extract (cl0, cl1, a, xa); |
|
|
349 | |
|
|
350 | return xr | xg | xb | xa; |
|
|
351 | } |
|
|
352 | |
| 335 | void |
353 | void |
| 336 | rxvt_img::brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a) |
354 | rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a) |
| 337 | { |
355 | { |
|
|
356 | unshare (); |
|
|
357 | |
| 338 | Display *dpy = s->display->dpy; |
358 | Display *dpy = s->display->dpy; |
| 339 | Picture src = create_xrender_mask (dpy, pm, True); |
|
|
| 340 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
359 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
| 341 | |
360 | |
|
|
361 | // loop should not be needed for brightness, as only -1..1 makes sense |
|
|
362 | //while (r | g | b | a) |
|
|
363 | { |
|
|
364 | unsigned short xr, xg, xb, xa; |
| 342 | XRenderColor mask_c; |
365 | XRenderColor mask_c; |
| 343 | mask_c.red = r; |
366 | |
| 344 | mask_c.green = g; |
367 | if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
| 345 | mask_c.blue = b; |
|
|
| 346 | mask_c.alpha = a; |
|
|
| 347 | XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); |
368 | XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); |
| 348 | |
369 | |
| 349 | XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
370 | if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
|
|
371 | { |
|
|
372 | XRenderColor mask_w = { 65535, 65535, 65535, 65535 }; |
|
|
373 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
|
|
374 | mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing |
|
|
375 | mask_c.green = -mask_c.green; |
|
|
376 | mask_c.blue = -mask_c.blue; |
|
|
377 | mask_c.alpha = -mask_c.alpha; |
|
|
378 | XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); |
|
|
379 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
|
|
380 | } |
|
|
381 | } |
| 350 | |
382 | |
| 351 | XRenderFreePicture (dpy, src); |
383 | |
| 352 | XRenderFreePicture (dpy, dst); |
384 | XRenderFreePicture (dpy, dst); |
| 353 | } |
385 | } |
| 354 | |
386 | |
| 355 | void |
387 | void |
| 356 | rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a) |
388 | rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) |
| 357 | { |
389 | { |
| 358 | if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) |
390 | if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) |
|
|
391 | { |
|
|
392 | rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n"); |
| 359 | return; |
393 | return; |
|
|
394 | } |
|
|
395 | |
|
|
396 | unshare (); |
| 360 | |
397 | |
| 361 | Display *dpy = s->display->dpy; |
398 | Display *dpy = s->display->dpy; |
| 362 | Picture src = create_xrender_mask (dpy, pm, True); |
399 | Picture src = create_xrender_mask (dpy, pm, True); |
| 363 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
400 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
| 364 | |
401 | |
| … | |
… | |
| 470 | |
507 | |
| 471 | for (int i = 0; i < 3; ++i) |
508 | for (int i = 0; i < 3; ++i) |
| 472 | for (int j = 0; j < 3; ++j) |
509 | for (int j = 0; j < 3; ++j) |
| 473 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
510 | xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); |
| 474 | |
511 | |
| 475 | #if 0 |
|
|
| 476 | xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO |
512 | xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO |
| 477 | xfrm.matrix [1][2] -= XDoubleToFixed (y); |
513 | xfrm.matrix [1][2] -= XDoubleToFixed (y); |
| 478 | #endif |
|
|
| 479 | |
514 | |
| 480 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
515 | XRenderSetPictureFilter (dpy, src, "good", 0, 0); |
| 481 | XRenderSetPictureTransform (dpy, src, &xfrm); |
516 | XRenderSetPictureTransform (dpy, src, &xfrm); |
| 482 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
517 | XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); |
| 483 | |
518 | |
