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.54 by root, Thu Jun 7 20:24:39 2012 UTC vs.
Revision 1.66 by root, Fri Jun 8 21:48:07 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;
… …
80 xi.width = width; 73 xi.width = width;
81 xi.height = height; 74 xi.height = height;
82 xi.xoffset = 0; 75 xi.xoffset = 0;
83 xi.format = ZPixmap; 76 xi.format = ZPixmap;
84 xi.byte_order = ImageByteOrder (dpy); 77 xi.byte_order = ImageByteOrder (dpy);
85 xi.bitmap_unit = 32; //XY only, unused 78 xi.bitmap_unit = 0; //XY only, unused
86 xi.bitmap_bit_order = LSBFirst; //XY only, unused 79 xi.bitmap_bit_order = 0; //XY only, unused
87 xi.bitmap_pad = BitmapPad (dpy); 80 xi.bitmap_pad = BitmapPad (dpy);
88 xi.depth = depth; 81 xi.depth = depth;
89 xi.bytes_per_line = 0; 82 xi.bytes_per_line = 0;
90 xi.bits_per_pixel = 32; //Z only 83 xi.bits_per_pixel = 32; //Z only
91 xi.red_mask = 0x00000000; //Z only, unused 84 xi.red_mask = 0x00000000; //Z only, unused
… …
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,
… …
342 330
343 return mask; 331 return mask;
344} 332}
345 333
346void 334void
347rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 335rxvt_img::brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a)
348{ 336{
349 Display *dpy = s->display->dpy; 337 Display *dpy = s->display->dpy;
350 Picture src = create_xrender_mask (dpy, pm, True); 338 Picture src = create_xrender_mask (dpy, pm, True);
351 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 339 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
352 340
… …
362 XRenderFreePicture (dpy, src); 350 XRenderFreePicture (dpy, src);
363 XRenderFreePicture (dpy, dst); 351 XRenderFreePicture (dpy, dst);
364} 352}
365 353
366void 354void
367rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 355rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a)
368{ 356{
369 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 357 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
358 {
359 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
370 return; 360 return;
361 }
371 362
372 Display *dpy = s->display->dpy; 363 Display *dpy = s->display->dpy;
373 Picture src = create_xrender_mask (dpy, pm, True); 364 Picture src = create_xrender_mask (dpy, pm, True);
374 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 365 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
375 366
… …
418 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 409 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
419 return clone (); 410 return clone ();
420 411
421 Display *dpy = s->display->dpy; 412 Display *dpy = s->display->dpy;
422 413
414 // add an alpha channel if...
423 bool alpha = !format->direct.alphaMask 415 bool alpha = !format->direct.alphaMask // pixmap has none yet
424 && (x || y) 416 && (x || y) // we need one because of non-zero offset
425 && repeat == RepeatNone; 417 && repeat == RepeatNone; // and we have no good pixels to fill with
426 418
427 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 419 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
428 img->alloc (); 420 img->alloc ();
429 421
430 Picture src = src_picture (); 422 Picture src = src_picture ();
… …
480 472
481 for (int i = 0; i < 3; ++i) 473 for (int i = 0; i < 3; ++i)
482 for (int j = 0; j < 3; ++j) 474 for (int j = 0; j < 3; ++j)
483 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 475 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
484 476
485#if 0
486 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 477 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
487 xfrm.matrix [1][2] -= XDoubleToFixed (y); 478 xfrm.matrix [1][2] -= XDoubleToFixed (y);
488#endif
489 479
490 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 480 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
491 XRenderSetPictureTransform (dpy, src, &xfrm); 481 XRenderSetPictureTransform (dpy, src, &xfrm);
492 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 482 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
493 483

Diff Legend

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