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.58 by root, Thu Jun 7 20:35:35 2012 UTC vs.
Revision 1.74 by root, Sat Jun 9 19:20:04 2012 UTC

… …
13rxvt_img::rxvt_img (const rxvt_img &img) 13rxvt_img::rxvt_img (const rxvt_img &img)
14: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref) 14: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
15{ 15{
16 ++ref->cnt; 16 ++ref->cnt;
17} 17}
18
19#if 0
20rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap)
21: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
22{
23}
24#endif
25 18
26rxvt_img * 19rxvt_img *
27rxvt_img::new_from_root (rxvt_screen *s) 20rxvt_img::new_from_root (rxvt_screen *s)
28{ 21{
29 Display *dpy = s->display->dpy; 22 Display *dpy = s->display->dpy;
… …
56 img->ref->ours = false; 49 img->ref->ours = false;
57 50
58 return img; 51 return img;
59} 52}
60 53
54# if HAVE_PIXBUF
61rxvt_img * 55rxvt_img *
62rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 56rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
63{ 57{
64 Display *dpy = s->display->dpy; 58 Display *dpy = s->display->dpy;
65 59
… …
173 167
174 g_object_unref (pb); 168 g_object_unref (pb);
175 169
176 return img; 170 return img;
177} 171}
172# endif
178 173
179void 174void
180rxvt_img::destroy () 175rxvt_img::destroy ()
181{ 176{
182 if (--ref->cnt) 177 if (--ref->cnt)
… …
216rxvt_img::unshare () 211rxvt_img::unshare ()
217{ 212{
218 if (ref->cnt == 1 && ref->ours) 213 if (ref->cnt == 1 && ref->ours)
219 return; 214 return;
220 215
221 //TODO: maybe should reify instead
222 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);
223 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 217 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
224 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);
225 XFreeGC (s->display->dpy, gc); 219 XFreeGC (s->display->dpy, gc);
226 220
… …
272 double *kernel = (double *)malloc (size * sizeof (double)); 266 double *kernel = (double *)malloc (size * sizeof (double));
273 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 267 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
274 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 268 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
275 img->alloc (); 269 img->alloc ();
276 270
277 Picture src = src_picture ();
278
279 XRenderPictureAttributes pa; 271 XRenderPictureAttributes pa;
280 pa.repeat = RepeatPad; 272 pa.repeat = RepeatPad;
281 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 273 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
274 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
282 275
283 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 276 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
284 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 277 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
285 XFreePixmap (dpy, tmp_pm); 278 XFreePixmap (dpy, tmp_pm);
286 279
… …
302 295
303 size = rv * 2 + 1; 296 size = rv * 2 + 1;
304 get_gaussian_kernel (rv, size, kernel, params); 297 get_gaussian_kernel (rv, size, kernel, params);
305 ::swap (params[0], params[1]); 298 ::swap (params[0], params[1]);
306 299
307 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 300 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
308 XRenderComposite (dpy, 301 XRenderComposite (dpy,
309 PictOpSrc, 302 PictOpSrc,
310 tmp, 303 tmp,
311 None, 304 None,
312 dst, 305 dst,
… …
330{ 323{
331 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 324 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
332 325
333 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 326 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
334 XRenderPictureAttributes pa; 327 XRenderPictureAttributes pa;
335 pa.repeat = True; 328 pa.repeat = RepeatNormal;
336 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 329 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
337 330
338 XFreePixmap (dpy, pixmap); 331 XFreePixmap (dpy, pixmap);
339 332
340 return mask; 333 return mask;
341} 334}
342 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
343void 355void
344rxvt_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)
345{ 357{
358 unshare ();
359
346 Display *dpy = s->display->dpy; 360 Display *dpy = s->display->dpy;
347 Picture src = create_xrender_mask (dpy, pm, True);
348 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 361 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
349 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;
350 XRenderColor mask_c; 367 XRenderColor mask_c;
351 mask_c.red = r; 368
352 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))
353 mask_c.blue = b; 370 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
354 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 {
355 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 426 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
356
357 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 }
358 430
431 XRenderFreePicture (dpy, mul);
432 XRenderFreePicture (dpy, dst);
359 XRenderFreePicture (dpy, src); 433 XRenderFreePicture (dpy, src);
360 XRenderFreePicture (dpy, dst);
361}
362 434
363void 435 ::swap (img->ref, ref);
364rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 436 ::swap (img->pm , pm );
365{
366 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
367 return;
368 437
369 Display *dpy = s->display->dpy; 438 delete img;
370 Picture src = create_xrender_mask (dpy, pm, True);
371 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
372
373 XRenderColor mask_c;
374 mask_c.red = r;
375 mask_c.green = g;
376 mask_c.blue = b;
377 mask_c.alpha = a;
378 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
379
380 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
381
382 XRenderFreePicture (dpy, src);
383 XRenderFreePicture (dpy, dst);
384} 439}
385 440
386rxvt_img * 441rxvt_img *
387rxvt_img::clone () 442rxvt_img::clone ()
388{ 443{
… …
415 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 470 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
416 return clone (); 471 return clone ();
417 472
418 Display *dpy = s->display->dpy; 473 Display *dpy = s->display->dpy;
419 474
475 // add an alpha channel if...
420 bool alpha = !format->direct.alphaMask 476 bool alpha = !format->direct.alphaMask // pixmap has none yet
421 && (x || y) 477 && (x || y) // we need one because of non-zero offset
422 && repeat == RepeatNone; 478 && repeat == RepeatNone; // and we have no good pixels to fill with
423 479
424 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);
425 img->alloc (); 481 img->alloc ();
426 482
427 Picture src = src_picture (); 483 Picture src = src_picture ();
… …
477 533
478 for (int i = 0; i < 3; ++i) 534 for (int i = 0; i < 3; ++i)
479 for (int j = 0; j < 3; ++j) 535 for (int j = 0; j < 3; ++j)
480 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 536 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
481 537
482#if 0
483 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 538 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
484 xfrm.matrix [1][2] -= XDoubleToFixed (y); 539 xfrm.matrix [1][2] -= XDoubleToFixed (y);
485#endif
486 540
487 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 541 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
488 XRenderSetPictureTransform (dpy, src, &xfrm); 542 XRenderSetPictureTransform (dpy, src, &xfrm);
489 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);
490 544
… …
571{ 625{
572 rxvt_img *img2 = clone (); 626 rxvt_img *img2 = clone ();
573 Display *dpy = s->display->dpy; 627 Display *dpy = s->display->dpy;
574 Picture src = img->src_picture (); 628 Picture src = img->src_picture ();
575 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 629 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
576 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);
577 637
578 XRenderColor mask_c; 638 XRenderColor mask_c;
579 639
580 mask_c.alpha = float_to_component (factor); 640 mask_c.alpha = float_to_component (factor);
581 mask_c.red = 641 mask_c.red =

Diff Legend

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