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.51 by root, Thu Jun 7 20:04:54 2012 UTC vs.
Revision 1.63 by root, Fri Jun 8 20:35:43 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 = 0x000000ff; //Z only 84 xi.red_mask = 0x00000000; //Z only, unused
90 xi.green_mask = 0x0000ff00; //Z only 85 xi.green_mask = 0x00000000; //Z only, unused
91 xi.blue_mask = 0x00ff0000; //Z only 86 xi.blue_mask = 0x00000000; //Z only, unused
92 xi.obdata = 0; // probbaly unused 87 xi.obdata = 0; // probably unused
88
89 bool byte_order_mismatch = byte_order != xi.byte_order;
93 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)
… …
115 { 112 {
116 uint8_t r = *src++; 113 uint8_t r = *src++;
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 | (g << 8) | (b << 16); 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
… …
130 uint32_t v = *(uint32_t *)src; src += 4; 127 uint32_t v = *(uint32_t *)src; src += 4;
131 128
132 if (ecb_big_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_bswap32 (v);
136
135 *dst++ = v; 137 *dst++ = v;
136 } 138 }
137 139
138 row += rowstride; 140 row += rowstride;
139 line += xi.bytes_per_line; 141 line += xi.bytes_per_line;
… …
263 double *kernel = (double *)malloc (size * sizeof (double)); 265 double *kernel = (double *)malloc (size * sizeof (double));
264 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 266 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
265 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 267 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
266 img->alloc (); 268 img->alloc ();
267 269
268 Picture src = src_picture ();
269
270 XRenderPictureAttributes pa; 270 XRenderPictureAttributes pa;
271 pa.repeat = RepeatPad; 271 pa.repeat = RepeatPad;
272 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 272 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
273 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
273 274
274 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 275 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
275 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 276 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
276 XFreePixmap (dpy, tmp_pm); 277 XFreePixmap (dpy, tmp_pm);
277 278
… …
293 294
294 size = rv * 2 + 1; 295 size = rv * 2 + 1;
295 get_gaussian_kernel (rv, size, kernel, params); 296 get_gaussian_kernel (rv, size, kernel, params);
296 ::swap (params[0], params[1]); 297 ::swap (params[0], params[1]);
297 298
298 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 299 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
299 XRenderComposite (dpy, 300 XRenderComposite (dpy,
300 PictOpSrc, 301 PictOpSrc,
301 tmp, 302 tmp,
302 None, 303 None,
303 dst, 304 dst,
… …
330 331
331 return mask; 332 return mask;
332} 333}
333 334
334void 335void
335rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 336rxvt_img::brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a)
336{ 337{
337 Display *dpy = s->display->dpy; 338 Display *dpy = s->display->dpy;
338 Picture src = create_xrender_mask (dpy, pm, True); 339 Picture src = create_xrender_mask (dpy, pm, True);
339 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 340 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
340 341
… …
350 XRenderFreePicture (dpy, src); 351 XRenderFreePicture (dpy, src);
351 XRenderFreePicture (dpy, dst); 352 XRenderFreePicture (dpy, dst);
352} 353}
353 354
354void 355void
355rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 356rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a)
356{ 357{
357 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 358 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
358 return; 359 return;
359 360
360 Display *dpy = s->display->dpy; 361 Display *dpy = s->display->dpy;
… …
406 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 407 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
407 return clone (); 408 return clone ();
408 409
409 Display *dpy = s->display->dpy; 410 Display *dpy = s->display->dpy;
410 411
412 // add an alpha channel if...
411 bool alpha = !format->direct.alphaMask 413 bool alpha = !format->direct.alphaMask // pixmap has none yet
412 && (x || y) 414 && (x || y) // we need one because of non-zero offset
413 && repeat == RepeatNone; 415 && repeat == RepeatNone; // and we have no good pixels to fill with
414 416
415 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 417 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
416 img->alloc (); 418 img->alloc ();
417 419
418 Picture src = src_picture (); 420 Picture src = src_picture ();

Diff Legend

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