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

Diff Legend

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