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.41 by root, Thu Jun 7 11:34:09 2012 UTC vs.
Revision 1.47 by root, Thu Jun 7 19:06:26 2012 UTC

… …
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 int width = gdk_pixbuf_get_width (pb);
65 int height = gdk_pixbuf_get_height (pb);
66
67 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
68 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
69
70 // since we require rgb24/argb32 formats from xrender we assume
71 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender
72 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
73
74 XImage xi;
75
76 xi.width = width;
77 xi.height = height;
78 xi.xoffset = 0;
79 xi.format = ZPixmap;
80 xi.byte_order = MSBFirst; // maybe go for host byte order, because servers are usually local?
81 xi.bitmap_unit = 32;
82 xi.bitmap_bit_order = MSBFirst;
83 xi.bitmap_pad = 32;
84 xi.depth = depth;
85 xi.bytes_per_line = 0;
86 xi.bits_per_pixel = 32;
87 xi.red_mask = 0x00ff0000;
88 xi.green_mask = 0x0000ff00;
89 xi.blue_mask = 0x000000ff;
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 r, g, b, a;
108 unsigned char *data = row;
109
110 if (depth == 24)
111 for (int x = 0; x < width; x++)
112 {
113 r = *data++;
114 g = *data++;
115 b = *data++;
116 *line++ = 0;
117 *line++ = r;
118 *line++ = g;
119 *line++ = b;
120 }
121 else
122 for (int x = 0; x < width; x++)
123 {
124 r = *data++;
125 g = *data++;
126 b = *data++;
127 a = *data++;
128 *line++ = a;
129 *line++ = r;
130 *line++ = g;
131 *line++ = b;
132 }
133
134 row += rowstride;
135 }
136
137 Display *dpy = s->display->dpy;
138
139 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
140 img->alloc ();
141
142 GC gc = XCreateGC (dpy, img->pm, 0, 0);
143 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
144 XFreeGC (dpy, gc);
145
146 free (xi.data);
147
148 return img;
149}
150
151rxvt_img *
62rxvt_img::new_from_file (rxvt_screen *s, const char *filename) 152rxvt_img::new_from_file (rxvt_screen *s, const char *filename)
63{ 153{
64 GError *err = 0; 154 GError *err = 0;
65 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 155 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
66 156
67 if (!pb) 157 if (!pb)
68 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 158 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
69 159
70 rxvt_img *img = new rxvt_img ( 160 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 161
81 g_object_unref (pb); 162 g_object_unref (pb);
82 163
83 return img; 164 return img;
84} 165}
… …
288 369
289 XRenderFreePicture (dpy, src); 370 XRenderFreePicture (dpy, src);
290 XRenderFreePicture (dpy, dst); 371 XRenderFreePicture (dpy, dst);
291} 372}
292 373
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 * 374rxvt_img *
391rxvt_img::clone () 375rxvt_img::clone ()
392{ 376{
393 return new rxvt_img (*this); 377 return new rxvt_img (*this);
378}
379
380static XRenderPictFormat *
381find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
382{
383 if (format->direct.alphaMask)
384 return format; // already has alpha
385
386 // try to find a suitable alpha format, one bit alpha is enough for our purposes
387 if (format->type == PictTypeDirect)
388 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
389 if (f->direct.alphaMask
390 && f->type == PictTypeDirect
391 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
392 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
393 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
394 return f;
395
396 // should be a very good fallback
397 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
394} 398}
395 399
396rxvt_img * 400rxvt_img *
397rxvt_img::reify () 401rxvt_img::reify ()
398{ 402{
… …
403 407
404 bool alpha = !format->direct.alphaMask 408 bool alpha = !format->direct.alphaMask
405 && (x || y) 409 && (x || y)
406 && repeat == RepeatNone; 410 && repeat == RepeatNone;
407 411
408 rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h, repeat); 412 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
409 img->alloc (); 413 img->alloc ();
410 414
411 Picture src = src_picture (); 415 Picture src = src_picture ();
412 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 416 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
413 417
418 if (alpha)
419 {
420 XRenderColor rc = { 0, 0, 0, 0 };
421 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
422 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
423 }
424 else
414 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 425 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
415 426
416 XRenderFreePicture (dpy, src); 427 XRenderFreePicture (dpy, src);
417 XRenderFreePicture (dpy, dst); 428 XRenderFreePicture (dpy, dst);
418 429
419 return img; 430 return img;
420} 431}
… …
454 465
455 for (int i = 0; i < 3; ++i) 466 for (int i = 0; i < 3; ++i)
456 for (int j = 0; j < 3; ++j) 467 for (int j = 0; j < 3; ++j)
457 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 468 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
458 469
470#if 0
459 xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO 471 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
460 xfrm.matrix [0][3] += XDoubleToFixed (y); 472 xfrm.matrix [1][2] -= XDoubleToFixed (y);
473#endif
461 474
462 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 475 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
463 XRenderSetPictureTransform (dpy, src, &xfrm); 476 XRenderSetPictureTransform (dpy, src, &xfrm);
464 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 477 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
465 478
… …
470} 483}
471 484
472rxvt_img * 485rxvt_img *
473rxvt_img::scale (int new_width, int new_height) 486rxvt_img::scale (int new_width, int new_height)
474{ 487{
488 if (w == new_width && h == new_height)
489 return clone ();
490
475 double matrix[9] = { 491 double matrix[9] = {
476 w / (double)new_width, 0, 0, 492 w / (double)new_width, 0, 0,
477 0, h / (double)new_height, 0, 493 0, h / (double)new_height, 0,
478 0, 0, 1 494 0, 0, 1
479 }; 495 };
480 496
497 int old_repeat_mode = repeat;
498 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
499
481 return transform (new_width, new_height, matrix); 500 rxvt_img *img = transform (new_width, new_height, matrix);
501
502 repeat = old_repeat_mode;
503 img->repeat = repeat;
504
505 return img;
482} 506}
483 507
484rxvt_img * 508rxvt_img *
485rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 509rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
486{ 510{
… …
495 519
496 return transform (new_width, new_height, matrix); 520 return transform (new_width, new_height, matrix);
497} 521}
498 522
499rxvt_img * 523rxvt_img *
500rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 524rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
501{ 525{
502 if (new_format == format) 526 if (new_format == format)
503 return clone (); 527 return clone ();
504 528
505 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h, repeat); 529 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
506 img->alloc (); 530 img->alloc ();
507 531
508 Display *dpy = s->display->dpy; 532 Display *dpy = s->display->dpy;
509 Picture src = src_picture (); 533 Picture src = src_picture ();
510 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 534 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);

Diff Legend

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