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.50 by root, Thu Jun 7 19:42:09 2012 UTC vs.
Revision 1.70 by root, Sat Jun 9 11:41:28 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;
… …
71 64
72 // since we require rgb24/argb32 formats from xrender we assume 65 // since we require rgb24/argb32 formats from xrender we assume
73 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender 66 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender
74 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24; 67 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
75 68
69 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
70
76 XImage xi; 71 XImage xi;
77 72
78 xi.width = width; 73 xi.width = width;
79 xi.height = height; 74 xi.height = height;
80 xi.xoffset = 0; 75 xi.xoffset = 0;
81 xi.format = ZPixmap; 76 xi.format = ZPixmap;
82 xi.byte_order = LSBFirst; // maybe go for host byte order, because servers are usually local? 77 xi.byte_order = ImageByteOrder (dpy);
83 xi.bitmap_unit = 32; 78 xi.bitmap_unit = 0; //XY only, unused
84 xi.bitmap_bit_order = LSBFirst; 79 xi.bitmap_bit_order = 0; //XY only, unused
85 xi.bitmap_pad = BitmapPad (dpy); 80 xi.bitmap_pad = BitmapPad (dpy);
86 xi.depth = depth; 81 xi.depth = depth;
87 xi.bytes_per_line = 0; 82 xi.bytes_per_line = 0;
88 xi.bits_per_pixel = 32; 83 xi.bits_per_pixel = 32; //Z only
89 xi.red_mask = 0x000000ff; 84 xi.red_mask = 0x00000000; //Z only, unused
90 xi.green_mask = 0x0000ff00; 85 xi.green_mask = 0x00000000; //Z only, unused
91 xi.blue_mask = 0x00ff0000; 86 xi.blue_mask = 0x00000000; //Z only, unused
87 xi.obdata = 0; // probably unused
88
89 bool byte_order_mismatch = byte_order != xi.byte_order;
92 90
93 if (!XInitImage (&xi)) 91 if (!XInitImage (&xi))
94 rxvt_fatal ("unable to initialise ximage, please report.\n"); 92 rxvt_fatal ("unable to initialise ximage, please report.\n");
95 93
96 if (height > INT_MAX / xi.bytes_per_line) 94 if (height > INT_MAX / xi.bytes_per_line)
… …
114 { 112 {
115 uint8_t r = *src++; 113 uint8_t r = *src++;
116 uint8_t g = *src++; 114 uint8_t g = *src++;
117 uint8_t b = *src++; 115 uint8_t b = *src++;
118 116
119 uint32_t v = r | (g << 8) | (b << 16); 117 uint32_t v = (r << 16) | (g << 8) | b;
120 118
121 if (ecb_big_endian ()) 119 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
122 v = ecb_bswap32 (v); 120 v = ecb_bswap32 (v);
123 121
124 *dst++ = x; 122 *dst++ = v;
125 } 123 }
126 else 124 else
127 for (int x = 0; x < width; x++) 125 for (int x = 0; x < width; x++)
128 { 126 {
129 uint32_t v = *(uint32_t *)src; src += 4; 127 uint32_t v = *(uint32_t *)src; src += 4;
130 v = ecb_big_endian () ? ecb_rotr32 (v, 8) : ecb_rotl32 (v, 8); 128
129 if (ecb_big_endian ())
131 *dst++ = ecb_bswap32 (v); 130 v = ecb_bswap32 (v);
131
132 v = ecb_rotl32 (v, 8); // abgr to bgra
133
134 if (!byte_order_mismatch)
135 v = ecb_bswap32 (v);
136
137 *dst++ = v;
132 } 138 }
133 139
134 row += rowstride; 140 row += rowstride;
135 line += xi.bytes_per_line; 141 line += xi.bytes_per_line;
136 } 142 }
… …
203rxvt_img::unshare () 209rxvt_img::unshare ()
204{ 210{
205 if (ref->cnt == 1 && ref->ours) 211 if (ref->cnt == 1 && ref->ours)
206 return; 212 return;
207 213
208 //TODO: maybe should reify instead
209 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);
210 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 215 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
211 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);
212 XFreeGC (s->display->dpy, gc); 217 XFreeGC (s->display->dpy, gc);
213 218
… …
259 double *kernel = (double *)malloc (size * sizeof (double)); 264 double *kernel = (double *)malloc (size * sizeof (double));
260 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 265 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
261 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);
262 img->alloc (); 267 img->alloc ();
263 268
264 Picture src = src_picture ();
265
266 XRenderPictureAttributes pa; 269 XRenderPictureAttributes pa;
267 pa.repeat = RepeatPad; 270 pa.repeat = RepeatPad;
268 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);
269 273
270 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 274 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
271 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 275 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
272 XFreePixmap (dpy, tmp_pm); 276 XFreePixmap (dpy, tmp_pm);
273 277
… …
289 293
290 size = rv * 2 + 1; 294 size = rv * 2 + 1;
291 get_gaussian_kernel (rv, size, kernel, params); 295 get_gaussian_kernel (rv, size, kernel, params);
292 ::swap (params[0], params[1]); 296 ::swap (params[0], params[1]);
293 297
294 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 298 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
295 XRenderComposite (dpy, 299 XRenderComposite (dpy,
296 PictOpSrc, 300 PictOpSrc,
297 tmp, 301 tmp,
298 None, 302 None,
299 dst, 303 dst,
… …
325 XFreePixmap (dpy, pixmap); 329 XFreePixmap (dpy, pixmap);
326 330
327 return mask; 331 return mask;
328} 332}
329 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
330void 353void
331rxvt_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)
332{ 355{
356 unshare ();
357
333 Display *dpy = s->display->dpy; 358 Display *dpy = s->display->dpy;
334 Picture src = create_xrender_mask (dpy, pm, True);
335 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 359 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
336 360
361 // loop should not be needed for brightness, as only -1..1 makes sense
362 //while (r | g | b | a)
363 {
364 unsigned short xr, xg, xb, xa;
337 XRenderColor mask_c; 365 XRenderColor mask_c;
338 mask_c.red = r; 366
339 mask_c.green = g; 367 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
340 mask_c.blue = b;
341 mask_c.alpha = a;
342 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 368 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
343 369
344 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 370 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
371 {
372 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
373 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
374 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
375 mask_c.green = -mask_c.green;
376 mask_c.blue = -mask_c.blue;
377 mask_c.alpha = -mask_c.alpha;
378 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
379 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
380 }
381 }
345 382
346 XRenderFreePicture (dpy, src); 383
347 XRenderFreePicture (dpy, dst); 384 XRenderFreePicture (dpy, dst);
348} 385}
349 386
350void 387void
351rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 388rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
352{ 389{
353 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 390 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
391 {
392 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
354 return; 393 return;
394 }
395
396 unshare ();
355 397
356 Display *dpy = s->display->dpy; 398 Display *dpy = s->display->dpy;
357 Picture src = create_xrender_mask (dpy, pm, True); 399 Picture src = create_xrender_mask (dpy, pm, True);
358 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 400 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
359 401
… …
402 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 444 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
403 return clone (); 445 return clone ();
404 446
405 Display *dpy = s->display->dpy; 447 Display *dpy = s->display->dpy;
406 448
449 // add an alpha channel if...
407 bool alpha = !format->direct.alphaMask 450 bool alpha = !format->direct.alphaMask // pixmap has none yet
408 && (x || y) 451 && (x || y) // we need one because of non-zero offset
409 && repeat == RepeatNone; 452 && repeat == RepeatNone; // and we have no good pixels to fill with
410 453
411 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 454 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
412 img->alloc (); 455 img->alloc ();
413 456
414 Picture src = src_picture (); 457 Picture src = src_picture ();
… …
464 507
465 for (int i = 0; i < 3; ++i) 508 for (int i = 0; i < 3; ++i)
466 for (int j = 0; j < 3; ++j) 509 for (int j = 0; j < 3; ++j)
467 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 510 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
468 511
469#if 0
470 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 512 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
471 xfrm.matrix [1][2] -= XDoubleToFixed (y); 513 xfrm.matrix [1][2] -= XDoubleToFixed (y);
472#endif
473 514
474 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 515 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
475 XRenderSetPictureTransform (dpy, src, &xfrm); 516 XRenderSetPictureTransform (dpy, src, &xfrm);
476 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 517 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
477 518

Diff Legend

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