| … | |
… | |
| 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; |
| … | |
… | |
| 357 | |
359 | |
| 358 | Display *dpy = s->display->dpy; |
360 | Display *dpy = s->display->dpy; |
| 359 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
361 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
| 360 | |
362 | |
| 361 | // loop should not be needed for brightness, as only -1..1 makes sense |
363 | // loop should not be needed for brightness, as only -1..1 makes sense |
| 362 | |
|
|
| 363 | while (r | g | b | a) |
364 | //while (r | g | b | a) |
| 364 | { |
365 | { |
| 365 | unsigned short xr, xg, xb, xa; |
366 | unsigned short xr, xg, xb, xa; |
| 366 | XRenderColor mask_c; |
367 | XRenderColor mask_c; |
| 367 | |
368 | |
| 368 | if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
369 | if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
| … | |
… | |
| 370 | |
371 | |
| 371 | if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
372 | if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
| 372 | { |
373 | { |
| 373 | XRenderColor mask_w = { 65535, 65535, 65535, 65535 }; |
374 | XRenderColor mask_w = { 65535, 65535, 65535, 65535 }; |
| 374 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
375 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
| 375 | mask_c.red = -mask_c.red; |
376 | mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing |
| 376 | mask_c.green = -mask_c.green; |
377 | mask_c.green = -mask_c.green; |
| 377 | mask_c.blue = -mask_c.blue; |
378 | mask_c.blue = -mask_c.blue; |
| 378 | mask_c.alpha = -mask_c.alpha; |
379 | mask_c.alpha = -mask_c.alpha; |
| 379 | XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); |
380 | XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); |
| 380 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
381 | XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); |
| 381 | } |
382 | } |
| 382 | } |
383 | } |
| 383 | |
384 | |
| 384 | |
|
|
| 385 | XRenderFreePicture (dpy, dst); |
385 | XRenderFreePicture (dpy, dst); |
| 386 | } |
386 | } |
| 387 | |
387 | |
| 388 | void |
388 | void |
| 389 | rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) |
389 | rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) |
| 390 | { |
390 | { |
| 391 | if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) |
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 | |
| 392 | { |
397 | { |
| 393 | rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n"); |
398 | rxvt_color empty; |
| 394 | return; |
399 | empty.set (s, rgba (0, 0, 0, 0)); |
|
|
400 | img->fill (empty); |
| 395 | } |
401 | } |
| 396 | |
402 | |
| 397 | unshare (); |
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; |
| 398 | |
407 | |
| 399 | Display *dpy = s->display->dpy; |
408 | Display *dpy = s->display->dpy; |
| 400 | Picture src = create_xrender_mask (dpy, pm, True); |
409 | |
|
|
410 | Picture src = src_picture (); |
| 401 | Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); |
411 | Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); |
|
|
412 | Picture mul = create_xrender_mask (dpy, pm, True); |
| 402 | |
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; |
| 403 | XRenderColor mask_c; |
422 | XRenderColor mask_c; |
| 404 | mask_c.red = r; |
423 | |
| 405 | mask_c.green = g; |
424 | if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) |
| 406 | mask_c.blue = b; |
425 | { |
| 407 | mask_c.alpha = a; |
|
|
| 408 | XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); |
426 | XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1); |
| 409 | |
|
|
| 410 | XRenderComposite (dpy, PictOpMultiply, 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 | } |
| 411 | |
430 | |
|
|
431 | XRenderFreePicture (dpy, mul); |
|
|
432 | XRenderFreePicture (dpy, dst); |
| 412 | XRenderFreePicture (dpy, src); |
433 | XRenderFreePicture (dpy, src); |
| 413 | XRenderFreePicture (dpy, dst); |
434 | |
|
|
435 | ::swap (img->ref, ref); |
|
|
436 | ::swap (img->pm , pm ); |
|
|
437 | |
|
|
438 | delete img; |
| 414 | } |
439 | } |
| 415 | |
440 | |
| 416 | rxvt_img * |
441 | rxvt_img * |
| 417 | rxvt_img::clone () |
442 | rxvt_img::clone () |
| 418 | { |
443 | { |
| … | |
… | |
| 600 | { |
625 | { |
| 601 | rxvt_img *img2 = clone (); |
626 | rxvt_img *img2 = clone (); |
| 602 | Display *dpy = s->display->dpy; |
627 | Display *dpy = s->display->dpy; |
| 603 | Picture src = img->src_picture (); |
628 | Picture src = img->src_picture (); |
| 604 | Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); |
629 | Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); |
| 605 | 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); |
| 606 | |
637 | |
| 607 | XRenderColor mask_c; |
638 | XRenderColor mask_c; |
| 608 | |
639 | |
| 609 | mask_c.alpha = float_to_component (factor); |
640 | mask_c.alpha = float_to_component (factor); |
| 610 | mask_c.red = |
641 | mask_c.red = |
