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.40 by root, Thu Jun 7 11:27:08 2012 UTC vs.
Revision 1.65 by root, Fri Jun 8 21:41:45 2012 UTC

… …
2#include "../config.h" 2#include "../config.h"
3#include "rxvt.h" 3#include "rxvt.h"
4 4
5#if HAVE_IMG 5#if HAVE_IMG
6 6
7rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height) 7rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
8: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(RepeatNormal), 8: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9 pm(0), ref(0) 9 pm(0), ref(0)
10{ 10{
11} 11}
12 12
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;
… …
57 50
58 return img; 51 return img;
59} 52}
60 53
61rxvt_img * 54rxvt_img *
55rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
56{
57 Display *dpy = s->display->dpy;
58
59 int width = gdk_pixbuf_get_width (pb);
60 int height = gdk_pixbuf_get_height (pb);
61
62 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");
64
65 // 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
67 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
68
69 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
70
71 XImage xi;
72
73 xi.width = width;
74 xi.height = height;
75 xi.xoffset = 0;
76 xi.format = ZPixmap;
77 xi.byte_order = ImageByteOrder (dpy);
78 xi.bitmap_unit = 0; //XY only, unused
79 xi.bitmap_bit_order = 0; //XY only, unused
80 xi.bitmap_pad = BitmapPad (dpy);
81 xi.depth = depth;
82 xi.bytes_per_line = 0;
83 xi.bits_per_pixel = 32; //Z only
84 xi.red_mask = 0x00000000; //Z only, unused
85 xi.green_mask = 0x00000000; //Z only, unused
86 xi.blue_mask = 0x00000000; //Z only, unused
87 xi.obdata = 0; // probably unused
88
89 bool byte_order_mismatch = byte_order != xi.byte_order;
90
91 if (!XInitImage (&xi))
92 rxvt_fatal ("unable to initialise ximage, please report.\n");
93
94 if (height > INT_MAX / xi.bytes_per_line)
95 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
96
97 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
98
99 int rowstride = gdk_pixbuf_get_rowstride (pb);
100
101 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
102 unsigned char *row = gdk_pixbuf_get_pixels (pb);
103 char *line = xi.data;
104
105 for (int y = 0; y < height; y++)
106 {
107 unsigned char *src = row;
108 uint32_t *dst = (uint32_t *)line;
109
110 if (depth == 24)
111 for (int x = 0; x < width; x++)
112 {
113 uint8_t r = *src++;
114 uint8_t g = *src++;
115 uint8_t b = *src++;
116
117 uint32_t v = (r << 16) | (g << 8) | b;
118
119 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
120 v = ecb_bswap32 (v);
121
122 *dst++ = v;
123 }
124 else
125 for (int x = 0; x < width; x++)
126 {
127 uint32_t v = *(uint32_t *)src; src += 4;
128
129 if (ecb_big_endian ())
130 v = ecb_bswap32 (v);
131
132 v = ecb_rotl32 (v, 8); // abgr to bgra
133
134 if (!byte_order_mismatch)
135 v = ecb_bswap32 (v);
136
137 *dst++ = v;
138 }
139
140 row += rowstride;
141 line += xi.bytes_per_line;
142 }
143
144 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
145 img->alloc ();
146
147 GC gc = XCreateGC (dpy, img->pm, 0, 0);
148 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
149 XFreeGC (dpy, gc);
150
151 free (xi.data);
152
153 return img;
154}
155
156rxvt_img *
62rxvt_img::new_from_file (rxvt_screen *s, const char *filename) 157rxvt_img::new_from_file (rxvt_screen *s, const char *filename)
63{ 158{
64 GError *err = 0; 159 GError *err = 0;
65 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 160 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
66 161
67 if (!pb) 162 if (!pb)
68 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 163 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
69 164
70 rxvt_img *img = new rxvt_img ( 165 rxvt_img *img = new_from_pixbuf (s, pb);
71 s,
72 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
73 0,
74 0,
75 gdk_pixbuf_get_width (pb),
76 gdk_pixbuf_get_height (pb)
77 );
78 img->alloc ();
79 img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
80 166
81 g_object_unref (pb); 167 g_object_unref (pb);
82 168
83 return img; 169 return img;
84} 170}
… …
123rxvt_img::unshare () 209rxvt_img::unshare ()
124{ 210{
125 if (ref->cnt == 1 && ref->ours) 211 if (ref->cnt == 1 && ref->ours)
126 return; 212 return;
127 213
128 //TODO: maybe should reify instead
129 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 214 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
130 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 215 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
131 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 216 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
132 XFreeGC (s->display->dpy, gc); 217 XFreeGC (s->display->dpy, gc);
133 218
… …
176 261
177 Display *dpy = s->display->dpy; 262 Display *dpy = s->display->dpy;
178 int size = max (rh, rv) * 2 + 1; 263 int size = max (rh, rv) * 2 + 1;
179 double *kernel = (double *)malloc (size * sizeof (double)); 264 double *kernel = (double *)malloc (size * sizeof (double));
180 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 265 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
181 rxvt_img *img = new rxvt_img (s, format, x, y, w, h); 266 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
182 img->alloc (); 267 img->alloc ();
183
184 Picture src = src_picture ();
185 268
186 XRenderPictureAttributes pa; 269 XRenderPictureAttributes pa;
187 pa.repeat = RepeatPad; 270 pa.repeat = RepeatPad;
188 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 271 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
272 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
189 273
190 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 274 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
191 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 275 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
192 XFreePixmap (dpy, tmp_pm); 276 XFreePixmap (dpy, tmp_pm);
193 277
… …
209 293
210 size = rv * 2 + 1; 294 size = rv * 2 + 1;
211 get_gaussian_kernel (rv, size, kernel, params); 295 get_gaussian_kernel (rv, size, kernel, params);
212 ::swap (params[0], params[1]); 296 ::swap (params[0], params[1]);
213 297
214 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 298 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
215 XRenderComposite (dpy, 299 XRenderComposite (dpy,
216 PictOpSrc, 300 PictOpSrc,
217 tmp, 301 tmp,
218 None, 302 None,
219 dst, 303 dst,
… …
246 330
247 return mask; 331 return mask;
248} 332}
249 333
250void 334void
251rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 335rxvt_img::brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a)
252{ 336{
253 Display *dpy = s->display->dpy; 337 Display *dpy = s->display->dpy;
254 Picture src = create_xrender_mask (dpy, pm, True); 338 Picture src = create_xrender_mask (dpy, pm, True);
255 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 339 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
256 340
… …
266 XRenderFreePicture (dpy, src); 350 XRenderFreePicture (dpy, src);
267 XRenderFreePicture (dpy, dst); 351 XRenderFreePicture (dpy, dst);
268} 352}
269 353
270void 354void
271rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 355rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a)
272{ 356{
273 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 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");
274 return; 360 return;
361 }
275 362
276 Display *dpy = s->display->dpy; 363 Display *dpy = s->display->dpy;
277 Picture src = create_xrender_mask (dpy, pm, True); 364 Picture src = create_xrender_mask (dpy, pm, True);
278 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 365 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
279 366
… …
288 375
289 XRenderFreePicture (dpy, src); 376 XRenderFreePicture (dpy, src);
290 XRenderFreePicture (dpy, dst); 377 XRenderFreePicture (dpy, dst);
291} 378}
292 379
293bool
294rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
295{
296 Display *dpy = s->display->dpy;
297
298 if (s->visual->c_class != TrueColor)
299 return false;
300
301 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
302
303 red_mask = (uint32_t)format->direct.redMask << format->direct.red;
304 green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
305 blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
306 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
307
308 int width_r = ecb_popcount32 (red_mask);
309 int width_g = ecb_popcount32 (green_mask);
310 int width_b = ecb_popcount32 (blue_mask);
311 int width_a = ecb_popcount32 (alpha_mask);
312
313 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
314 return false;
315
316 int sh_r = ecb_ctz32 (red_mask);
317 int sh_g = ecb_ctz32 (green_mask);
318 int sh_b = ecb_ctz32 (blue_mask);
319 int sh_a = ecb_ctz32 (alpha_mask);
320
321 if (width > 32767 || height > 32767)
322 return false;
323
324 XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
325 width, height, 32, 0);
326 if (!ximage)
327 return false;
328
329 if (height > INT_MAX / ximage->bytes_per_line
330 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
331 {
332 XDestroyImage (ximage);
333 return false;
334 }
335
336 GC gc = XCreateGC (dpy, pm, 0, 0);
337
338 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
339
340 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
341 int channels = gdk_pixbuf_get_n_channels (pixbuf);
342 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
343 char *line = ximage->data;
344
345 for (int y = 0; y < height; y++)
346 {
347 for (int x = 0; x < width; x++)
348 {
349 unsigned char *pixel = row + x * channels;
350 uint32_t value;
351 unsigned char r, g, b, a;
352
353 if (channels == 4)
354 {
355 a = pixel[3];
356 r = pixel[0] * a / 0xff;
357 g = pixel[1] * a / 0xff;
358 b = pixel[2] * a / 0xff;
359 }
360 else
361 {
362 a = 0xff;
363 r = pixel[0];
364 g = pixel[1];
365 b = pixel[2];
366 }
367
368 value = ((r >> (8 - width_r)) << sh_r)
369 | ((g >> (8 - width_g)) << sh_g)
370 | ((b >> (8 - width_b)) << sh_b)
371 | ((a >> (8 - width_a)) << sh_a);
372
373 if (ximage->bits_per_pixel == 32)
374 ((uint32_t *)line)[x] = value;
375 else
376 XPutPixel (ximage, x, y, value);
377 }
378
379 row += rowstride;
380 line += ximage->bytes_per_line;
381 }
382
383 XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
384 XDestroyImage (ximage);
385 XFreeGC (dpy, gc);
386
387 return true;
388}
389
390rxvt_img * 380rxvt_img *
391rxvt_img::clone () 381rxvt_img::clone ()
392{ 382{
393 return new rxvt_img (*this); 383 return new rxvt_img (*this);
384}
385
386static XRenderPictFormat *
387find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
388{
389 if (format->direct.alphaMask)
390 return format; // already has alpha
391
392 // try to find a suitable alpha format, one bit alpha is enough for our purposes
393 if (format->type == PictTypeDirect)
394 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
395 if (f->direct.alphaMask
396 && f->type == PictTypeDirect
397 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
398 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
399 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
400 return f;
401
402 // should be a very good fallback
403 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
394} 404}
395 405
396rxvt_img * 406rxvt_img *
397rxvt_img::reify () 407rxvt_img::reify ()
398{ 408{
399 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 409 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
400 return clone (); 410 return clone ();
401 411
402 Display *dpy = s->display->dpy; 412 Display *dpy = s->display->dpy;
403 413
414 // add an alpha channel if...
404 bool alpha = !format->direct.alphaMask 415 bool alpha = !format->direct.alphaMask // pixmap has none yet
405 && (x || y) 416 && (x || y) // we need one because of non-zero offset
406 && repeat == RepeatNone; 417 && repeat == RepeatNone; // and we have no good pixels to fill with
407 418
408 rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h); 419 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
409 img->alloc (); 420 img->alloc ();
410 421
411 Picture src = src_picture (); 422 Picture src = src_picture ();
412 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 423 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
413 424
425 if (alpha)
426 {
427 XRenderColor rc = { 0, 0, 0, 0 };
428 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
429 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
430 }
431 else
414 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 432 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
415 433
416 XRenderFreePicture (dpy, src); 434 XRenderFreePicture (dpy, src);
417 XRenderFreePicture (dpy, dst); 435 XRenderFreePicture (dpy, dst);
418 436
419 return img; 437 return img;
420} 438}
… …
441} 459}
442 460
443rxvt_img * 461rxvt_img *
444rxvt_img::transform (int new_width, int new_height, double matrix[9]) 462rxvt_img::transform (int new_width, int new_height, double matrix[9])
445{ 463{
446 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height); 464 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
447 img->alloc (); 465 img->alloc ();
448 466
449 Display *dpy = s->display->dpy; 467 Display *dpy = s->display->dpy;
450 Picture src = src_picture (); 468 Picture src = src_picture ();
451 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 469 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
… …
454 472
455 for (int i = 0; i < 3; ++i) 473 for (int i = 0; i < 3; ++i)
456 for (int j = 0; j < 3; ++j) 474 for (int j = 0; j < 3; ++j)
457 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 475 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
458 476
477#if 0
459 xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO 478 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
460 xfrm.matrix [0][3] += XDoubleToFixed (y); 479 xfrm.matrix [1][2] -= XDoubleToFixed (y);
480#endif
461 481
462 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 482 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
463 XRenderSetPictureTransform (dpy, src, &xfrm); 483 XRenderSetPictureTransform (dpy, src, &xfrm);
464 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 484 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
465 485
… …
470} 490}
471 491
472rxvt_img * 492rxvt_img *
473rxvt_img::scale (int new_width, int new_height) 493rxvt_img::scale (int new_width, int new_height)
474{ 494{
495 if (w == new_width && h == new_height)
496 return clone ();
497
475 double matrix[9] = { 498 double matrix[9] = {
476 w / (double)new_width, 0, 0, 499 w / (double)new_width, 0, 0,
477 0, h / (double)new_height, 0, 500 0, h / (double)new_height, 0,
478 0, 0, 1 501 0, 0, 1
479 }; 502 };
480 503
504 int old_repeat_mode = repeat;
505 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
506
481 return transform (new_width, new_height, matrix); 507 rxvt_img *img = transform (new_width, new_height, matrix);
508
509 repeat = old_repeat_mode;
510 img->repeat = repeat;
511
512 return img;
482} 513}
483 514
484rxvt_img * 515rxvt_img *
485rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 516rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
486{ 517{
… …
495 526
496 return transform (new_width, new_height, matrix); 527 return transform (new_width, new_height, matrix);
497} 528}
498 529
499rxvt_img * 530rxvt_img *
500rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 531rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
501{ 532{
502 if (new_format == format) 533 if (new_format == format)
503 return clone (); 534 return clone ();
504 535
505 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h); 536 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
506 img->alloc (); 537 img->alloc ();
507 538
508 Display *dpy = s->display->dpy; 539 Display *dpy = s->display->dpy;
509 Picture src = src_picture (); 540 Picture src = src_picture ();
510 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 541 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);

Diff Legend

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