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.48 by root, Thu Jun 7 19:24:02 2012 UTC vs.
Revision 1.74 by root, Sat Jun 9 19:20:04 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
… …
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 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
69
70 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
75 71
76 XImage xi; 72 XImage xi;
77 73
78 xi.width = width; 74 xi.width = width;
79 xi.height = height; 75 xi.height = height;
80 xi.xoffset = 0; 76 xi.xoffset = 0;
81 xi.format = ZPixmap; 77 xi.format = ZPixmap;
82 xi.byte_order = MSBFirst; // maybe go for host byte order, because servers are usually local? 78 xi.byte_order = ImageByteOrder (dpy);
83 xi.bitmap_unit = 32; 79 xi.bitmap_unit = 0; //XY only, unused
84 xi.bitmap_bit_order = MSBFirst; 80 xi.bitmap_bit_order = 0; //XY only, unused
85 xi.bitmap_pad = BitmapPad (dpy); 81 xi.bitmap_pad = BitmapPad (dpy);
86 xi.depth = depth; 82 xi.depth = depth;
87 xi.bytes_per_line = 0; 83 xi.bytes_per_line = 0;
88 xi.bits_per_pixel = 32; 84 xi.bits_per_pixel = 32; //Z only
89 xi.red_mask = 0x00ff0000; 85 xi.red_mask = 0x00000000; //Z only, unused
90 xi.green_mask = 0x0000ff00; 86 xi.green_mask = 0x00000000; //Z only, unused
91 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;
92 91
93 if (!XInitImage (&xi)) 92 if (!XInitImage (&xi))
94 rxvt_fatal ("unable to initialise ximage, please report.\n"); 93 rxvt_fatal ("unable to initialise ximage, please report.\n");
95 94
96 if (height > INT_MAX / xi.bytes_per_line) 95 if (height > INT_MAX / xi.bytes_per_line)
… …
104 unsigned char *row = gdk_pixbuf_get_pixels (pb); 103 unsigned char *row = gdk_pixbuf_get_pixels (pb);
105 char *line = xi.data; 104 char *line = xi.data;
106 105
107 for (int y = 0; y < height; y++) 106 for (int y = 0; y < height; y++)
108 { 107 {
109 unsigned char r, g, b, a;
110 unsigned char *data = row; 108 unsigned char *src = row;
109 uint32_t *dst = (uint32_t *)line;
111 110
112 if (depth == 24) 111 if (depth == 24)
113 for (int x = 0; x < width; x++) 112 for (int x = 0; x < width; x++)
114 { 113 {
115 asm volatile("nop"); 114 uint8_t r = *src++;
116 r = *data++; 115 uint8_t g = *src++;
117 g = *data++; 116 uint8_t b = *src++;
118 b = *data++; 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
119 *line++ = 0; 123 *dst++ = v;
120 *line++ = r;
121 *line++ = g;
122 *line++ = b;
123 asm volatile("nop");
124 } 124 }
125 else 125 else
126 for (int x = 0; x < width; x++) 126 for (int x = 0; x < width; x++)
127 { 127 {
128 uint32_t v = *(uint32_t *)data; data += 4; 128 uint32_t v = *(uint32_t *)src; src += 4;
129 v = ecb_big_endian () ? ecb_rotr32 (v, 8) : ecb_rotl32 (v, 8); 129
130 *(uint32_t *)line = x; line += 4; 130 if (ecb_big_endian ())
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
138 *dst++ = v;
131 } 139 }
132 140
133 row += rowstride; 141 row += rowstride;
142 line += xi.bytes_per_line;
134 } 143 }
135 144
136 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);
137 img->alloc (); 146 img->alloc ();
138 147
… …
158 167
159 g_object_unref (pb); 168 g_object_unref (pb);
160 169
161 return img; 170 return img;
162} 171}
172# endif
163 173
164void 174void
165rxvt_img::destroy () 175rxvt_img::destroy ()
166{ 176{
167 if (--ref->cnt) 177 if (--ref->cnt)
… …
201rxvt_img::unshare () 211rxvt_img::unshare ()
202{ 212{
203 if (ref->cnt == 1 && ref->ours) 213 if (ref->cnt == 1 && ref->ours)
204 return; 214 return;
205 215
206 //TODO: maybe should reify instead
207 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);
208 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 217 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
209 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);
210 XFreeGC (s->display->dpy, gc); 219 XFreeGC (s->display->dpy, gc);
211 220
… …
257 double *kernel = (double *)malloc (size * sizeof (double)); 266 double *kernel = (double *)malloc (size * sizeof (double));
258 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 267 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
259 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);
260 img->alloc (); 269 img->alloc ();
261 270
262 Picture src = src_picture ();
263
264 XRenderPictureAttributes pa; 271 XRenderPictureAttributes pa;
265 pa.repeat = RepeatPad; 272 pa.repeat = RepeatPad;
266 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);
267 275
268 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 276 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
269 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 277 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
270 XFreePixmap (dpy, tmp_pm); 278 XFreePixmap (dpy, tmp_pm);
271 279
… …
287 295
288 size = rv * 2 + 1; 296 size = rv * 2 + 1;
289 get_gaussian_kernel (rv, size, kernel, params); 297 get_gaussian_kernel (rv, size, kernel, params);
290 ::swap (params[0], params[1]); 298 ::swap (params[0], params[1]);
291 299
292 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 300 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
293 XRenderComposite (dpy, 301 XRenderComposite (dpy,
294 PictOpSrc, 302 PictOpSrc,
295 tmp, 303 tmp,
296 None, 304 None,
297 dst, 305 dst,
… …
315{ 323{
316 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 324 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
317 325
318 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 326 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
319 XRenderPictureAttributes pa; 327 XRenderPictureAttributes pa;
320 pa.repeat = True; 328 pa.repeat = RepeatNormal;
321 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 329 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
322 330
323 XFreePixmap (dpy, pixmap); 331 XFreePixmap (dpy, pixmap);
324 332
325 return mask; 333 return mask;
326} 334}
327 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
328void 355void
329rxvt_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)
330{ 357{
358 unshare ();
359
331 Display *dpy = s->display->dpy; 360 Display *dpy = s->display->dpy;
332 Picture src = create_xrender_mask (dpy, pm, True);
333 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 361 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
334 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;
335 XRenderColor mask_c; 367 XRenderColor mask_c;
336 mask_c.red = r; 368
337 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))
338 mask_c.blue = b; 370 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
339 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);
413
414 XRenderPictureAttributes pa;
415 pa.component_alpha = 1;
416 XRenderChangePicture (dpy, mul, CPComponentAlpha, &pa);
417
418 //TODO: this operator does not yet implement some useful contrast
419 while (r | g | b | a)
420 {
421 unsigned short xr, xg, xb, xa;
422 XRenderColor mask_c;
423
424 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
425 {
340 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 426 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
341
342 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 427 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
428 }
429 }
343 430
431 XRenderFreePicture (dpy, mul);
432 XRenderFreePicture (dpy, dst);
344 XRenderFreePicture (dpy, src); 433 XRenderFreePicture (dpy, src);
345 XRenderFreePicture (dpy, dst);
346}
347 434
348void 435 ::swap (img->ref, ref);
349rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 436 ::swap (img->pm , pm );
350{
351 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
352 return;
353 437
354 Display *dpy = s->display->dpy; 438 delete img;
355 Picture src = create_xrender_mask (dpy, pm, True);
356 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
357
358 XRenderColor mask_c;
359 mask_c.red = r;
360 mask_c.green = g;
361 mask_c.blue = b;
362 mask_c.alpha = a;
363 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
364
365 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
366
367 XRenderFreePicture (dpy, src);
368 XRenderFreePicture (dpy, dst);
369} 439}
370 440
371rxvt_img * 441rxvt_img *
372rxvt_img::clone () 442rxvt_img::clone ()
373{ 443{
… …
400 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 470 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
401 return clone (); 471 return clone ();
402 472
403 Display *dpy = s->display->dpy; 473 Display *dpy = s->display->dpy;
404 474
475 // add an alpha channel if...
405 bool alpha = !format->direct.alphaMask 476 bool alpha = !format->direct.alphaMask // pixmap has none yet
406 && (x || y) 477 && (x || y) // we need one because of non-zero offset
407 && repeat == RepeatNone; 478 && repeat == RepeatNone; // and we have no good pixels to fill with
408 479
409 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 480 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
410 img->alloc (); 481 img->alloc ();
411 482
412 Picture src = src_picture (); 483 Picture src = src_picture ();
… …
462 533
463 for (int i = 0; i < 3; ++i) 534 for (int i = 0; i < 3; ++i)
464 for (int j = 0; j < 3; ++j) 535 for (int j = 0; j < 3; ++j)
465 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 536 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
466 537
467#if 0
468 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 538 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
469 xfrm.matrix [1][2] -= XDoubleToFixed (y); 539 xfrm.matrix [1][2] -= XDoubleToFixed (y);
470#endif
471 540
472 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 541 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
473 XRenderSetPictureTransform (dpy, src, &xfrm); 542 XRenderSetPictureTransform (dpy, src, &xfrm);
474 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 543 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
475 544
… …
556{ 625{
557 rxvt_img *img2 = clone (); 626 rxvt_img *img2 = clone ();
558 Display *dpy = s->display->dpy; 627 Display *dpy = s->display->dpy;
559 Picture src = img->src_picture (); 628 Picture src = img->src_picture ();
560 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 629 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
561 Picture mask = create_xrender_mask (dpy, img->pm, False); 630
631 Pixmap pixmap = XCreatePixmap (dpy, img->pm, 1, 1, 8);
632 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, PictStandardA8);
633 XRenderPictureAttributes pa;
634 pa.repeat = True;
635 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
636 XFreePixmap (dpy, pixmap);
562 637
563 XRenderColor mask_c; 638 XRenderColor mask_c;
564 639
565 mask_c.alpha = float_to_component (factor); 640 mask_c.alpha = float_to_component (factor);
566 mask_c.red = 641 mask_c.red =

Diff Legend

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