ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtimg.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.65 by root, Fri Jun 8 21:41:45 2012 UTC vs.
Revision 1.71 by sf-exg, Sat Jun 9 14:18:53 2012 UTC

329 XFreePixmap (dpy, pixmap); 329 XFreePixmap (dpy, pixmap);
330 330
331 return mask; 331 return mask;
332} 332}
333 333
334static void
335extract (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
342static bool
343extract (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
334void 353void
335rxvt_img::brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a) 354rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
336{ 355{
356 unshare ();
357
337 Display *dpy = s->display->dpy; 358 Display *dpy = s->display->dpy;
338 Picture src = create_xrender_mask (dpy, pm, True); 359 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
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;
365 XRenderColor mask_c;
366
367 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
368 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
369
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 }
382
383
384 XRenderFreePicture (dpy, dst);
385}
386
387void
388rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
389{
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");
393 return;
394 }
395
396 unshare ();
397
398 Display *dpy = s->display->dpy;
339 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 399 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
340 400
341 XRenderColor mask_c; 401 XRenderColor mask_c;
342 mask_c.red = r; 402 mask_c.red = r;
343 mask_c.green = g; 403 mask_c.green = g;
344 mask_c.blue = b; 404 mask_c.blue = b;
345 mask_c.alpha = a; 405 mask_c.alpha = a;
346 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 406 XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h);
347 407
348 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
349
350 XRenderFreePicture (dpy, src);
351 XRenderFreePicture (dpy, dst);
352}
353
354void
355rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a)
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
363 Display *dpy = s->display->dpy;
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); 408 XRenderFreePicture (dpy, dst);
378} 409}
379 410
380rxvt_img * 411rxvt_img *
381rxvt_img::clone () 412rxvt_img::clone ()
472 503
473 for (int i = 0; i < 3; ++i) 504 for (int i = 0; i < 3; ++i)
474 for (int j = 0; j < 3; ++j) 505 for (int j = 0; j < 3; ++j)
475 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 506 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
476 507
477#if 0
478 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 508 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
479 xfrm.matrix [1][2] -= XDoubleToFixed (y); 509 xfrm.matrix [1][2] -= XDoubleToFixed (y);
480#endif
481 510
482 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 511 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
483 XRenderSetPictureTransform (dpy, src, &xfrm); 512 XRenderSetPictureTransform (dpy, src, &xfrm);
484 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 513 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
485 514

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines