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.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC

… …
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
54rxvt_img * 55rxvt_img *
55rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 56rxvt_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
172void 174void
173rxvt_img::destroy () 175rxvt_img::destroy ()
174{ 176{
175 if (--ref->cnt) 177 if (--ref->cnt)
… …
315 317
316 return img; 318 return img;
317} 319}
318 320
319static Picture 321static Picture
320create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 322create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
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;
329 pa.component_alpha = component_alpha;
327 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 330 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
328 331
329 XFreePixmap (dpy, pixmap); 332 XFreePixmap (dpy, pixmap);
330 333
331 return mask; 334 return mask;
332} 335}
333 336
337static void
338extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
339{
340 int32_t x = clamp (c, cl0, cl1);
341 c -= x;
342 xc = x;
343}
344
345static bool
346extract (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)
347{
348 extract (cl0, cl1, r, xr);
349 extract (cl0, cl1, g, xg);
350 extract (cl0, cl1, b, xb);
351 extract (cl0, cl1, a, xa);
352
353 return xr | xg | xb | xa;
354}
355
334void 356void
335rxvt_img::brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a) 357rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
336{ 358{
359 unshare ();
360
337 Display *dpy = s->display->dpy; 361 Display *dpy = s->display->dpy;
338 Picture src = create_xrender_mask (dpy, pm, True);
339 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 362 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
340 363
364 // loop should not be needed for brightness, as only -1..1 makes sense
365 //while (r | g | b | a)
366 {
367 unsigned short xr, xg, xb, xa;
341 XRenderColor mask_c; 368 XRenderColor mask_c;
342 mask_c.red = r; 369
343 mask_c.green = g; 370 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
344 mask_c.blue = b; 371 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
345 mask_c.alpha = a; 372
373 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
374 {
375 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
376 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
377 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
378 mask_c.green = -mask_c.green;
379 mask_c.blue = -mask_c.blue;
380 mask_c.alpha = -mask_c.alpha;
381 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
382 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
383 }
384 }
385
386 XRenderFreePicture (dpy, dst);
387}
388
389void
390rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
391{
392 if (r < 0 || g < 0 || b < 0 || a < 0)
393 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
394
395 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
396 img->alloc ();
397
398 {
399 rxvt_color empty;
400 empty.set (s, rgba (0, 0, 0, 0));
401 img->fill (empty);
402 }
403
404 // premultiply (yeah, these are not exact, sue me or fix it)
405 r = (r * (a >> 8)) >> 8;
406 g = (g * (a >> 8)) >> 8;
407 b = (b * (a >> 8)) >> 8;
408
409 Display *dpy = s->display->dpy;
410
411 Picture src = src_picture ();
412 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
413 Picture mul = create_xrender_mask (dpy, pm, True, True);
414
415 //TODO: this operator does not yet implement some useful contrast
416 while (r | g | b | a)
417 {
418 unsigned short xr, xg, xb, xa;
419 XRenderColor mask_c;
420
421 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
422 {
346 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 423 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
347
348 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 424 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
425 }
426 }
349 427
428 XRenderFreePicture (dpy, mul);
429 XRenderFreePicture (dpy, dst);
350 XRenderFreePicture (dpy, src); 430 XRenderFreePicture (dpy, src);
351 XRenderFreePicture (dpy, dst);
352}
353 431
354void 432 ::swap (img->ref, ref);
355rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a) 433 ::swap (img->pm , pm );
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 434
363 Display *dpy = s->display->dpy; 435 delete img;
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);
378} 436}
379 437
380rxvt_img * 438rxvt_img *
381rxvt_img::clone () 439rxvt_img::clone ()
382{ 440{
… …
472 530
473 for (int i = 0; i < 3; ++i) 531 for (int i = 0; i < 3; ++i)
474 for (int j = 0; j < 3; ++j) 532 for (int j = 0; j < 3; ++j)
475 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 533 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
476 534
477#if 0
478 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 535 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
479 xfrm.matrix [1][2] -= XDoubleToFixed (y); 536 xfrm.matrix [1][2] -= XDoubleToFixed (y);
480#endif
481 537
482 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 538 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
483 XRenderSetPictureTransform (dpy, src, &xfrm); 539 XRenderSetPictureTransform (dpy, src, &xfrm);
484 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 540 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
485 541
… …
566{ 622{
567 rxvt_img *img2 = clone (); 623 rxvt_img *img2 = clone ();
568 Display *dpy = s->display->dpy; 624 Display *dpy = s->display->dpy;
569 Picture src = img->src_picture (); 625 Picture src = img->src_picture ();
570 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 626 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
571 Picture mask = create_xrender_mask (dpy, img->pm, False); 627 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
572 628
573 XRenderColor mask_c; 629 XRenderColor mask_c;
574 630
575 mask_c.alpha = float_to_component (factor); 631 mask_c.alpha = float_to_component (factor);
576 mask_c.red = 632 mask_c.red =

Diff Legend

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