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.60 by sf-exg, Fri Jun 8 10:12:45 2012 UTC vs.
Revision 1.68 by root, Sat Jun 9 11:14:35 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
… …
265 double *kernel = (double *)malloc (size * sizeof (double)); 264 double *kernel = (double *)malloc (size * sizeof (double));
266 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 265 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
267 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 266 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
268 img->alloc (); 267 img->alloc ();
269 268
270 Picture src = src_picture ();
271
272 XRenderPictureAttributes pa; 269 XRenderPictureAttributes pa;
273 pa.repeat = RepeatPad; 270 pa.repeat = RepeatPad;
274 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 271 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
272 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
275 273
276 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 274 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
277 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 275 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
278 XFreePixmap (dpy, tmp_pm); 276 XFreePixmap (dpy, tmp_pm);
279 277
… …
331 XFreePixmap (dpy, pixmap); 329 XFreePixmap (dpy, pixmap);
332 330
333 return mask; 331 return mask;
334} 332}
335 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
336void 353void
337rxvt_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)
338{ 355{
356 unshare ();
357
339 Display *dpy = s->display->dpy; 358 Display *dpy = s->display->dpy;
340 Picture src = create_xrender_mask (dpy, pm, True);
341 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 359 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
342 360
361 while (r | g | b | a)
362 {
363 unsigned short xr, xg, xb, xa;
343 XRenderColor mask_c; 364 XRenderColor mask_c;
344 mask_c.red = r; 365
345 mask_c.green = g; 366 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
346 mask_c.blue = b;
347 mask_c.alpha = a;
348 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 367 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
349 368
350 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 369 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
370 {
371 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
372 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
373 mask_c.red = -mask_c.red;
374 mask_c.green = -mask_c.green;
375 mask_c.blue = -mask_c.blue;
376 mask_c.alpha = -mask_c.alpha;
377 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
378 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
379 }
380 }
351 381
352 XRenderFreePicture (dpy, src); 382
353 XRenderFreePicture (dpy, dst); 383 XRenderFreePicture (dpy, dst);
354} 384}
355 385
356void 386void
357rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 387rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
358{ 388{
359 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 389 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
390 {
391 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
360 return; 392 return;
393 }
394
395 unshare ();
361 396
362 Display *dpy = s->display->dpy; 397 Display *dpy = s->display->dpy;
363 Picture src = create_xrender_mask (dpy, pm, True); 398 Picture src = create_xrender_mask (dpy, pm, True);
364 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 399 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
365 400
… …
408 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 443 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
409 return clone (); 444 return clone ();
410 445
411 Display *dpy = s->display->dpy; 446 Display *dpy = s->display->dpy;
412 447
448 // add an alpha channel if...
413 bool alpha = !format->direct.alphaMask 449 bool alpha = !format->direct.alphaMask // pixmap has none yet
414 && (x || y) 450 && (x || y) // we need one because of non-zero offset
415 && repeat == RepeatNone; 451 && repeat == RepeatNone; // and we have no good pixels to fill with
416 452
417 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 453 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
418 img->alloc (); 454 img->alloc ();
419 455
420 Picture src = src_picture (); 456 Picture src = src_picture ();
… …
470 506
471 for (int i = 0; i < 3; ++i) 507 for (int i = 0; i < 3; ++i)
472 for (int j = 0; j < 3; ++j) 508 for (int j = 0; j < 3; ++j)
473 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 509 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
474 510
475#if 0
476 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 511 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
477 xfrm.matrix [1][2] -= XDoubleToFixed (y); 512 xfrm.matrix [1][2] -= XDoubleToFixed (y);
478#endif
479 513
480 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 514 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
481 XRenderSetPictureTransform (dpy, src, &xfrm); 515 XRenderSetPictureTransform (dpy, src, &xfrm);
482 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 516 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
483 517

Diff Legend

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