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.76 by root, Sun Jun 10 10:29:26 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;
… …
56 img->ref->ours = false; 49 img->ref->ours = false;
57 50
58 return img; 51 return img;
59} 52}
60 53
54# if HAVE_PIXBUF
61rxvt_img * 55rxvt_img *
62rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 56rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
63{ 57{
64 Display *dpy = s->display->dpy; 58 Display *dpy = s->display->dpy;
65 59
… …
69 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 63 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
70 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n"); 64 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
71 65
72 // since we require rgb24/argb32 formats from xrender we assume 66 // 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 67 // 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; 68
69 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
75 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 = 32;
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)
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");
99 96
100 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); 97 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
101 98
102 int rowstride = gdk_pixbuf_get_rowstride (pb); 99 int rowstride = gdk_pixbuf_get_rowstride (pb);
103 100 bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
104 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
105 unsigned char *row = gdk_pixbuf_get_pixels (pb); 101 unsigned char *row = gdk_pixbuf_get_pixels (pb);
102
106 char *line = xi.data; 103 char *line = xi.data;
107 104
108 for (int y = 0; y < height; y++) 105 for (int y = 0; y < height; y++)
109 { 106 {
110 unsigned char *src = row; 107 unsigned char *src = row;
111 uint32_t *dst = (uint32_t *)line; 108 uint32_t *dst = (uint32_t *)line;
112 109
113 if (depth == 24) 110 if (!pb_has_alpha)
114 for (int x = 0; x < width; x++) 111 for (int x = 0; x < width; x++)
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 = (255 << 24) | (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;
140 } 142 }
141 143
142 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height); 144 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
143 img->alloc (); 145 img->alloc ();
144 146
145 GC gc = XCreateGC (dpy, img->pm, 0, 0); 147 GC gc = XCreateGC (dpy, img->pm, 0, 0);
146 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height); 148 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
147 XFreeGC (dpy, gc); 149 XFreeGC (dpy, gc);
… …
164 166
165 g_object_unref (pb); 167 g_object_unref (pb);
166 168
167 return img; 169 return img;
168} 170}
171# endif
169 172
170void 173void
171rxvt_img::destroy () 174rxvt_img::destroy ()
172{ 175{
173 if (--ref->cnt) 176 if (--ref->cnt)
… …
207rxvt_img::unshare () 210rxvt_img::unshare ()
208{ 211{
209 if (ref->cnt == 1 && ref->ours) 212 if (ref->cnt == 1 && ref->ours)
210 return; 213 return;
211 214
212 //TODO: maybe should reify instead
213 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 215 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
214 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 216 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
215 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 217 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
216 XFreeGC (s->display->dpy, gc); 218 XFreeGC (s->display->dpy, gc);
217 219
… …
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,
… …
315 316
316 return img; 317 return img;
317} 318}
318 319
319static Picture 320static Picture
320create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 321create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
321{ 322{
322 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 323 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
323 324
324 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 325 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
325 XRenderPictureAttributes pa; 326 XRenderPictureAttributes pa;
326 pa.repeat = True; 327 pa.repeat = RepeatNormal;
328 pa.component_alpha = component_alpha;
327 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 329 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
328 330
329 XFreePixmap (dpy, pixmap); 331 XFreePixmap (dpy, pixmap);
330 332
331 return mask; 333 return mask;
332} 334}
333 335
336static void
337extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
338{
339 int32_t x = clamp (c, cl0, cl1);
340 c -= x;
341 xc = x;
342}
343
344static bool
345extract (int32_t cl0, int32_t cl1, int32_t &r, int32_t &g, int32_t &b, int32_t &a, unsigned short &xr, unsigned short &xg, unsigned short &xb, unsigned short &xa)
346{
347 extract (cl0, cl1, r, xr);
348 extract (cl0, cl1, g, xg);
349 extract (cl0, cl1, b, xb);
350 extract (cl0, cl1, a, xa);
351
352 return xr | xg | xb | xa;
353}
354
334void 355void
335rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 356rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
336{ 357{
358 unshare ();
359
337 Display *dpy = s->display->dpy; 360 Display *dpy = s->display->dpy;
338 Picture src = create_xrender_mask (dpy, pm, True);
339 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 361 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
340 362
363 // loop should not be needed for brightness, as only -1..1 makes sense
364 //while (r | g | b | a)
365 {
366 unsigned short xr, xg, xb, xa;
341 XRenderColor mask_c; 367 XRenderColor mask_c;
342 mask_c.red = r; 368
343 mask_c.green = g; 369 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
344 mask_c.blue = b; 370 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
345 mask_c.alpha = a; 371
372 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
373 {
374 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
375 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
376 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
377 mask_c.green = -mask_c.green;
378 mask_c.blue = -mask_c.blue;
379 mask_c.alpha = -mask_c.alpha;
380 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
381 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
382 }
383 }
384
385 XRenderFreePicture (dpy, dst);
386}
387
388void
389rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
390{
391 if (r < 0 || g < 0 || b < 0 || a < 0)
392 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
393
394 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
395 img->alloc ();
396
397 {
398 rxvt_color empty;
399 empty.set (s, rgba (0, 0, 0, 0));
400 img->fill (empty);
401 }
402
403 // premultiply (yeah, these are not exact, sue me or fix it)
404 r = (r * (a >> 8)) >> 8;
405 g = (g * (a >> 8)) >> 8;
406 b = (b * (a >> 8)) >> 8;
407
408 Display *dpy = s->display->dpy;
409
410 Picture src = src_picture ();
411 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
412 Picture mul = create_xrender_mask (dpy, pm, True, True);
413
414 //TODO: this operator does not yet implement some useful contrast
415 while (r | g | b | a)
416 {
417 unsigned short xr, xg, xb, xa;
418 XRenderColor mask_c;
419
420 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
421 {
346 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 422 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
347
348 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 423 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
424 }
425 }
349 426
427 XRenderFreePicture (dpy, mul);
428 XRenderFreePicture (dpy, dst);
350 XRenderFreePicture (dpy, src); 429 XRenderFreePicture (dpy, src);
351 XRenderFreePicture (dpy, dst);
352}
353 430
354void 431 ::swap (img->ref, ref);
355rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 432 ::swap (img->pm , pm );
356{
357 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
358 return;
359 433
360 Display *dpy = s->display->dpy; 434 delete img;
361 Picture src = create_xrender_mask (dpy, pm, True);
362 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
363
364 XRenderColor mask_c;
365 mask_c.red = r;
366 mask_c.green = g;
367 mask_c.blue = b;
368 mask_c.alpha = a;
369 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
370
371 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
372
373 XRenderFreePicture (dpy, src);
374 XRenderFreePicture (dpy, dst);
375} 435}
376 436
377rxvt_img * 437rxvt_img *
378rxvt_img::clone () 438rxvt_img::clone ()
379{ 439{
… …
406 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 466 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
407 return clone (); 467 return clone ();
408 468
409 Display *dpy = s->display->dpy; 469 Display *dpy = s->display->dpy;
410 470
471 // add an alpha channel if...
411 bool alpha = !format->direct.alphaMask 472 bool alpha = !format->direct.alphaMask // pixmap has none yet
412 && (x || y) 473 && (x || y) // we need one because of non-zero offset
413 && repeat == RepeatNone; 474 && repeat == RepeatNone; // and we have no good pixels to fill with
414 475
415 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 476 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
416 img->alloc (); 477 img->alloc ();
417 478
418 Picture src = src_picture (); 479 Picture src = src_picture ();
… …
468 529
469 for (int i = 0; i < 3; ++i) 530 for (int i = 0; i < 3; ++i)
470 for (int j = 0; j < 3; ++j) 531 for (int j = 0; j < 3; ++j)
471 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 532 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
472 533
473#if 0
474 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 534 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
475 xfrm.matrix [1][2] -= XDoubleToFixed (y); 535 xfrm.matrix [1][2] -= XDoubleToFixed (y);
476#endif
477 536
478 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 537 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
479 XRenderSetPictureTransform (dpy, src, &xfrm); 538 XRenderSetPictureTransform (dpy, src, &xfrm);
480 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 539 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
481 540
… …
562{ 621{
563 rxvt_img *img2 = clone (); 622 rxvt_img *img2 = clone ();
564 Display *dpy = s->display->dpy; 623 Display *dpy = s->display->dpy;
565 Picture src = img->src_picture (); 624 Picture src = img->src_picture ();
566 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 625 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
567 Picture mask = create_xrender_mask (dpy, img->pm, False); 626 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
568 627
569 XRenderColor mask_c; 628 XRenderColor mask_c;
570 629
571 mask_c.alpha = float_to_component (factor); 630 mask_c.alpha = float_to_component (factor);
572 mask_c.red = 631 mask_c.red =

Diff Legend

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