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.59 by root, Thu Jun 7 21:28:10 2012 UTC vs.
Revision 1.72 by sf-exg, Sat Jun 9 16:21:16 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
… …
295 293
296 size = rv * 2 + 1; 294 size = rv * 2 + 1;
297 get_gaussian_kernel (rv, size, kernel, params); 295 get_gaussian_kernel (rv, size, kernel, params);
298 ::swap (params[0], params[1]); 296 ::swap (params[0], params[1]);
299 297
300 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 298 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
301 XRenderComposite (dpy, 299 XRenderComposite (dpy,
302 PictOpSrc, 300 PictOpSrc,
303 tmp, 301 tmp,
304 None, 302 None,
305 dst, 303 dst,
… …
316 XRenderFreePicture (dpy, tmp); 314 XRenderFreePicture (dpy, tmp);
317 315
318 return img; 316 return img;
319} 317}
320 318
321static Picture 319static void
322create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 320extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
323{ 321{
324 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 322 int32_t x = clamp (c, cl0, cl1);
323 c -= x;
324 xc = x;
325}
325 326
326 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 327static bool
327 XRenderPictureAttributes pa; 328extract (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)
328 pa.repeat = True; 329{
329 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 330 extract (cl0, cl1, r, xr);
331 extract (cl0, cl1, g, xg);
332 extract (cl0, cl1, b, xb);
333 extract (cl0, cl1, a, xa);
330 334
331 XFreePixmap (dpy, pixmap); 335 return xr | xg | xb | xa;
332
333 return mask;
334} 336}
335 337
336void 338void
337rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 339rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
338{ 340{
341 unshare ();
342
339 Display *dpy = s->display->dpy; 343 Display *dpy = s->display->dpy;
340 Picture src = create_xrender_mask (dpy, pm, True); 344 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
345
346 // loop should not be needed for brightness, as only -1..1 makes sense
347 //while (r | g | b | a)
348 {
349 unsigned short xr, xg, xb, xa;
350 XRenderColor mask_c;
351
352 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
353 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
354
355 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
356 {
357 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
358 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
359 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
360 mask_c.green = -mask_c.green;
361 mask_c.blue = -mask_c.blue;
362 mask_c.alpha = -mask_c.alpha;
363 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
364 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
365 }
366 }
367
368
369 XRenderFreePicture (dpy, dst);
370}
371
372void
373rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
374{
375 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
376 {
377 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
378 return;
379 }
380
381 unshare ();
382
383 Display *dpy = s->display->dpy;
341 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 384 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
342 385
343 XRenderColor mask_c; 386 XRenderColor mask_c;
344 mask_c.red = r; 387 mask_c.red = r;
345 mask_c.green = g; 388 mask_c.green = g;
346 mask_c.blue = b; 389 mask_c.blue = b;
347 mask_c.alpha = a; 390 mask_c.alpha = a;
348 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 391 XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h);
349 392
350 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
351
352 XRenderFreePicture (dpy, src);
353 XRenderFreePicture (dpy, dst);
354}
355
356void
357rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
358{
359 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
360 return;
361
362 Display *dpy = s->display->dpy;
363 Picture src = create_xrender_mask (dpy, pm, True);
364 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
365
366 XRenderColor mask_c;
367 mask_c.red = r;
368 mask_c.green = g;
369 mask_c.blue = b;
370 mask_c.alpha = a;
371 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
372
373 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
374
375 XRenderFreePicture (dpy, src);
376 XRenderFreePicture (dpy, dst); 393 XRenderFreePicture (dpy, dst);
377} 394}
378 395
379rxvt_img * 396rxvt_img *
380rxvt_img::clone () 397rxvt_img::clone ()
… …
408 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 425 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
409 return clone (); 426 return clone ();
410 427
411 Display *dpy = s->display->dpy; 428 Display *dpy = s->display->dpy;
412 429
430 // add an alpha channel if...
413 bool alpha = !format->direct.alphaMask 431 bool alpha = !format->direct.alphaMask // pixmap has none yet
414 && (x || y) 432 && (x || y) // we need one because of non-zero offset
415 && repeat == RepeatNone; 433 && repeat == RepeatNone; // and we have no good pixels to fill with
416 434
417 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 435 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
418 img->alloc (); 436 img->alloc ();
419 437
420 Picture src = src_picture (); 438 Picture src = src_picture ();
… …
470 488
471 for (int i = 0; i < 3; ++i) 489 for (int i = 0; i < 3; ++i)
472 for (int j = 0; j < 3; ++j) 490 for (int j = 0; j < 3; ++j)
473 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 491 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
474 492
475#if 0
476 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 493 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
477 xfrm.matrix [1][2] -= XDoubleToFixed (y); 494 xfrm.matrix [1][2] -= XDoubleToFixed (y);
478#endif
479 495
480 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 496 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
481 XRenderSetPictureTransform (dpy, src, &xfrm); 497 XRenderSetPictureTransform (dpy, src, &xfrm);
482 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 498 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
483 499
… …
564{ 580{
565 rxvt_img *img2 = clone (); 581 rxvt_img *img2 = clone ();
566 Display *dpy = s->display->dpy; 582 Display *dpy = s->display->dpy;
567 Picture src = img->src_picture (); 583 Picture src = img->src_picture ();
568 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 584 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
569 Picture mask = create_xrender_mask (dpy, img->pm, False); 585
586 Pixmap pixmap = XCreatePixmap (dpy, img->pm, 1, 1, 8);
587 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, PictStandardA8);
588 XRenderPictureAttributes pa;
589 pa.repeat = True;
590 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
591 XFreePixmap (dpy, pixmap);
570 592
571 XRenderColor mask_c; 593 XRenderColor mask_c;
572 594
573 mask_c.alpha = float_to_component (factor); 595 mask_c.alpha = float_to_component (factor);
574 mask_c.red = 596 mask_c.red =

Diff Legend

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