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.60 by sf-exg, Fri Jun 8 10:12: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;
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
305 295
306 size = rv * 2 + 1; 296 size = rv * 2 + 1;
307 get_gaussian_kernel (rv, size, kernel, params); 297 get_gaussian_kernel (rv, size, kernel, params);
308 ::swap (params[0], params[1]); 298 ::swap (params[0], params[1]);
309 299
310 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 300 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
311 XRenderComposite (dpy, 301 XRenderComposite (dpy,
312 PictOpSrc, 302 PictOpSrc,
313 tmp, 303 tmp,
314 None, 304 None,
315 dst, 305 dst,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines