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.61 by sf-exg, Fri Jun 8 10:28:30 2012 UTC vs.
Revision 1.71 by sf-exg, Sat Jun 9 14:18:53 2012 UTC

… …
209rxvt_img::unshare () 209rxvt_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
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
335void 353void
336rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 354rxvt_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); 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;
340 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 399 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
341 400
342 XRenderColor mask_c; 401 XRenderColor mask_c;
343 mask_c.red = r; 402 mask_c.red = r;
344 mask_c.green = g; 403 mask_c.green = g;
345 mask_c.blue = b; 404 mask_c.blue = b;
346 mask_c.alpha = a; 405 mask_c.alpha = a;
347 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 406 XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h);
348 407
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
355void
356rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
357{
358 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
359 return;
360
361 Display *dpy = s->display->dpy;
362 Picture src = create_xrender_mask (dpy, pm, True);
363 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
364
365 XRenderColor mask_c;
366 mask_c.red = r;
367 mask_c.green = g;
368 mask_c.blue = b;
369 mask_c.alpha = a;
370 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
371
372 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
373
374 XRenderFreePicture (dpy, src);
375 XRenderFreePicture (dpy, dst); 408 XRenderFreePicture (dpy, dst);
376} 409}
377 410
378rxvt_img * 411rxvt_img *
379rxvt_img::clone () 412rxvt_img::clone ()
… …
407 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 440 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
408 return clone (); 441 return clone ();
409 442
410 Display *dpy = s->display->dpy; 443 Display *dpy = s->display->dpy;
411 444
445 // add an alpha channel if...
412 bool alpha = !format->direct.alphaMask 446 bool alpha = !format->direct.alphaMask // pixmap has none yet
413 && (x || y) 447 && (x || y) // we need one because of non-zero offset
414 && repeat == RepeatNone; 448 && repeat == RepeatNone; // and we have no good pixels to fill with
415 449
416 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 450 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
417 img->alloc (); 451 img->alloc ();
418 452
419 Picture src = src_picture (); 453 Picture src = src_picture ();
… …
469 503
470 for (int i = 0; i < 3; ++i) 504 for (int i = 0; i < 3; ++i)
471 for (int j = 0; j < 3; ++j) 505 for (int j = 0; j < 3; ++j)
472 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 506 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
473 507
474#if 0
475 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 508 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
476 xfrm.matrix [1][2] -= XDoubleToFixed (y); 509 xfrm.matrix [1][2] -= XDoubleToFixed (y);
477#endif
478 510
479 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 511 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
480 XRenderSetPictureTransform (dpy, src, &xfrm); 512 XRenderSetPictureTransform (dpy, src, &xfrm);
481 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);
482 514

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines