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.69 by root, Sat Jun 9 11:15:29 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;
… …
216rxvt_img::unshare () 209rxvt_img::unshare ()
217{ 210{
218 if (ref->cnt == 1 && ref->ours) 211 if (ref->cnt == 1 && ref->ours)
219 return; 212 return;
220 213
221 //TODO: maybe should reify instead
222 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);
223 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 215 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); 216 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
225 XFreeGC (s->display->dpy, gc); 217 XFreeGC (s->display->dpy, gc);
226 218
… …
272 double *kernel = (double *)malloc (size * sizeof (double)); 264 double *kernel = (double *)malloc (size * sizeof (double));
273 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 265 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
274 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);
275 img->alloc (); 267 img->alloc ();
276 268
277 Picture src = src_picture ();
278
279 XRenderPictureAttributes pa; 269 XRenderPictureAttributes pa;
280 pa.repeat = RepeatPad; 270 pa.repeat = RepeatPad;
281 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);
282 273
283 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 274 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
284 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 275 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
285 XFreePixmap (dpy, tmp_pm); 276 XFreePixmap (dpy, tmp_pm);
286 277
… …
302 293
303 size = rv * 2 + 1; 294 size = rv * 2 + 1;
304 get_gaussian_kernel (rv, size, kernel, params); 295 get_gaussian_kernel (rv, size, kernel, params);
305 ::swap (params[0], params[1]); 296 ::swap (params[0], params[1]);
306 297
307 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 298 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
308 XRenderComposite (dpy, 299 XRenderComposite (dpy,
309 PictOpSrc, 300 PictOpSrc,
310 tmp, 301 tmp,
311 None, 302 None,
312 dst, 303 dst,
… …
338 XFreePixmap (dpy, pixmap); 329 XFreePixmap (dpy, pixmap);
339 330
340 return mask; 331 return mask;
341} 332}
342 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
343void 353void
344rxvt_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)
345{ 355{
356 unshare ();
357
346 Display *dpy = s->display->dpy; 358 Display *dpy = s->display->dpy;
347 Picture src = create_xrender_mask (dpy, pm, True);
348 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 359 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
349 360
361 // loop should not be needed for brightness, as only -1..1 makes sense
362
363 while (r | g | b | a)
364 {
365 unsigned short xr, xg, xb, xa;
350 XRenderColor mask_c; 366 XRenderColor mask_c;
351 mask_c.red = r; 367
352 mask_c.green = g; 368 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;
354 mask_c.alpha = a;
355 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 369 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
356 370
357 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 371 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
372 {
373 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
374 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
375 mask_c.red = -mask_c.red;
376 mask_c.green = -mask_c.green;
377 mask_c.blue = -mask_c.blue;
378 mask_c.alpha = -mask_c.alpha;
379 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
380 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
381 }
382 }
358 383
359 XRenderFreePicture (dpy, src); 384
360 XRenderFreePicture (dpy, dst); 385 XRenderFreePicture (dpy, dst);
361} 386}
362 387
363void 388void
364rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 389rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
365{ 390{
366 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 391 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
392 {
393 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
367 return; 394 return;
395 }
396
397 unshare ();
368 398
369 Display *dpy = s->display->dpy; 399 Display *dpy = s->display->dpy;
370 Picture src = create_xrender_mask (dpy, pm, True); 400 Picture src = create_xrender_mask (dpy, pm, True);
371 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 401 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
372 402
… …
415 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 445 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
416 return clone (); 446 return clone ();
417 447
418 Display *dpy = s->display->dpy; 448 Display *dpy = s->display->dpy;
419 449
450 // add an alpha channel if...
420 bool alpha = !format->direct.alphaMask 451 bool alpha = !format->direct.alphaMask // pixmap has none yet
421 && (x || y) 452 && (x || y) // we need one because of non-zero offset
422 && repeat == RepeatNone; 453 && repeat == RepeatNone; // and we have no good pixels to fill with
423 454
424 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 455 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
425 img->alloc (); 456 img->alloc ();
426 457
427 Picture src = src_picture (); 458 Picture src = src_picture ();
… …
477 508
478 for (int i = 0; i < 3; ++i) 509 for (int i = 0; i < 3; ++i)
479 for (int j = 0; j < 3; ++j) 510 for (int j = 0; j < 3; ++j)
480 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 511 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
481 512
482#if 0
483 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 513 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
484 xfrm.matrix [1][2] -= XDoubleToFixed (y); 514 xfrm.matrix [1][2] -= XDoubleToFixed (y);
485#endif
486 515
487 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 516 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
488 XRenderSetPictureTransform (dpy, src, &xfrm); 517 XRenderSetPictureTransform (dpy, src, &xfrm);
489 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 518 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
490 519

Diff Legend

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