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.55 by root, Thu Jun 7 20:26:21 2012 UTC vs.
Revision 1.72 by sf-exg, Sat Jun 9 16:21:16 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;
… …
121 uint8_t g = *src++; 114 uint8_t g = *src++;
122 uint8_t b = *src++; 115 uint8_t b = *src++;
123 116
124 uint32_t v = (r << 16) | (g << 8) | b; 117 uint32_t v = (r << 16) | (g << 8) | b;
125 118
126 if (ecb_big_endian ()) 119 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
127 v = ecb_bswap32 (v);
128
129 if (byte_order_mismatch)
130 v = ecb_bswap32 (v); 120 v = ecb_bswap32 (v);
131 121
132 *dst++ = v; 122 *dst++ = v;
133 } 123 }
134 else 124 else
135 for (int x = 0; x < width; x++) 125 for (int x = 0; x < width; x++)
136 { 126 {
137 uint32_t v = *(uint32_t *)src; src += 4; 127 uint32_t v = *(uint32_t *)src; src += 4;
138 128
139 if (ecb_little_endian ()) 129 if (ecb_big_endian ())
140 v = ecb_bswap32 (v); 130 v = ecb_bswap32 (v);
141 131
142 v = ecb_rotr32 (v, 8); 132 v = ecb_rotl32 (v, 8); // abgr to bgra
143 133
144 if (byte_order_mismatch) 134 if (!byte_order_mismatch)
145 v = ecb_bswap32 (v); 135 v = ecb_bswap32 (v);
146 136
147 *dst++ = v; 137 *dst++ = v;
148 } 138 }
149 139
… …
219rxvt_img::unshare () 209rxvt_img::unshare ()
220{ 210{
221 if (ref->cnt == 1 && ref->ours) 211 if (ref->cnt == 1 && ref->ours)
222 return; 212 return;
223 213
224 //TODO: maybe should reify instead
225 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);
226 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 215 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
227 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);
228 XFreeGC (s->display->dpy, gc); 217 XFreeGC (s->display->dpy, gc);
229 218
… …
275 double *kernel = (double *)malloc (size * sizeof (double)); 264 double *kernel = (double *)malloc (size * sizeof (double));
276 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 265 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
277 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);
278 img->alloc (); 267 img->alloc ();
279 268
280 Picture src = src_picture ();
281
282 XRenderPictureAttributes pa; 269 XRenderPictureAttributes pa;
283 pa.repeat = RepeatPad; 270 pa.repeat = RepeatPad;
284 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);
285 273
286 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 274 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
287 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 275 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
288 XFreePixmap (dpy, tmp_pm); 276 XFreePixmap (dpy, tmp_pm);
289 277
… …
305 293
306 size = rv * 2 + 1; 294 size = rv * 2 + 1;
307 get_gaussian_kernel (rv, size, kernel, params); 295 get_gaussian_kernel (rv, size, kernel, params);
308 ::swap (params[0], params[1]); 296 ::swap (params[0], params[1]);
309 297
310 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 298 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
311 XRenderComposite (dpy, 299 XRenderComposite (dpy,
312 PictOpSrc, 300 PictOpSrc,
313 tmp, 301 tmp,
314 None, 302 None,
315 dst, 303 dst,
… …
326 XRenderFreePicture (dpy, tmp); 314 XRenderFreePicture (dpy, tmp);
327 315
328 return img; 316 return img;
329} 317}
330 318
331static Picture 319static void
332create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 320extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
333{ 321{
334 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}
335 326
336 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 327static bool
337 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)
338 pa.repeat = True; 329{
339 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);
340 334
341 XFreePixmap (dpy, pixmap); 335 return xr | xg | xb | xa;
342
343 return mask;
344} 336}
345 337
346void 338void
347rxvt_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)
348{ 340{
341 unshare ();
342
349 Display *dpy = s->display->dpy; 343 Display *dpy = s->display->dpy;
350 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;
351 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 384 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
352 385
353 XRenderColor mask_c; 386 XRenderColor mask_c;
354 mask_c.red = r; 387 mask_c.red = r;
355 mask_c.green = g; 388 mask_c.green = g;
356 mask_c.blue = b; 389 mask_c.blue = b;
357 mask_c.alpha = a; 390 mask_c.alpha = a;
358 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 391 XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h);
359 392
360 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
361
362 XRenderFreePicture (dpy, src);
363 XRenderFreePicture (dpy, dst);
364}
365
366void
367rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
368{
369 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
370 return;
371
372 Display *dpy = s->display->dpy;
373 Picture src = create_xrender_mask (dpy, pm, True);
374 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
375
376 XRenderColor mask_c;
377 mask_c.red = r;
378 mask_c.green = g;
379 mask_c.blue = b;
380 mask_c.alpha = a;
381 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
382
383 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
384
385 XRenderFreePicture (dpy, src);
386 XRenderFreePicture (dpy, dst); 393 XRenderFreePicture (dpy, dst);
387} 394}
388 395
389rxvt_img * 396rxvt_img *
390rxvt_img::clone () 397rxvt_img::clone ()
… …
418 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 425 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
419 return clone (); 426 return clone ();
420 427
421 Display *dpy = s->display->dpy; 428 Display *dpy = s->display->dpy;
422 429
430 // add an alpha channel if...
423 bool alpha = !format->direct.alphaMask 431 bool alpha = !format->direct.alphaMask // pixmap has none yet
424 && (x || y) 432 && (x || y) // we need one because of non-zero offset
425 && repeat == RepeatNone; 433 && repeat == RepeatNone; // and we have no good pixels to fill with
426 434
427 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);
428 img->alloc (); 436 img->alloc ();
429 437
430 Picture src = src_picture (); 438 Picture src = src_picture ();
… …
480 488
481 for (int i = 0; i < 3; ++i) 489 for (int i = 0; i < 3; ++i)
482 for (int j = 0; j < 3; ++j) 490 for (int j = 0; j < 3; ++j)
483 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 491 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
484 492
485#if 0
486 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 493 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
487 xfrm.matrix [1][2] -= XDoubleToFixed (y); 494 xfrm.matrix [1][2] -= XDoubleToFixed (y);
488#endif
489 495
490 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 496 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
491 XRenderSetPictureTransform (dpy, src, &xfrm); 497 XRenderSetPictureTransform (dpy, src, &xfrm);
492 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);
493 499
… …
574{ 580{
575 rxvt_img *img2 = clone (); 581 rxvt_img *img2 = clone ();
576 Display *dpy = s->display->dpy; 582 Display *dpy = s->display->dpy;
577 Picture src = img->src_picture (); 583 Picture src = img->src_picture ();
578 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 584 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
579 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);
580 592
581 XRenderColor mask_c; 593 XRenderColor mask_c;
582 594
583 mask_c.alpha = float_to_component (factor); 595 mask_c.alpha = float_to_component (factor);
584 mask_c.red = 596 mask_c.red =

Diff Legend

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