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.47 by root, Thu Jun 7 19:06:26 2012 UTC vs.
Revision 1.73 by sf-exg, Sat Jun 9 17:28:03 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{
58 Display *dpy = s->display->dpy;
59
64 int width = gdk_pixbuf_get_width (pb); 60 int width = gdk_pixbuf_get_width (pb);
65 int height = gdk_pixbuf_get_height (pb); 61 int height = gdk_pixbuf_get_height (pb);
66 62
67 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 63 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
68 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");
69 65
70 // since we require rgb24/argb32 formats from xrender we assume 66 // since we require rgb24/argb32 formats from xrender we assume
71 // 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
72 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24; 68 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
69
70 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
73 71
74 XImage xi; 72 XImage xi;
75 73
76 xi.width = width; 74 xi.width = width;
77 xi.height = height; 75 xi.height = height;
78 xi.xoffset = 0; 76 xi.xoffset = 0;
79 xi.format = ZPixmap; 77 xi.format = ZPixmap;
80 xi.byte_order = MSBFirst; // maybe go for host byte order, because servers are usually local? 78 xi.byte_order = ImageByteOrder (dpy);
81 xi.bitmap_unit = 32; 79 xi.bitmap_unit = 0; //XY only, unused
82 xi.bitmap_bit_order = MSBFirst; 80 xi.bitmap_bit_order = 0; //XY only, unused
83 xi.bitmap_pad = 32; 81 xi.bitmap_pad = BitmapPad (dpy);
84 xi.depth = depth; 82 xi.depth = depth;
85 xi.bytes_per_line = 0; 83 xi.bytes_per_line = 0;
86 xi.bits_per_pixel = 32; 84 xi.bits_per_pixel = 32; //Z only
87 xi.red_mask = 0x00ff0000; 85 xi.red_mask = 0x00000000; //Z only, unused
88 xi.green_mask = 0x0000ff00; 86 xi.green_mask = 0x00000000; //Z only, unused
89 xi.blue_mask = 0x000000ff; 87 xi.blue_mask = 0x00000000; //Z only, unused
88 xi.obdata = 0; // probably unused
89
90 bool byte_order_mismatch = byte_order != xi.byte_order;
90 91
91 if (!XInitImage (&xi)) 92 if (!XInitImage (&xi))
92 rxvt_fatal ("unable to initialise ximage, please report.\n"); 93 rxvt_fatal ("unable to initialise ximage, please report.\n");
93 94
94 if (height > INT_MAX / xi.bytes_per_line) 95 if (height > INT_MAX / xi.bytes_per_line)
… …
102 unsigned char *row = gdk_pixbuf_get_pixels (pb); 103 unsigned char *row = gdk_pixbuf_get_pixels (pb);
103 char *line = xi.data; 104 char *line = xi.data;
104 105
105 for (int y = 0; y < height; y++) 106 for (int y = 0; y < height; y++)
106 { 107 {
107 unsigned char r, g, b, a;
108 unsigned char *data = row; 108 unsigned char *src = row;
109 uint32_t *dst = (uint32_t *)line;
109 110
110 if (depth == 24) 111 if (depth == 24)
111 for (int x = 0; x < width; x++) 112 for (int x = 0; x < width; x++)
112 { 113 {
113 r = *data++; 114 uint8_t r = *src++;
114 g = *data++; 115 uint8_t g = *src++;
115 b = *data++; 116 uint8_t b = *src++;
117
118 uint32_t v = (r << 16) | (g << 8) | b;
119
120 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
121 v = ecb_bswap32 (v);
122
116 *line++ = 0; 123 *dst++ = v;
117 *line++ = r;
118 *line++ = g;
119 *line++ = b;
120 } 124 }
121 else 125 else
122 for (int x = 0; x < width; x++) 126 for (int x = 0; x < width; x++)
123 { 127 {
124 r = *data++; 128 uint32_t v = *(uint32_t *)src; src += 4;
125 g = *data++; 129
126 b = *data++; 130 if (ecb_big_endian ())
127 a = *data++; 131 v = ecb_bswap32 (v);
132
133 v = ecb_rotl32 (v, 8); // abgr to bgra
134
135 if (!byte_order_mismatch)
136 v = ecb_bswap32 (v);
137
128 *line++ = a; 138 *dst++ = v;
129 *line++ = r;
130 *line++ = g;
131 *line++ = b;
132 } 139 }
133 140
134 row += rowstride; 141 row += rowstride;
142 line += xi.bytes_per_line;
135 } 143 }
136
137 Display *dpy = s->display->dpy;
138 144
139 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height); 145 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
140 img->alloc (); 146 img->alloc ();
141 147
142 GC gc = XCreateGC (dpy, img->pm, 0, 0); 148 GC gc = XCreateGC (dpy, img->pm, 0, 0);
… …
161 167
162 g_object_unref (pb); 168 g_object_unref (pb);
163 169
164 return img; 170 return img;
165} 171}
172# endif
166 173
167void 174void
168rxvt_img::destroy () 175rxvt_img::destroy ()
169{ 176{
170 if (--ref->cnt) 177 if (--ref->cnt)
… …
204rxvt_img::unshare () 211rxvt_img::unshare ()
205{ 212{
206 if (ref->cnt == 1 && ref->ours) 213 if (ref->cnt == 1 && ref->ours)
207 return; 214 return;
208 215
209 //TODO: maybe should reify instead
210 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 216 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
211 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 217 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
212 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 218 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
213 XFreeGC (s->display->dpy, gc); 219 XFreeGC (s->display->dpy, gc);
214 220
… …
260 double *kernel = (double *)malloc (size * sizeof (double)); 266 double *kernel = (double *)malloc (size * sizeof (double));
261 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 267 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
262 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 268 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
263 img->alloc (); 269 img->alloc ();
264 270
265 Picture src = src_picture ();
266
267 XRenderPictureAttributes pa; 271 XRenderPictureAttributes pa;
268 pa.repeat = RepeatPad; 272 pa.repeat = RepeatPad;
269 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 273 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
274 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
270 275
271 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 276 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
272 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 277 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
273 XFreePixmap (dpy, tmp_pm); 278 XFreePixmap (dpy, tmp_pm);
274 279
… …
290 295
291 size = rv * 2 + 1; 296 size = rv * 2 + 1;
292 get_gaussian_kernel (rv, size, kernel, params); 297 get_gaussian_kernel (rv, size, kernel, params);
293 ::swap (params[0], params[1]); 298 ::swap (params[0], params[1]);
294 299
295 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 300 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
296 XRenderComposite (dpy, 301 XRenderComposite (dpy,
297 PictOpSrc, 302 PictOpSrc,
298 tmp, 303 tmp,
299 None, 304 None,
300 dst, 305 dst,
… …
311 XRenderFreePicture (dpy, tmp); 316 XRenderFreePicture (dpy, tmp);
312 317
313 return img; 318 return img;
314} 319}
315 320
316static Picture 321static void
317create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 322extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
318{ 323{
319 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 324 int32_t x = clamp (c, cl0, cl1);
325 c -= x;
326 xc = x;
327}
320 328
321 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 329static bool
322 XRenderPictureAttributes pa; 330extract (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)
323 pa.repeat = True; 331{
324 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 332 extract (cl0, cl1, r, xr);
333 extract (cl0, cl1, g, xg);
334 extract (cl0, cl1, b, xb);
335 extract (cl0, cl1, a, xa);
325 336
326 XFreePixmap (dpy, pixmap); 337 return xr | xg | xb | xa;
327
328 return mask;
329} 338}
330 339
331void 340void
332rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 341rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
333{ 342{
343 unshare ();
344
334 Display *dpy = s->display->dpy; 345 Display *dpy = s->display->dpy;
335 Picture src = create_xrender_mask (dpy, pm, True); 346 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
347
348 // loop should not be needed for brightness, as only -1..1 makes sense
349 //while (r | g | b | a)
350 {
351 unsigned short xr, xg, xb, xa;
352 XRenderColor mask_c;
353
354 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
355 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
356
357 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
358 {
359 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
360 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
361 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
362 mask_c.green = -mask_c.green;
363 mask_c.blue = -mask_c.blue;
364 mask_c.alpha = -mask_c.alpha;
365 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
366 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
367 }
368 }
369
370
371 XRenderFreePicture (dpy, dst);
372}
373
374void
375rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
376{
377 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
378 {
379 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
380 return;
381 }
382
383 unshare ();
384
385 Display *dpy = s->display->dpy;
336 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 386 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
337 387
338 XRenderColor mask_c; 388 XRenderColor mask_c;
339 mask_c.red = r; 389 mask_c.red = r;
340 mask_c.green = g; 390 mask_c.green = g;
341 mask_c.blue = b; 391 mask_c.blue = b;
342 mask_c.alpha = a; 392 mask_c.alpha = a;
343 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 393 XRenderFillRectangle (dpy, PictOpMultiply, dst, &mask_c, 0, 0, w, h);
344 394
345 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
346
347 XRenderFreePicture (dpy, src);
348 XRenderFreePicture (dpy, dst);
349}
350
351void
352rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
353{
354 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
355 return;
356
357 Display *dpy = s->display->dpy;
358 Picture src = create_xrender_mask (dpy, pm, True);
359 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
360
361 XRenderColor mask_c;
362 mask_c.red = r;
363 mask_c.green = g;
364 mask_c.blue = b;
365 mask_c.alpha = a;
366 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
367
368 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
369
370 XRenderFreePicture (dpy, src);
371 XRenderFreePicture (dpy, dst); 395 XRenderFreePicture (dpy, dst);
372} 396}
373 397
374rxvt_img * 398rxvt_img *
375rxvt_img::clone () 399rxvt_img::clone ()
… …
403 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 427 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
404 return clone (); 428 return clone ();
405 429
406 Display *dpy = s->display->dpy; 430 Display *dpy = s->display->dpy;
407 431
432 // add an alpha channel if...
408 bool alpha = !format->direct.alphaMask 433 bool alpha = !format->direct.alphaMask // pixmap has none yet
409 && (x || y) 434 && (x || y) // we need one because of non-zero offset
410 && repeat == RepeatNone; 435 && repeat == RepeatNone; // and we have no good pixels to fill with
411 436
412 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 437 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
413 img->alloc (); 438 img->alloc ();
414 439
415 Picture src = src_picture (); 440 Picture src = src_picture ();
… …
465 490
466 for (int i = 0; i < 3; ++i) 491 for (int i = 0; i < 3; ++i)
467 for (int j = 0; j < 3; ++j) 492 for (int j = 0; j < 3; ++j)
468 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 493 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
469 494
470#if 0
471 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 495 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
472 xfrm.matrix [1][2] -= XDoubleToFixed (y); 496 xfrm.matrix [1][2] -= XDoubleToFixed (y);
473#endif
474 497
475 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 498 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
476 XRenderSetPictureTransform (dpy, src, &xfrm); 499 XRenderSetPictureTransform (dpy, src, &xfrm);
477 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 500 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
478 501
… …
559{ 582{
560 rxvt_img *img2 = clone (); 583 rxvt_img *img2 = clone ();
561 Display *dpy = s->display->dpy; 584 Display *dpy = s->display->dpy;
562 Picture src = img->src_picture (); 585 Picture src = img->src_picture ();
563 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 586 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
564 Picture mask = create_xrender_mask (dpy, img->pm, False); 587
588 Pixmap pixmap = XCreatePixmap (dpy, img->pm, 1, 1, 8);
589 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, PictStandardA8);
590 XRenderPictureAttributes pa;
591 pa.repeat = True;
592 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
593 XFreePixmap (dpy, pixmap);
565 594
566 XRenderColor mask_c; 595 XRenderColor mask_c;
567 596
568 mask_c.alpha = float_to_component (factor); 597 mask_c.alpha = float_to_component (factor);
569 mask_c.red = 598 mask_c.red =

Diff Legend

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