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.74 by root, Sat Jun 9 19:20:04 2012 UTC vs.
Revision 1.78 by sf-exg, Mon Jun 11 12:08:30 2012 UTC

… …
50 50
51 return img; 51 return img;
52} 52}
53 53
54# if HAVE_PIXBUF 54# if HAVE_PIXBUF
55
55rxvt_img * 56rxvt_img *
56rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 57rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
57{ 58{
58 Display *dpy = s->display->dpy; 59 Display *dpy = s->display->dpy;
59 60
… …
63 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 64 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
64 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");
65 66
66 // since we require rgb24/argb32 formats from xrender we assume 67 // since we require rgb24/argb32 formats from xrender we assume
67 // 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
68 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
69 69
70 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 70 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
71 71
72 XImage xi; 72 XImage xi;
73 73
… …
77 xi.format = ZPixmap; 77 xi.format = ZPixmap;
78 xi.byte_order = ImageByteOrder (dpy); 78 xi.byte_order = ImageByteOrder (dpy);
79 xi.bitmap_unit = 0; //XY only, unused 79 xi.bitmap_unit = 0; //XY only, unused
80 xi.bitmap_bit_order = 0; //XY only, unused 80 xi.bitmap_bit_order = 0; //XY only, unused
81 xi.bitmap_pad = BitmapPad (dpy); 81 xi.bitmap_pad = BitmapPad (dpy);
82 xi.depth = depth; 82 xi.depth = 32;
83 xi.bytes_per_line = 0; 83 xi.bytes_per_line = 0;
84 xi.bits_per_pixel = 32; //Z only 84 xi.bits_per_pixel = 32; //Z only
85 xi.red_mask = 0x00000000; //Z only, unused 85 xi.red_mask = 0x00000000; //Z only, unused
86 xi.green_mask = 0x00000000; //Z only, unused 86 xi.green_mask = 0x00000000; //Z only, unused
87 xi.blue_mask = 0x00000000; //Z only, unused 87 xi.blue_mask = 0x00000000; //Z only, unused
… …
96 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");
97 97
98 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); 98 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
99 99
100 int rowstride = gdk_pixbuf_get_rowstride (pb); 100 int rowstride = gdk_pixbuf_get_rowstride (pb);
101 101 bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
102 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
103 unsigned char *row = gdk_pixbuf_get_pixels (pb); 102 unsigned char *row = gdk_pixbuf_get_pixels (pb);
103
104 char *line = xi.data; 104 char *line = xi.data;
105 105
106 for (int y = 0; y < height; y++) 106 for (int y = 0; y < height; y++)
107 { 107 {
108 unsigned char *src = row; 108 unsigned char *src = row;
109 uint32_t *dst = (uint32_t *)line; 109 uint32_t *dst = (uint32_t *)line;
110 110
111 if (depth == 24) 111 if (!pb_has_alpha)
112 for (int x = 0; x < width; x++) 112 for (int x = 0; x < width; x++)
113 { 113 {
114 uint8_t r = *src++; 114 uint8_t r = *src++;
115 uint8_t g = *src++; 115 uint8_t g = *src++;
116 uint8_t b = *src++; 116 uint8_t b = *src++;
117 117
118 uint32_t v = (r << 16) | (g << 8) | b; 118 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
119 119
120 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 120 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
121 v = ecb_bswap32 (v); 121 v = ecb_bswap32 (v);
122 122
123 *dst++ = v; 123 *dst++ = v;
… …
140 140
141 row += rowstride; 141 row += rowstride;
142 line += xi.bytes_per_line; 142 line += xi.bytes_per_line;
143 } 143 }
144 144
145 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);
146 img->alloc (); 146 img->alloc ();
147 147
148 GC gc = XCreateGC (dpy, img->pm, 0, 0); 148 GC gc = XCreateGC (dpy, img->pm, 0, 0);
149 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);
150 XFreeGC (dpy, gc); 150 XFreeGC (dpy, gc);
… …
167 167
168 g_object_unref (pb); 168 g_object_unref (pb);
169 169
170 return img; 170 return img;
171} 171}
172
172# endif 173# endif
173 174
174void 175void
175rxvt_img::destroy () 176rxvt_img::destroy ()
176{ 177{
… …
225} 226}
226 227
227void 228void
228rxvt_img::fill (const rxvt_color &c) 229rxvt_img::fill (const rxvt_color &c)
229{ 230{
230 XGCValues gcv; 231 rgba cc;
231 gcv.foreground = c; 232 c.get (cc);
232 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 233 XRenderColor rc = { cc.r, cc.g, cc.b, cc.a };
233 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 234
234 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);
235} 239}
236 240
237static void 241static void
238get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 242get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
239{ 243{
… …
309 w, h); 313 w, h);
310 } 314 }
311 315
312 free (kernel); 316 free (kernel);
313 free (params); 317 free (params);
318
314 XRenderFreePicture (dpy, src); 319 XRenderFreePicture (dpy, src);
315 XRenderFreePicture (dpy, dst); 320 XRenderFreePicture (dpy, dst);
316 XRenderFreePicture (dpy, tmp); 321 XRenderFreePicture (dpy, tmp);
317 322
318 return img; 323 return img;
319} 324}
320 325
321static Picture 326static Picture
322create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 327create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
323{ 328{
324 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 329 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
325 330
326 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 331 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
327 XRenderPictureAttributes pa; 332 XRenderPictureAttributes pa;
328 pa.repeat = RepeatNormal; 333 pa.repeat = RepeatNormal;
334 pa.component_alpha = component_alpha;
329 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 335 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
330 336
331 XFreePixmap (dpy, pixmap); 337 XFreePixmap (dpy, pixmap);
332 338
333 return mask; 339 return mask;
334} 340}
… …
407 413
408 Display *dpy = s->display->dpy; 414 Display *dpy = s->display->dpy;
409 415
410 Picture src = src_picture (); 416 Picture src = src_picture ();
411 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); 417 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
412 Picture mul = create_xrender_mask (dpy, pm, True); 418 Picture mul = create_xrender_mask (dpy, pm, True, True);
413
414 XRenderPictureAttributes pa;
415 pa.component_alpha = 1;
416 XRenderChangePicture (dpy, mul, CPComponentAlpha, &pa);
417 419
418 //TODO: this operator does not yet implement some useful contrast 420 //TODO: this operator does not yet implement some useful contrast
419 while (r | g | b | a) 421 while (r | g | b | a)
420 { 422 {
421 unsigned short xr, xg, xb, xa; 423 unsigned short xr, xg, xb, xa;
… …
559 0, h / (double)new_height, 0, 561 0, h / (double)new_height, 0,
560 0, 0, 1 562 0, 0, 1
561 }; 563 };
562 564
563 int old_repeat_mode = repeat; 565 int old_repeat_mode = repeat;
564 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems 566 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
565 567
566 rxvt_img *img = transform (new_width, new_height, matrix); 568 rxvt_img *img = transform (new_width, new_height, matrix);
567 569
568 repeat = old_repeat_mode; 570 repeat = old_repeat_mode;
569 img->repeat = repeat; 571 img->repeat = repeat;
… …
625{ 627{
626 rxvt_img *img2 = clone (); 628 rxvt_img *img2 = clone ();
627 Display *dpy = s->display->dpy; 629 Display *dpy = s->display->dpy;
628 Picture src = img->src_picture (); 630 Picture src = img->src_picture ();
629 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 631 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
630 632 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
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);
637 633
638 XRenderColor mask_c; 634 XRenderColor mask_c;
639 635
640 mask_c.alpha = float_to_component (factor); 636 mask_c.alpha = float_to_component (factor);
641 mask_c.red = 637 mask_c.red =

Diff Legend

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