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.64 by root, Fri Jun 8 21:33:32 2012 UTC vs.
Revision 1.77 by root, Sun Jun 10 10:35:03 2012 UTC

… …
49 img->ref->ours = false; 49 img->ref->ours = false;
50 50
51 return img; 51 return img;
52} 52}
53 53
54# if HAVE_PIXBUF
55
54rxvt_img * 56rxvt_img *
55rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 57rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
56{ 58{
57 Display *dpy = s->display->dpy; 59 Display *dpy = s->display->dpy;
58 60
… …
62 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 64 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
63 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n"); 65 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
64 66
65 // since we require rgb24/argb32 formats from xrender we assume 67 // since we require rgb24/argb32 formats from xrender we assume
66 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender 68 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender
67 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
68 69
69 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 70 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
70 71
71 XImage xi; 72 XImage xi;
72 73
… …
76 xi.format = ZPixmap; 77 xi.format = ZPixmap;
77 xi.byte_order = ImageByteOrder (dpy); 78 xi.byte_order = ImageByteOrder (dpy);
78 xi.bitmap_unit = 0; //XY only, unused 79 xi.bitmap_unit = 0; //XY only, unused
79 xi.bitmap_bit_order = 0; //XY only, unused 80 xi.bitmap_bit_order = 0; //XY only, unused
80 xi.bitmap_pad = BitmapPad (dpy); 81 xi.bitmap_pad = BitmapPad (dpy);
81 xi.depth = depth; 82 xi.depth = 32;
82 xi.bytes_per_line = 0; 83 xi.bytes_per_line = 0;
83 xi.bits_per_pixel = 32; //Z only 84 xi.bits_per_pixel = 32; //Z only
84 xi.red_mask = 0x00000000; //Z only, unused 85 xi.red_mask = 0x00000000; //Z only, unused
85 xi.green_mask = 0x00000000; //Z only, unused 86 xi.green_mask = 0x00000000; //Z only, unused
86 xi.blue_mask = 0x00000000; //Z only, unused 87 xi.blue_mask = 0x00000000; //Z only, unused
… …
95 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n"); 96 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
96 97
97 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); 98 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
98 99
99 int rowstride = gdk_pixbuf_get_rowstride (pb); 100 int rowstride = gdk_pixbuf_get_rowstride (pb);
100 101 bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
101 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
102 unsigned char *row = gdk_pixbuf_get_pixels (pb); 102 unsigned char *row = gdk_pixbuf_get_pixels (pb);
103
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 *src = row; 108 unsigned char *src = row;
108 uint32_t *dst = (uint32_t *)line; 109 uint32_t *dst = (uint32_t *)line;
109 110
110 if (depth == 24) 111 if (!pb_has_alpha)
111 for (int x = 0; x < width; x++) 112 for (int x = 0; x < width; x++)
112 { 113 {
113 uint8_t r = *src++; 114 uint8_t r = *src++;
114 uint8_t g = *src++; 115 uint8_t g = *src++;
115 uint8_t b = *src++; 116 uint8_t b = *src++;
116 117
117 uint32_t v = (r << 16) | (g << 8) | b; 118 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
118 119
119 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 120 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
120 v = ecb_bswap32 (v); 121 v = ecb_bswap32 (v);
121 122
122 *dst++ = v; 123 *dst++ = v;
… …
139 140
140 row += rowstride; 141 row += rowstride;
141 line += xi.bytes_per_line; 142 line += xi.bytes_per_line;
142 } 143 }
143 144
144 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, PictStandardARGB32), 0, 0, width, height);
145 img->alloc (); 146 img->alloc ();
146 147
147 GC gc = XCreateGC (dpy, img->pm, 0, 0); 148 GC gc = XCreateGC (dpy, img->pm, 0, 0);
148 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height); 149 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
149 XFreeGC (dpy, gc); 150 XFreeGC (dpy, gc);
… …
167 g_object_unref (pb); 168 g_object_unref (pb);
168 169
169 return img; 170 return img;
170} 171}
171 172
173# endif
174
172void 175void
173rxvt_img::destroy () 176rxvt_img::destroy ()
174{ 177{
175 if (--ref->cnt) 178 if (--ref->cnt)
176 return; 179 return;
… …
209rxvt_img::unshare () 212rxvt_img::unshare ()
210{ 213{
211 if (ref->cnt == 1 && ref->ours) 214 if (ref->cnt == 1 && ref->ours)
212 return; 215 return;
213 216
214 //TODO: maybe should reify instead
215 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 217 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
216 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 218 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
217 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 219 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
218 XFreeGC (s->display->dpy, gc); 220 XFreeGC (s->display->dpy, gc);
219 221
… …
224} 226}
225 227
226void 228void
227rxvt_img::fill (const rxvt_color &c) 229rxvt_img::fill (const rxvt_color &c)
228{ 230{
229 XGCValues gcv; 231 rgba cc;
230 gcv.foreground = c; 232 c.get (cc);
231 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 233 XRenderColor rc = { cc.r, cc.g, cc.b, cc.a };
232 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 234
233 XFreeGC (s->display->dpy, gc); 235 Display *dpy = s->display->dpy;
236 Picture src = src_picture ();
237 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
238 XRenderFreePicture (dpy, src);
234} 239}
235 240
236static void 241static void
237get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 242get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
238{ 243{
… …
308 w, h); 313 w, h);
309 } 314 }
310 315
311 free (kernel); 316 free (kernel);
312 free (params); 317 free (params);
318
313 XRenderFreePicture (dpy, src); 319 XRenderFreePicture (dpy, src);
314 XRenderFreePicture (dpy, dst); 320 XRenderFreePicture (dpy, dst);
315 XRenderFreePicture (dpy, tmp); 321 XRenderFreePicture (dpy, tmp);
316 322
317 return img; 323 return img;
318} 324}
319 325
320static Picture 326static Picture
321create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 327create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
322{ 328{
323 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 329 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
324 330
325 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 331 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
326 XRenderPictureAttributes pa; 332 XRenderPictureAttributes pa;
327 pa.repeat = True; 333 pa.repeat = RepeatNormal;
334 pa.component_alpha = component_alpha;
328 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 335 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
329 336
330 XFreePixmap (dpy, pixmap); 337 XFreePixmap (dpy, pixmap);
331 338
332 return mask; 339 return mask;
333} 340}
334 341
342static void
343extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
344{
345 int32_t x = clamp (c, cl0, cl1);
346 c -= x;
347 xc = x;
348}
349
350static bool
351extract (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)
352{
353 extract (cl0, cl1, r, xr);
354 extract (cl0, cl1, g, xg);
355 extract (cl0, cl1, b, xb);
356 extract (cl0, cl1, a, xa);
357
358 return xr | xg | xb | xa;
359}
360
335void 361void
336rxvt_img::brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a) 362rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
337{ 363{
364 unshare ();
365
338 Display *dpy = s->display->dpy; 366 Display *dpy = s->display->dpy;
339 Picture src = create_xrender_mask (dpy, pm, True);
340 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 367 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
341 368
369 // loop should not be needed for brightness, as only -1..1 makes sense
370 //while (r | g | b | a)
371 {
372 unsigned short xr, xg, xb, xa;
342 XRenderColor mask_c; 373 XRenderColor mask_c;
343 mask_c.red = r; 374
344 mask_c.green = g; 375 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
345 mask_c.blue = b; 376 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
346 mask_c.alpha = a; 377
378 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
379 {
380 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
381 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
382 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
383 mask_c.green = -mask_c.green;
384 mask_c.blue = -mask_c.blue;
385 mask_c.alpha = -mask_c.alpha;
386 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
387 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
388 }
389 }
390
391 XRenderFreePicture (dpy, dst);
392}
393
394void
395rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
396{
397 if (r < 0 || g < 0 || b < 0 || a < 0)
398 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
399
400 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
401 img->alloc ();
402
403 {
404 rxvt_color empty;
405 empty.set (s, rgba (0, 0, 0, 0));
406 img->fill (empty);
407 }
408
409 // premultiply (yeah, these are not exact, sue me or fix it)
410 r = (r * (a >> 8)) >> 8;
411 g = (g * (a >> 8)) >> 8;
412 b = (b * (a >> 8)) >> 8;
413
414 Display *dpy = s->display->dpy;
415
416 Picture src = src_picture ();
417 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
418 Picture mul = create_xrender_mask (dpy, pm, True, True);
419
420 //TODO: this operator does not yet implement some useful contrast
421 while (r | g | b | a)
422 {
423 unsigned short xr, xg, xb, xa;
424 XRenderColor mask_c;
425
426 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
427 {
347 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 428 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
348
349 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 429 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
430 }
431 }
350 432
433 XRenderFreePicture (dpy, mul);
434 XRenderFreePicture (dpy, dst);
351 XRenderFreePicture (dpy, src); 435 XRenderFreePicture (dpy, src);
352 XRenderFreePicture (dpy, dst);
353}
354 436
355void 437 ::swap (img->ref, ref);
356rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a) 438 ::swap (img->pm , pm );
357{
358 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
359 {
360 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
361 return;
362 }
363 439
364 Display *dpy = s->display->dpy; 440 delete img;
365 Picture src = create_xrender_mask (dpy, pm, True);
366 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
367
368 XRenderColor mask_c;
369 mask_c.red = r;
370 mask_c.green = g;
371 mask_c.blue = b;
372 mask_c.alpha = a;
373 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
374
375 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
376
377 XRenderFreePicture (dpy, src);
378 XRenderFreePicture (dpy, dst);
379} 441}
380 442
381rxvt_img * 443rxvt_img *
382rxvt_img::clone () 444rxvt_img::clone ()
383{ 445{
… …
473 535
474 for (int i = 0; i < 3; ++i) 536 for (int i = 0; i < 3; ++i)
475 for (int j = 0; j < 3; ++j) 537 for (int j = 0; j < 3; ++j)
476 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 538 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
477 539
478#if 0
479 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO 540 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
480 xfrm.matrix [1][2] -= XDoubleToFixed (y); 541 xfrm.matrix [1][2] -= XDoubleToFixed (y);
481#endif
482 542
483 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 543 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
484 XRenderSetPictureTransform (dpy, src, &xfrm); 544 XRenderSetPictureTransform (dpy, src, &xfrm);
485 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 545 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
486 546
… …
567{ 627{
568 rxvt_img *img2 = clone (); 628 rxvt_img *img2 = clone ();
569 Display *dpy = s->display->dpy; 629 Display *dpy = s->display->dpy;
570 Picture src = img->src_picture (); 630 Picture src = img->src_picture ();
571 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 631 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
572 Picture mask = create_xrender_mask (dpy, img->pm, False); 632 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
573 633
574 XRenderColor mask_c; 634 XRenderColor mask_c;
575 635
576 mask_c.alpha = float_to_component (factor); 636 mask_c.alpha = float_to_component (factor);
577 mask_c.red = 637 mask_c.red =

Diff Legend

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