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.66 by root, Fri Jun 8 21:48:07 2012 UTC vs.
Revision 1.80 by root, Tue Jun 12 18:25:57 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);
… …
166 167
167 g_object_unref (pb); 168 g_object_unref (pb);
168 169
169 return img; 170 return img;
170} 171}
172
173# endif
171 174
172void 175void
173rxvt_img::destroy () 176rxvt_img::destroy ()
174{ 177{
175 if (--ref->cnt) 178 if (--ref->cnt)
… …
223} 226}
224 227
225void 228void
226rxvt_img::fill (const rxvt_color &c) 229rxvt_img::fill (const rxvt_color &c)
227{ 230{
228 XGCValues gcv; 231 rgba cc;
229 gcv.foreground = c; 232 c.get (cc);
230 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 233 XRenderColor rc = { cc.r, cc.g, cc.b, cc.a };
231 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 234
232 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);
233} 239}
234 240
235static void 241static void
236get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 242get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
237{ 243{
… …
307 w, h); 313 w, h);
308 } 314 }
309 315
310 free (kernel); 316 free (kernel);
311 free (params); 317 free (params);
318
312 XRenderFreePicture (dpy, src); 319 XRenderFreePicture (dpy, src);
313 XRenderFreePicture (dpy, dst); 320 XRenderFreePicture (dpy, dst);
314 XRenderFreePicture (dpy, tmp); 321 XRenderFreePicture (dpy, tmp);
315 322
316 return img; 323 return img;
317} 324}
318 325
319static Picture 326static Picture
320create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 327create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
321{ 328{
322 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 329 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
323 330
324 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 331 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
325 XRenderPictureAttributes pa; 332 XRenderPictureAttributes pa;
326 pa.repeat = True; 333 pa.repeat = RepeatNormal;
334 pa.component_alpha = component_alpha;
327 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 335 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
328 336
329 XFreePixmap (dpy, pixmap); 337 XFreePixmap (dpy, pixmap);
330 338
331 return mask; 339 return mask;
332} 340}
333 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
334void 361void
335rxvt_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)
336{ 363{
364 unshare ();
365
337 Display *dpy = s->display->dpy; 366 Display *dpy = s->display->dpy;
338 Picture src = create_xrender_mask (dpy, pm, True);
339 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 367 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
340 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;
341 XRenderColor mask_c; 373 XRenderColor mask_c;
342 mask_c.red = r; 374
343 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))
344 mask_c.blue = b; 376 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
345 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 {
346 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 428 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); 429 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
430 }
431 }
349 432
433 XRenderFreePicture (dpy, mul);
434 XRenderFreePicture (dpy, dst);
350 XRenderFreePicture (dpy, src); 435 XRenderFreePicture (dpy, src);
351 XRenderFreePicture (dpy, dst);
352}
353 436
354void 437 ::swap (img->ref, ref);
355rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a) 438 ::swap (img->pm , pm );
356{
357 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
358 {
359 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
360 return;
361 }
362 439
363 Display *dpy = s->display->dpy; 440 delete img;
364 Picture src = create_xrender_mask (dpy, pm, True);
365 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
366
367 XRenderColor mask_c;
368 mask_c.red = r;
369 mask_c.green = g;
370 mask_c.blue = b;
371 mask_c.alpha = a;
372 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
373
374 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
375
376 XRenderFreePicture (dpy, src);
377 XRenderFreePicture (dpy, dst);
378} 441}
379 442
380rxvt_img * 443rxvt_img *
381rxvt_img::clone () 444rxvt_img::clone ()
382{ 445{
… …
456 } 519 }
457 520
458 return img; 521 return img;
459} 522}
460 523
461rxvt_img * 524static void
462rxvt_img::transform (int new_width, int new_height, double matrix[9]) 525mat_invert (double mat[3][3], double (&inv)[3][3])
463{ 526{
527 double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
528 double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
529 double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
530
531 double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
532
533 inv [0][0] = invdet * s0;
534 inv [0][1] = invdet * s1;
535 inv [0][2] = invdet * s2;
536
537 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
538 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
539 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
540
541 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
542 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
543 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
544}
545
546static double
547mat_apply (double mat[3][3], int i, double x, double y)
548{
549 double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
550 double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
551
552 return v * (1. / w);
553}
554
555rxvt_img *
556rxvt_img::transform (double matrix[3][3])
557{
558 // find new offset
559 int ox = mat_apply (matrix, 0, x, y);
560 int oy = mat_apply (matrix, 1, x, y);
561
562 // calculate new pixel bounding box coordinates
563 double rmin[2], rmax[2];
564
565 for (int i = 0; i < 2; ++i)
566 {
567 double v;
568 v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v;
569 v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v);
570 v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v);
571 v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v);
572 }
573
574 int dx = floor (rmin [0]);
575 int dy = floor (rmin [1]);
576
577 int new_width = ceil (rmax [0] - dx);
578 int new_height = ceil (rmax [1] - dy);
579
580 double inv[3][3];
581 mat_invert (matrix, inv);
582
464 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); 583 rxvt_img *img = new rxvt_img (s, format, ox - dx, oy - dy, new_width, new_height, repeat);
465 img->alloc (); 584 img->alloc ();
466 585
467 Display *dpy = s->display->dpy; 586 Display *dpy = s->display->dpy;
468 Picture src = src_picture (); 587 Picture src = src_picture ();
469 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 588 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
470 589
471 XTransform xfrm; 590 XTransform xfrm;
472 591
473 for (int i = 0; i < 3; ++i) 592 for (int i = 0; i < 3; ++i)
474 for (int j = 0; j < 3; ++j) 593 for (int j = 0; j < 3; ++j)
475 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 594 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
476
477 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
478 xfrm.matrix [1][2] -= XDoubleToFixed (y);
479 595
480 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 596 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
481 XRenderSetPictureTransform (dpy, src, &xfrm); 597 XRenderSetPictureTransform (dpy, src, &xfrm);
482 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 598 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
483 599
484 XRenderFreePicture (dpy, src); 600 XRenderFreePicture (dpy, src);
485 XRenderFreePicture (dpy, dst); 601 XRenderFreePicture (dpy, dst);
486 602
487 return img; 603 return img;
… …
491rxvt_img::scale (int new_width, int new_height) 607rxvt_img::scale (int new_width, int new_height)
492{ 608{
493 if (w == new_width && h == new_height) 609 if (w == new_width && h == new_height)
494 return clone (); 610 return clone ();
495 611
496 double matrix[9] = { 612 double matrix[3][3] = {
497 w / (double)new_width, 0, 0, 613 { new_width / (double)w, 0, 0 },
498 0, h / (double)new_height, 0, 614 { 0, new_height / (double)h, 0 },
499 0, 0, 1 615 { 0, 0, 1 }
500 }; 616 };
501 617
502 int old_repeat_mode = repeat; 618 int old_repeat_mode = repeat;
503 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems 619 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
504 620
505 rxvt_img *img = transform (new_width, new_height, matrix); 621 rxvt_img *img = transform (matrix);
506 622
507 repeat = old_repeat_mode; 623 repeat = old_repeat_mode;
508 img->repeat = repeat; 624 img->repeat = repeat;
509 625
510 return img; 626 return img;
511} 627}
512 628
513rxvt_img * 629rxvt_img *
514rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 630rxvt_img::rotate (int cx, int cy, double phi)
515{ 631{
516 double s = sin (phi); 632 double s = sin (phi);
517 double c = cos (phi); 633 double c = cos (phi);
518 634
519 double matrix[9] = { 635 double matrix[3][3] = {
520 c, -s, -c * x + s * y + x, 636 //{ c, -s, cx - c * cx + s * cy },
521 s, c, -s * x - c * y + y, 637 //{ s, c, cy - s * cx - c * cy },
522 0, 0, 1 638 //{ 0, 0, 1 }
639 { c, -s, 0 },
640 { s, c, 0 },
641 { 0, 0, 1 }
523 }; 642 };
524 643
525 return transform (new_width, new_height, matrix); 644 move (-cx, -cy);
645 rxvt_img *img = transform (matrix);
646 move ( cx, cy);
647 img->move (cx, cy);
648
649 return img;
526} 650}
527 651
528rxvt_img * 652rxvt_img *
529rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 653rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
530{ 654{
… …
564{ 688{
565 rxvt_img *img2 = clone (); 689 rxvt_img *img2 = clone ();
566 Display *dpy = s->display->dpy; 690 Display *dpy = s->display->dpy;
567 Picture src = img->src_picture (); 691 Picture src = img->src_picture ();
568 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 692 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
569 Picture mask = create_xrender_mask (dpy, img->pm, False); 693 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
570 694
571 XRenderColor mask_c; 695 XRenderColor mask_c;
572 696
573 mask_c.alpha = float_to_component (factor); 697 mask_c.alpha = float_to_component (factor);
574 mask_c.red = 698 mask_c.red =

Diff Legend

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