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.74 by root, Sat Jun 9 19:20:04 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)
… …
209rxvt_img::unshare () 211rxvt_img::unshare ()
210{ 212{
211 if (ref->cnt == 1 && ref->ours) 213 if (ref->cnt == 1 && ref->ours)
212 return; 214 return;
213 215
214 //TODO: maybe should reify instead
215 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 216 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); 217 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); 218 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
218 XFreeGC (s->display->dpy, gc); 219 XFreeGC (s->display->dpy, gc);
219 220
… …
322{ 323{
323 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 324 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
324 325
325 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 326 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
326 XRenderPictureAttributes pa; 327 XRenderPictureAttributes pa;
327 pa.repeat = True; 328 pa.repeat = RepeatNormal;
328 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 329 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
329 330
330 XFreePixmap (dpy, pixmap); 331 XFreePixmap (dpy, pixmap);
331 332
332 return mask; 333 return mask;
333} 334}
334 335
336static void
337extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
338{
339 int32_t x = clamp (c, cl0, cl1);
340 c -= x;
341 xc = x;
342}
343
344static bool
345extract (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)
346{
347 extract (cl0, cl1, r, xr);
348 extract (cl0, cl1, g, xg);
349 extract (cl0, cl1, b, xb);
350 extract (cl0, cl1, a, xa);
351
352 return xr | xg | xb | xa;
353}
354
335void 355void
336rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 356rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
337{ 357{
358 unshare ();
359
338 Display *dpy = s->display->dpy; 360 Display *dpy = s->display->dpy;
339 Picture src = create_xrender_mask (dpy, pm, True);
340 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 361 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
341 362
363 // loop should not be needed for brightness, as only -1..1 makes sense
364 //while (r | g | b | a)
365 {
366 unsigned short xr, xg, xb, xa;
342 XRenderColor mask_c; 367 XRenderColor mask_c;
343 mask_c.red = r; 368
344 mask_c.green = g; 369 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
345 mask_c.blue = b; 370 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
346 mask_c.alpha = a; 371
372 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
373 {
374 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
375 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
376 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
377 mask_c.green = -mask_c.green;
378 mask_c.blue = -mask_c.blue;
379 mask_c.alpha = -mask_c.alpha;
380 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
381 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
382 }
383 }
384
385 XRenderFreePicture (dpy, dst);
386}
387
388void
389rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
390{
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
397 {
398 rxvt_color empty;
399 empty.set (s, rgba (0, 0, 0, 0));
400 img->fill (empty);
401 }
402
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;
407
408 Display *dpy = s->display->dpy;
409
410 Picture src = src_picture ();
411 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
412 Picture mul = create_xrender_mask (dpy, pm, True);
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;
422 XRenderColor mask_c;
423
424 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
425 {
347 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 426 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
348
349 XRenderComposite (dpy, PictOpAdd, 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 }
350 430
431 XRenderFreePicture (dpy, mul);
432 XRenderFreePicture (dpy, dst);
351 XRenderFreePicture (dpy, src); 433 XRenderFreePicture (dpy, src);
352 XRenderFreePicture (dpy, dst);
353}
354 434
355void 435 ::swap (img->ref, ref);
356rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 436 ::swap (img->pm , pm );
357{
358 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
359 return;
360 437
361 Display *dpy = s->display->dpy; 438 delete img;
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);
376} 439}
377 440
378rxvt_img * 441rxvt_img *
379rxvt_img::clone () 442rxvt_img::clone ()
380{ 443{
… …
407 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 470 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
408 return clone (); 471 return clone ();
409 472
410 Display *dpy = s->display->dpy; 473 Display *dpy = s->display->dpy;
411 474
475 // add an alpha channel if...
412 bool alpha = !format->direct.alphaMask 476 bool alpha = !format->direct.alphaMask // pixmap has none yet
413 && (x || y) 477 && (x || y) // we need one because of non-zero offset
414 && repeat == RepeatNone; 478 && repeat == RepeatNone; // and we have no good pixels to fill with
415 479
416 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 480 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
417 img->alloc (); 481 img->alloc ();
418 482
419 Picture src = src_picture (); 483 Picture src = src_picture ();
… …
469 533
470 for (int i = 0; i < 3; ++i) 534 for (int i = 0; i < 3; ++i)
471 for (int j = 0; j < 3; ++j) 535 for (int j = 0; j < 3; ++j)
472 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 536 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
473 537
474#if 0
475 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 538 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
476 xfrm.matrix [1][2] -= XDoubleToFixed (y); 539 xfrm.matrix [1][2] -= XDoubleToFixed (y);
477#endif
478 540
479 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 541 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
480 XRenderSetPictureTransform (dpy, src, &xfrm); 542 XRenderSetPictureTransform (dpy, src, &xfrm);
481 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 543 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
482 544
… …
563{ 625{
564 rxvt_img *img2 = clone (); 626 rxvt_img *img2 = clone ();
565 Display *dpy = s->display->dpy; 627 Display *dpy = s->display->dpy;
566 Picture src = img->src_picture (); 628 Picture src = img->src_picture ();
567 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 629 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
568 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);
569 637
570 XRenderColor mask_c; 638 XRenderColor mask_c;
571 639
572 mask_c.alpha = float_to_component (factor); 640 mask_c.alpha = float_to_component (factor);
573 mask_c.red = 641 mask_c.red =

Diff Legend

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