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.53 by root, Thu Jun 7 20:22:40 2012 UTC vs.
Revision 1.65 by root, Fri Jun 8 21:41:45 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; //XY only, unused 78 xi.bitmap_unit = 0; //XY only, unused
84 xi.bitmap_bit_order = LSBFirst; //XY only, unused 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; //Z only 83 xi.bits_per_pixel = 32; //Z only
89 xi.red_mask = 0x00000000; //Z only, unused 84 xi.red_mask = 0x00000000; //Z only, unused
90 xi.green_mask = 0x00000000; //Z only, unused 85 xi.green_mask = 0x00000000; //Z only, unused
91 xi.blue_mask = 0x00000000; //Z only, unused 86 xi.blue_mask = 0x00000000; //Z only, unused
92 xi.obdata = 0; // probably unused 87 xi.obdata = 0; // probably unused
93 88
89 bool byte_order_mismatch = byte_order != xi.byte_order;
90
94 if (!XInitImage (&xi)) 91 if (!XInitImage (&xi))
95 rxvt_fatal ("unable to initialise ximage, please report.\n"); 92 rxvt_fatal ("unable to initialise ximage, please report.\n");
96 93
97 if (height > INT_MAX / xi.bytes_per_line) 94 if (height > INT_MAX / xi.bytes_per_line)
98 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n"); 95 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
… …
117 uint8_t g = *src++; 114 uint8_t g = *src++;
118 uint8_t b = *src++; 115 uint8_t b = *src++;
119 116
120 uint32_t v = (r << 16) | (g << 8) | b; 117 uint32_t v = (r << 16) | (g << 8) | b;
121 118
122 if (ecb_big_endian ()) 119 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
123 v = ecb_bswap32 (v); 120 v = ecb_bswap32 (v);
124 121
125 *dst++ = v; 122 *dst++ = v;
126 } 123 }
127 else 124 else
128 for (int x = 0; x < width; x++) 125 for (int x = 0; x < width; x++)
129 { 126 {
130 uint32_t v = *(uint32_t *)src; src += 4; 127 uint32_t v = *(uint32_t *)src; src += 4;
131 128
132 if (ecb_little_endian ()) 129 if (ecb_big_endian ())
133 v = ecb_bswap32 (v); 130 v = ecb_bswap32 (v);
134 131
132 v = ecb_rotl32 (v, 8); // abgr to bgra
133
134 if (!byte_order_mismatch)
135 v = ecb_rotr32 (v, 8); 135 v = ecb_bswap32 (v);
136 136
137 *dst++ = v; 137 *dst++ = v;
138 } 138 }
139 139
140 row += rowstride; 140 row += rowstride;
… …
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,
… …
332 330
333 return mask; 331 return mask;
334} 332}
335 333
336void 334void
337rxvt_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)
338{ 336{
339 Display *dpy = s->display->dpy; 337 Display *dpy = s->display->dpy;
340 Picture src = create_xrender_mask (dpy, pm, True); 338 Picture src = create_xrender_mask (dpy, pm, True);
341 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 339 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
342 340
… …
352 XRenderFreePicture (dpy, src); 350 XRenderFreePicture (dpy, src);
353 XRenderFreePicture (dpy, dst); 351 XRenderFreePicture (dpy, dst);
354} 352}
355 353
356void 354void
357rxvt_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)
358{ 356{
359 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");
360 return; 360 return;
361 }
361 362
362 Display *dpy = s->display->dpy; 363 Display *dpy = s->display->dpy;
363 Picture src = create_xrender_mask (dpy, pm, True); 364 Picture src = create_xrender_mask (dpy, pm, True);
364 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 365 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
365 366
… …
408 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 409 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
409 return clone (); 410 return clone ();
410 411
411 Display *dpy = s->display->dpy; 412 Display *dpy = s->display->dpy;
412 413
414 // add an alpha channel if...
413 bool alpha = !format->direct.alphaMask 415 bool alpha = !format->direct.alphaMask // pixmap has none yet
414 && (x || y) 416 && (x || y) // we need one because of non-zero offset
415 && repeat == RepeatNone; 417 && repeat == RepeatNone; // and we have no good pixels to fill with
416 418
417 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);
418 img->alloc (); 420 img->alloc ();
419 421
420 Picture src = src_picture (); 422 Picture src = src_picture ();

Diff Legend

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