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.39 by root, Thu Jun 7 10:19:23 2012 UTC vs.
Revision 1.48 by root, Thu Jun 7 19:24:02 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)
… …
57 57
58 return img; 58 return img;
59} 59}
60 60
61rxvt_img * 61rxvt_img *
62rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
63{
64 Display *dpy = s->display->dpy;
65
66 int width = gdk_pixbuf_get_width (pb);
67 int height = gdk_pixbuf_get_height (pb);
68
69 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
70 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
71
72 // 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
74 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
75
76 XImage xi;
77
78 xi.width = width;
79 xi.height = height;
80 xi.xoffset = 0;
81 xi.format = ZPixmap;
82 xi.byte_order = MSBFirst; // maybe go for host byte order, because servers are usually local?
83 xi.bitmap_unit = 32;
84 xi.bitmap_bit_order = MSBFirst;
85 xi.bitmap_pad = BitmapPad (dpy);
86 xi.depth = depth;
87 xi.bytes_per_line = 0;
88 xi.bits_per_pixel = 32;
89 xi.red_mask = 0x00ff0000;
90 xi.green_mask = 0x0000ff00;
91 xi.blue_mask = 0x000000ff;
92
93 if (!XInitImage (&xi))
94 rxvt_fatal ("unable to initialise ximage, please report.\n");
95
96 if (height > INT_MAX / xi.bytes_per_line)
97 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
98
99 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
100
101 int rowstride = gdk_pixbuf_get_rowstride (pb);
102
103 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
104 unsigned char *row = gdk_pixbuf_get_pixels (pb);
105 char *line = xi.data;
106
107 for (int y = 0; y < height; y++)
108 {
109 unsigned char r, g, b, a;
110 unsigned char *data = row;
111
112 if (depth == 24)
113 for (int x = 0; x < width; x++)
114 {
115 asm volatile("nop");
116 r = *data++;
117 g = *data++;
118 b = *data++;
119 *line++ = 0;
120 *line++ = r;
121 *line++ = g;
122 *line++ = b;
123 asm volatile("nop");
124 }
125 else
126 for (int x = 0; x < width; x++)
127 {
128 uint32_t v = *(uint32_t *)data; data += 4;
129 v = ecb_big_endian () ? ecb_rotr32 (v, 8) : ecb_rotl32 (v, 8);
130 *(uint32_t *)line = x; line += 4;
131 }
132
133 row += rowstride;
134 }
135
136 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
137 img->alloc ();
138
139 GC gc = XCreateGC (dpy, img->pm, 0, 0);
140 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
141 XFreeGC (dpy, gc);
142
143 free (xi.data);
144
145 return img;
146}
147
148rxvt_img *
62rxvt_img::new_from_file (rxvt_screen *s, const char *filename) 149rxvt_img::new_from_file (rxvt_screen *s, const char *filename)
63{ 150{
64 GError *err = 0; 151 GError *err = 0;
65 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 152 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
66 153
67 if (!pb) 154 if (!pb)
68 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 155 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
69 156
70 rxvt_img *img = new rxvt_img ( 157 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 158
81 g_object_unref (pb); 159 g_object_unref (pb);
82 160
83 return img; 161 return img;
84} 162}
… …
176 254
177 Display *dpy = s->display->dpy; 255 Display *dpy = s->display->dpy;
178 int size = max (rh, rv) * 2 + 1; 256 int size = max (rh, rv) * 2 + 1;
179 double *kernel = (double *)malloc (size * sizeof (double)); 257 double *kernel = (double *)malloc (size * sizeof (double));
180 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 258 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
181 rxvt_img *img = new rxvt_img (s, format, x, y, w, h); 259 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
182 img->alloc (); 260 img->alloc ();
183 261
184 Picture src = src_picture (); 262 Picture src = src_picture ();
185 263
186 XRenderPictureAttributes pa; 264 XRenderPictureAttributes pa;
… …
288 366
289 XRenderFreePicture (dpy, src); 367 XRenderFreePicture (dpy, src);
290 XRenderFreePicture (dpy, dst); 368 XRenderFreePicture (dpy, dst);
291} 369}
292 370
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 * 371rxvt_img *
391rxvt_img::clone () 372rxvt_img::clone ()
392{ 373{
393 return new rxvt_img (*this); 374 return new rxvt_img (*this);
375}
376
377static XRenderPictFormat *
378find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
379{
380 if (format->direct.alphaMask)
381 return format; // already has alpha
382
383 // try to find a suitable alpha format, one bit alpha is enough for our purposes
384 if (format->type == PictTypeDirect)
385 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
386 if (f->direct.alphaMask
387 && f->type == PictTypeDirect
388 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
389 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
390 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
391 return f;
392
393 // should be a very good fallback
394 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
394} 395}
395 396
396rxvt_img * 397rxvt_img *
397rxvt_img::reify () 398rxvt_img::reify ()
398{ 399{
399 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 400 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
400 return clone (); 401 return clone ();
401 402
402 rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h); 403 Display *dpy = s->display->dpy;
404
405 bool alpha = !format->direct.alphaMask
406 && (x || y)
407 && repeat == RepeatNone;
408
409 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
403 img->alloc (); 410 img->alloc ();
404
405 Display *dpy = s->display->dpy;
406 411
407 Picture src = src_picture (); 412 Picture src = src_picture ();
408 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 413 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
409 414
415 if (alpha)
416 {
417 XRenderColor rc = { 0, 0, 0, 0 };
418 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
419 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
420 }
421 else
410 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 422 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
411 423
412 XRenderFreePicture (dpy, src); 424 XRenderFreePicture (dpy, src);
413 XRenderFreePicture (dpy, dst); 425 XRenderFreePicture (dpy, dst);
414 426
415 return img; 427 return img;
416} 428}
… …
437} 449}
438 450
439rxvt_img * 451rxvt_img *
440rxvt_img::transform (int new_width, int new_height, double matrix[9]) 452rxvt_img::transform (int new_width, int new_height, double matrix[9])
441{ 453{
442 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height); 454 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
443 img->alloc (); 455 img->alloc ();
444 456
445 Display *dpy = s->display->dpy; 457 Display *dpy = s->display->dpy;
446 Picture src = src_picture (); 458 Picture src = src_picture ();
447 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 459 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
… …
450 462
451 for (int i = 0; i < 3; ++i) 463 for (int i = 0; i < 3; ++i)
452 for (int j = 0; j < 3; ++j) 464 for (int j = 0; j < 3; ++j)
453 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 465 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
454 466
467#if 0
455 xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO 468 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
456 xfrm.matrix [0][3] += XDoubleToFixed (y); 469 xfrm.matrix [1][2] -= XDoubleToFixed (y);
470#endif
457 471
458 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 472 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
459 XRenderSetPictureTransform (dpy, src, &xfrm); 473 XRenderSetPictureTransform (dpy, src, &xfrm);
460 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 474 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
461 475
… …
466} 480}
467 481
468rxvt_img * 482rxvt_img *
469rxvt_img::scale (int new_width, int new_height) 483rxvt_img::scale (int new_width, int new_height)
470{ 484{
485 if (w == new_width && h == new_height)
486 return clone ();
487
471 double matrix[9] = { 488 double matrix[9] = {
472 w / (double)new_width, 0, 0, 489 w / (double)new_width, 0, 0,
473 0, h / (double)new_height, 0, 490 0, h / (double)new_height, 0,
474 0, 0, 1 491 0, 0, 1
475 }; 492 };
476 493
494 int old_repeat_mode = repeat;
495 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
496
477 return transform (new_width, new_height, matrix); 497 rxvt_img *img = transform (new_width, new_height, matrix);
498
499 repeat = old_repeat_mode;
500 img->repeat = repeat;
501
502 return img;
478} 503}
479 504
480rxvt_img * 505rxvt_img *
481rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 506rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
482{ 507{
… …
491 516
492 return transform (new_width, new_height, matrix); 517 return transform (new_width, new_height, matrix);
493} 518}
494 519
495rxvt_img * 520rxvt_img *
496rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 521rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
497{ 522{
498 if (new_format == format) 523 if (new_format == format)
499 return clone (); 524 return clone ();
500 525
501 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h); 526 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
502 img->alloc (); 527 img->alloc ();
503 528
504 Display *dpy = s->display->dpy; 529 Display *dpy = s->display->dpy;
505 Picture src = src_picture (); 530 Picture src = src_picture ();
506 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 531 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);

Diff Legend

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