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.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;
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 }
289 295
290 size = rv * 2 + 1; 296 size = rv * 2 + 1;
291 get_gaussian_kernel (rv, size, kernel, params); 297 get_gaussian_kernel (rv, size, kernel, params);
292 ::swap (params[0], params[1]); 298 ::swap (params[0], params[1]);
293 299
294 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 300 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
295 XRenderComposite (dpy, 301 XRenderComposite (dpy,
296 PictOpSrc, 302 PictOpSrc,
297 tmp, 303 tmp,
298 None, 304 None,
299 dst, 305 dst,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines