ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.191 by sf-exg, Fri Dec 30 11:22:48 2011 UTC vs.
Revision 1.212 by sf-exg, Sun May 13 15:50:18 2012 UTC

3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it> 8 * Copyright (c) 2010-2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 13 * (at your option) any later version.
20 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
24 24
25#include <cmath> 25#include <math.h>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#if XRENDER 29#if XRENDER
30# include <X11/extensions/Xrender.h> 30# include <X11/extensions/Xrender.h>
31#endif 31#endif
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif
36
37#ifndef RepeatPad
38#define RepeatPad True
35#endif 39#endif
36 40
37#ifdef HAVE_BG_PIXMAP 41#ifdef HAVE_BG_PIXMAP
38# if XRENDER 42# if XRENDER
39static Picture 43static Picture
54# endif 58# endif
55 59
56void 60void
57rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
58{ 62{
59#ifdef HAVE_AFTERIMAGE
60 if (original_asim)
61 safe_asimage_destroy (original_asim);
62 if (asv)
63 destroy_asvisual (asv, 0);
64 if (asimman)
65 destroy_image_manager (asimman, 0);
66#endif
67
68#ifdef HAVE_PIXBUF 63#ifdef HAVE_PIXBUF
69 if (pixbuf) 64 if (pixbuf)
70 g_object_unref (pixbuf); 65 g_object_unref (pixbuf);
71#endif 66#endif
72 67
125 120
126 return false; 121 return false;
127} 122}
128 123
129# ifdef BG_IMAGE_FROM_FILE 124# ifdef BG_IMAGE_FROM_FILE
130static inline bool
131check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
132{
133 if (geom_flags & flag)
134 {
135 if (new_value > 1000)
136 new_value = 1000;
137 if (new_value != scale)
138 {
139 scale = new_value;
140 return true;
141 }
142 }
143 return false;
144}
145
146static inline bool
147check_set_align_value (int geom_flags, int flag, int &align, int new_value)
148{
149 if (geom_flags & flag)
150 {
151 if (new_value < -100)
152 new_value = -100;
153 else if (new_value > 200)
154 new_value = 200;
155 if (new_value != align)
156 {
157 align = new_value;
158 return true;
159 }
160 }
161 return false;
162}
163
164static inline int 125static inline int
165make_align_position (int align, int window_size, int image_size) 126make_align_position (int align, int window_size, int image_size)
166{ 127{
167 int diff = window_size - image_size;
168 int smaller = min (image_size, window_size);
169
170 if (align >= 0 && align <= 100) 128 if (align >= 0 && align <= 100)
171 return diff * align / 100; 129 return lerp (0, window_size - image_size, align);
172 else if (align > 100 && align <= 200) 130 else if (align > 100)
173 return (align - 100) * smaller / 100 + window_size - smaller; 131 return lerp (window_size - image_size, window_size, align - 100);
174 else if (align >= -100 && align < 0) 132 else
175 return (align + 100) * smaller / 100 - image_size; 133 return lerp (-image_size, 0, align + 100);
176 return 0;
177} 134}
178 135
179static inline int 136static inline int
180make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 137make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
181{ 138{
187 src_pos = -pos; 144 src_pos = -pos;
188 dst_pos = 0; 145 dst_pos = 0;
189 dst_size += pos; 146 dst_size += pos;
190 } 147 }
191 148
192 if (dst_pos + dst_size > target_size)
193 dst_size = target_size - dst_pos; 149 min_it (dst_size, target_size - dst_pos);
194 return src_pos; 150 return src_pos;
195} 151}
196 152
197bool 153bool
198rxvt_term::bg_set_geometry (const char *geom, bool update) 154rxvt_term::bg_set_geometry (const char *geom, bool update)
199{ 155{
200 bool changed = false; 156 bool changed = false;
201 int geom_flags = 0; 157 int geom_flags = 0;
202 int x = 0, y = 0; 158 int x = h_align;
159 int y = v_align;
203 unsigned int w = 0, h = 0; 160 unsigned int w = h_scale;
161 unsigned int h = v_scale;
204 unsigned long new_flags = 0; 162 unsigned long new_flags = 0;
205 163
206 if (geom == NULL) 164 if (geom == NULL)
207 return false; 165 return false;
208 166
317 w = h = defaultScale; 275 w = h = defaultScale;
318 else if (!(geom_flags & HeightValue)) 276 else if (!(geom_flags & HeightValue))
319 h = w; 277 h = w;
320 else if (!(geom_flags & WidthValue)) 278 else if (!(geom_flags & WidthValue))
321 w = h; 279 w = h;
322
323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
324 } 280 }
325 281
326 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 282 min_it (w, 1000);
327 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 283 min_it (h, 1000);
328 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 284 clamp_it (x, -100, 200);
329 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 285 clamp_it (y, -100, 200);
330 286
331 if (new_flags != bg_flags) 287 if (bg_flags != new_flags
288 || h_scale != w
289 || v_scale != h
290 || h_align != x
291 || v_align != y)
332 { 292 {
333 bg_flags = new_flags; 293 bg_flags = new_flags;
294 h_scale = w;
295 v_scale = h;
296 h_align = x;
297 v_align = y;
334 changed = true; 298 changed = true;
335 } 299 }
336 300
337 return changed; 301 return changed;
338} 302}
366 { 330 {
367 x = make_align_position (h_align, target_width, w); 331 x = make_align_position (h_align, target_width, w);
368 y = make_align_position (v_align, target_height, h); 332 y = make_align_position (v_align, target_height, h);
369 } 333 }
370 334
371 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
372 if (!(bg_flags & BG_TILE) 335 if (!(bg_flags & BG_TILE)
373 || h_scale || v_scale 336 || h_scale || v_scale
374 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 337 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
375 || w > target_width || h > target_height) 338 || image_width > target_width || image_height > target_height)
376 bg_flags |= BG_IS_SIZE_SENSITIVE; 339 bg_flags |= BG_IS_SIZE_SENSITIVE;
377}
378
379# ifdef HAVE_AFTERIMAGE
380bool
381rxvt_term::render_image (unsigned long tr_flags)
382{
383 init_asv ();
384
385 ASImage *background = NULL;
386 ARGB32 background_tint = TINT_LEAVE_SAME;
387
388# ifdef ENABLE_TRANSPARENCY
389 if (tr_flags)
390 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
391
392 if (tr_flags & BG_NEEDS_TINT)
393 {
394 ShadingInfo as_shade;
395 as_shade.shading = shade;
396
397 rgba c;
398 tint.get (c);
399 as_shade.tintColor.red = c.r;
400 as_shade.tintColor.green = c.g;
401 as_shade.tintColor.blue = c.b;
402
403 background_tint = shading2tint32 (&as_shade);
404 }
405
406 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
407 {
408 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
409 ASA_XImage,
410 100, ASIMAGE_QUALITY_DEFAULT);
411 if (tmp)
412 {
413 destroy_asimage (&background);
414 background = tmp;
415 }
416 }
417# endif
418
419 ASImage *result = 0;
420
421 int target_width = szHint.width;
422 int target_height = szHint.height;
423 int new_pmap_width = target_width;
424 int new_pmap_height = target_height;
425
426 int x = 0;
427 int y = 0;
428 int w = 0;
429 int h = 0;
430
431 if (original_asim)
432 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
433
434 if (!original_asim
435 || (!(bg_flags & BG_ROOT_ALIGN)
436 && (x >= target_width
437 || y >= target_height
438 || x + w <= 0
439 || y + h <= 0)))
440 {
441 if (background)
442 {
443 new_pmap_width = background->width;
444 new_pmap_height = background->height;
445 result = background;
446
447 if (background_tint != TINT_LEAVE_SAME)
448 {
449 ASImage *tmp = tile_asimage (asv, background, 0, 0,
450 target_width, target_height, background_tint,
451 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
452 if (tmp)
453 result = tmp;
454 }
455 }
456 else
457 new_pmap_width = new_pmap_height = 0;
458 }
459 else 340 else
460 { 341 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
461 result = original_asim;
462
463 if (w != original_asim->width
464 || h != original_asim->height)
465 {
466 result = scale_asimage (asv, original_asim,
467 w, h,
468 ASA_XImage,
469 100, ASIMAGE_QUALITY_DEFAULT);
470 }
471
472 if (background == NULL)
473 {
474 if (bg_flags & BG_TILE)
475 {
476 /* if tiling - pixmap has to be sized exactly as the image,
477 but there is no need to make it bigger than the window! */
478 new_pmap_width = min (result->width, target_width);
479 new_pmap_height = min (result->height, target_height);
480
481 /* we also need to tile our image in both directions */
482 ASImage *tmp = tile_asimage (asv, result,
483 (int)result->width - x,
484 (int)result->height - y,
485 new_pmap_width,
486 new_pmap_height,
487 TINT_LEAVE_SAME, ASA_XImage,
488 100, ASIMAGE_QUALITY_DEFAULT);
489 if (tmp)
490 {
491 if (result != original_asim)
492 destroy_asimage (&result);
493
494 result = tmp;
495 }
496 }
497 }
498 else
499 {
500 /* if blending background and image - pixmap has to be sized same as target window */
501 ASImageLayer *layers = create_image_layers (2);
502
503 layers[0].im = background;
504 layers[0].clip_width = target_width;
505 layers[0].clip_height = target_height;
506 layers[0].tint = background_tint;
507 layers[1].im = result;
508
509 if (bg_flags & BG_TILE)
510 {
511 /* tile horizontally */
512 while (x > 0) x -= (int)result->width;
513 layers[1].dst_x = x;
514 layers[1].clip_width = result->width+target_width;
515 }
516 else
517 {
518 /* clip horizontally */
519 layers[1].dst_x = x;
520 layers[1].clip_width = result->width;
521 }
522
523 if (bg_flags & BG_TILE)
524 {
525 while (y > 0) y -= (int)result->height;
526 layers[1].dst_y = y;
527 layers[1].clip_height = result->height + target_height;
528 }
529 else
530 {
531 layers[1].dst_y = y;
532 layers[1].clip_height = result->height;
533 }
534
535 if (rs[Rs_blendtype])
536 {
537 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
538 if (layers[1].merge_scanlines == NULL)
539 layers[1].merge_scanlines = alphablend_scanlines;
540 }
541
542 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
543 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
544
545 if (tmp)
546 {
547 if (result != original_asim)
548 destroy_asimage (&result);
549
550 result = tmp;
551 }
552
553 free (layers);
554 }
555 }
556
557 bool ret = false;
558
559 if (result)
560 {
561 XGCValues gcv;
562 GC gc;
563
564 /* create Pixmap */
565 if (bg_pixmap == None
566 || bg_pmap_width != new_pmap_width
567 || bg_pmap_height != new_pmap_height)
568 {
569 if (bg_pixmap)
570 XFreePixmap (dpy, bg_pixmap);
571 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
572 bg_pmap_width = new_pmap_width;
573 bg_pmap_height = new_pmap_height;
574 }
575 /* fill with background color (if result's not completely overlapping it) */
576 gcv.foreground = pix_colors[Color_bg];
577 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
578
579 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
580 int dst_width = result->width, dst_height = result->height;
581 if (background == NULL)
582 {
583 if (!(bg_flags & BG_TILE))
584 {
585 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
586 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
587 }
588
589 if (dst_x > 0 || dst_y > 0
590 || dst_x + dst_width < new_pmap_width
591 || dst_y + dst_height < new_pmap_height)
592 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
593 }
594
595 /* put result on pixmap */
596 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
597 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
598
599 if (result != background && result != original_asim)
600 destroy_asimage (&result);
601
602 XFreeGC (dpy, gc);
603
604 ret = true;
605 }
606
607 if (background)
608 destroy_asimage (&background);
609
610 return ret;
611} 342}
612# endif /* HAVE_AFTERIMAGE */
613 343
614# ifdef HAVE_PIXBUF 344# ifdef HAVE_PIXBUF
615bool 345bool
616rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 346rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
617 int src_x, int src_y, int dst_x, int dst_y, 347 int src_x, int src_y, int dst_x, int dst_y,
618 unsigned int width, unsigned int height) 348 unsigned int width, unsigned int height)
619{ 349{
620 XImage *ximage; 350 XImage *ximage;
621 char *data, *line; 351 char *line;
622 int bytes_per_pixel;
623 int width_r, width_g, width_b; 352 int width_r, width_g, width_b, width_a;
624 int sh_r, sh_g, sh_b; 353 int sh_r, sh_g, sh_b, sh_a;
354 uint32_t alpha_mask;
625 int rowstride; 355 int rowstride;
626 int channels; 356 int channels;
627 unsigned char *row; 357 unsigned char *row;
628 358
629 if (visual->c_class != TrueColor) 359 if (visual->c_class != TrueColor)
630 return false; 360 return false;
631 361
632 if (depth == 24 || depth == 32) 362#if XRENDER
633 bytes_per_pixel = 4; 363 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
634 else if (depth == 15 || depth == 16) 364 if (format)
635 bytes_per_pixel = 2; 365 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
636 else 366 else
637 return false; 367#endif
368 alpha_mask = 0;
638 369
639 width_r = ecb_popcount32 (visual->red_mask); 370 width_r = ecb_popcount32 (visual->red_mask);
640 width_g = ecb_popcount32 (visual->green_mask); 371 width_g = ecb_popcount32 (visual->green_mask);
641 width_b = ecb_popcount32 (visual->blue_mask); 372 width_b = ecb_popcount32 (visual->blue_mask);
373 width_a = ecb_popcount32 (alpha_mask);
642 374
643 if (width_r > 8 || width_g > 8 || width_b > 8) 375 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
644 return false; 376 return false;
645 377
646 sh_r = ecb_ctz32 (visual->red_mask); 378 sh_r = ecb_ctz32 (visual->red_mask);
647 sh_g = ecb_ctz32 (visual->green_mask); 379 sh_g = ecb_ctz32 (visual->green_mask);
648 sh_b = ecb_ctz32 (visual->blue_mask); 380 sh_b = ecb_ctz32 (visual->blue_mask);
381 sh_a = ecb_ctz32 (alpha_mask);
649 382
650 if (width > INT_MAX / height / bytes_per_pixel) 383 if (width > 32767 || height > 32767)
651 return false; 384 return false;
652 385
653 data = (char *)malloc (width * height * bytes_per_pixel); 386 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, 0,
654 if (!data) 387 width, height, 32, 0);
388 if (!ximage)
655 return false; 389 return false;
656 390
657 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data, 391 if (height > INT_MAX / ximage->bytes_per_line
658 width, height, bytes_per_pixel * 8, 0); 392 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
659 if (!ximage)
660 { 393 {
661 free (data); 394 XDestroyImage (ximage);
662 return false; 395 return false;
663 } 396 }
664 397
665 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 398 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
666 399
667 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 400 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
668 channels = gdk_pixbuf_get_n_channels (pixbuf); 401 channels = gdk_pixbuf_get_n_channels (pixbuf);
669 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 402 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
670 line = data; 403 line = ximage->data;
404
405 rgba c (0, 0, 0);
406
407 if (channels == 4 && alpha_mask == 0)
408 {
409 pix_colors[Color_bg].get (c);
410 c.r >>= 8;
411 c.g >>= 8;
412 c.b >>= 8;
413 }
671 414
672 for (int y = 0; y < height; y++) 415 for (int y = 0; y < height; y++)
673 { 416 {
674 for (int x = 0; x < width; x++) 417 for (int x = 0; x < width; x++)
675 { 418 {
676 unsigned char *pixel = row + x * channels; 419 unsigned char *pixel = row + x * channels;
677 uint32_t value; 420 uint32_t value;
421 unsigned char r, g, b, a;
678 422
423 if (channels == 4)
424 {
425 a = pixel[3];
426 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
427 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
428 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
429 }
430 else
431 {
432 a = 0xff;
433 r = pixel[0];
434 g = pixel[1];
435 b = pixel[2];
436 }
437
679 value = ((pixel[0] >> (8 - width_r)) << sh_r) 438 value = ((r >> (8 - width_r)) << sh_r)
680 | ((pixel[1] >> (8 - width_g)) << sh_g) 439 | ((g >> (8 - width_g)) << sh_g)
681 | ((pixel[2] >> (8 - width_b)) << sh_b); 440 | ((b >> (8 - width_b)) << sh_b)
441 | ((a >> (8 - width_a)) << sh_a);
682 442
683 if (bytes_per_pixel == 4) 443 if (ximage->bits_per_pixel == 32)
684 ((uint32_t *)line)[x] = value; 444 ((uint32_t *)line)[x] = value;
685 else 445 else
686 ((uint16_t *)line)[x] = value; 446 XPutPixel (ximage, x, y, value);
687 } 447 }
688 448
689 row += rowstride; 449 row += rowstride;
690 line += ximage->bytes_per_line; 450 line += ximage->bytes_per_line;
691 } 451 }
694 XDestroyImage (ximage); 454 XDestroyImage (ximage);
695 return true; 455 return true;
696} 456}
697 457
698bool 458bool
699rxvt_term::render_image (unsigned long tr_flags) 459rxvt_term::render_image (bool transparent)
700{ 460{
701 if (!pixbuf) 461 if (!pixbuf)
702 return false; 462 return false;
703 463
704 if (tr_flags 464 if (transparent
705 && !(bg_flags & BG_HAS_RENDER)) 465 && !(bg_flags & BG_HAS_RENDER))
706 return false; 466 return false;
707 467
708 GdkPixbuf *result; 468 GdkPixbuf *result;
709 469
749 Pixmap root_pmap; 509 Pixmap root_pmap;
750 510
751 image_width = gdk_pixbuf_get_width (result); 511 image_width = gdk_pixbuf_get_width (result);
752 image_height = gdk_pixbuf_get_height (result); 512 image_height = gdk_pixbuf_get_height (result);
753 513
754 if (tr_flags) 514 if (transparent)
755 { 515 {
756 root_pmap = bg_pixmap; 516 root_pmap = bg_pixmap;
757 bg_pixmap = None; 517 bg_pixmap = None;
758 } 518 }
759 else 519 else
817 dst_x, dst_y, 577 dst_x, dst_y,
818 dst_width, dst_height); 578 dst_width, dst_height);
819 } 579 }
820 580
821#if XRENDER 581#if XRENDER
822 if (tr_flags) 582 if (transparent)
823 { 583 {
824 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 584 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
825 585
826 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0); 586 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
827 587
830 Picture mask = create_xrender_mask (dpy, vt, False, False); 590 Picture mask = create_xrender_mask (dpy, vt, False, False);
831 591
832 XRenderColor mask_c; 592 XRenderColor mask_c;
833 593
834 mask_c.alpha = 0x8000; 594 mask_c.alpha = 0x8000;
835 mask_c.red = 0; 595 mask_c.red =
836 mask_c.green = 0; 596 mask_c.green =
837 mask_c.blue = 0; 597 mask_c.blue = 0;
838 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 598 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
599
839 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 600 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
840 601
841 XRenderFreePicture (dpy, src); 602 XRenderFreePicture (dpy, src);
842 XRenderFreePicture (dpy, dst); 603 XRenderFreePicture (dpy, dst);
843 XRenderFreePicture (dpy, mask); 604 XRenderFreePicture (dpy, mask);
850 } 611 }
851 612
852 if (result != pixbuf) 613 if (result != pixbuf)
853 g_object_unref (result); 614 g_object_unref (result);
854 615
855 if (tr_flags) 616 if (transparent)
856 XFreePixmap (dpy, root_pmap); 617 XFreePixmap (dpy, root_pmap);
857 618
858 return ret; 619 return ret;
859} 620}
860# endif /* HAVE_PIXBUF */ 621# endif /* HAVE_PIXBUF */
875 memcpy (f, file, len); 636 memcpy (f, file, len);
876 f[len] = '\0'; 637 f[len] = '\0';
877 file = f; 638 file = f;
878 } 639 }
879 640
880# ifdef HAVE_AFTERIMAGE
881 if (!asimman)
882 asimman = create_generic_imageman (rs[Rs_path]);
883 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
884 if (image)
885 {
886 if (original_asim)
887 safe_asimage_destroy (original_asim);
888 original_asim = image;
889 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
890 ret = true;
891 }
892# endif
893
894# ifdef HAVE_PIXBUF 641# ifdef HAVE_PIXBUF
895 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 642 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
896 if (image) 643 if (image)
897 { 644 {
898 if (pixbuf) 645 if (pixbuf)
916 663
917# endif /* BG_IMAGE_FROM_FILE */ 664# endif /* BG_IMAGE_FROM_FILE */
918 665
919# ifdef ENABLE_TRANSPARENCY 666# ifdef ENABLE_TRANSPARENCY
920bool 667bool
921rxvt_term::bg_set_transparent ()
922{
923 if (!(bg_flags & BG_IS_TRANSPARENT))
924 {
925 bg_flags |= BG_IS_TRANSPARENT;
926 return true;
927 }
928
929 return false;
930}
931
932bool
933rxvt_term::bg_set_blur (const char *geom) 668rxvt_term::bg_set_blur (const char *geom)
934{ 669{
935 bool changed = false; 670 bool changed = false;
936 unsigned int hr, vr; 671 unsigned int hr, vr;
937 int junk; 672 int junk;
955 { 690 {
956 changed = true; 691 changed = true;
957 v_blurRadius = vr; 692 v_blurRadius = vr;
958 } 693 }
959 694
960 if (v_blurRadius == 0 && h_blurRadius == 0)
961 bg_flags &= ~BG_NEEDS_BLUR;
962 else
963 bg_flags |= BG_NEEDS_BLUR;
964
965 return changed; 695 return changed;
966} 696}
967 697
968void
969rxvt_term::set_tint_shade_flags ()
970{
971 rgba c;
972 bool has_shade = shade != 100;
973
974 bg_flags &= ~BG_TINT_FLAGS;
975
976 tint.get (c);
977
978 if (!has_shade
979 && (c.r <= 0x00ff || c.r >= 0xff00)
980 && (c.g <= 0x00ff || c.g >= 0xff00)
981 && (c.b <= 0x00ff || c.b >= 0xff00))
982 bg_flags |= BG_TINT_BITAND;
983
984 if (has_shade
985 || c.r < 0xff00
986 || c.g < 0xff00
987 || c.b < 0xff00)
988 bg_flags |= BG_NEEDS_TINT;
989}
990
991bool 698bool
992rxvt_term::bg_set_tint (rxvt_color &new_tint) 699rxvt_term::bg_set_tint (rxvt_color &new_tint)
993{ 700{
994 if (tint != new_tint) 701 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
995 { 702 {
996 tint = new_tint; 703 tint = new_tint;
997 set_tint_shade_flags (); 704 bg_flags |= BG_TINT_SET;
705
706 rgba c;
707 tint.get (c);
708 if ((c.r <= 0x00ff || c.r >= 0xff00)
709 && (c.g <= 0x00ff || c.g >= 0xff00)
710 && (c.b <= 0x00ff || c.b >= 0xff00))
711 bg_flags |= BG_TINT_BITAND;
712 else
713 bg_flags &= ~BG_TINT_BITAND;
714
998 return true; 715 return true;
999 } 716 }
1000 717
1001 return false; 718 return false;
1002} 719}
1011 new_shade = 200 - (100 + new_shade); 728 new_shade = 200 - (100 + new_shade);
1012 729
1013 if (new_shade != shade) 730 if (new_shade != shade)
1014 { 731 {
1015 shade = new_shade; 732 shade = new_shade;
1016 set_tint_shade_flags ();
1017 return true; 733 return true;
1018 } 734 }
1019 735
1020 return false; 736 return false;
1021} 737}
1042 params[i+2] = XDoubleToFixed (kernel[i] / sum); 758 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1043} 759}
1044#endif 760#endif
1045 761
1046bool 762bool
1047rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 763rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1048{ 764{
1049 bool ret = false; 765 bool ret = false;
1050#if XRENDER 766#if XRENDER
1051 if (!(bg_flags & BG_HAS_RENDER_CONV)) 767 if (!(bg_flags & BG_HAS_RENDER_CONV))
1052 return false; 768 return false;
1053 769
1054 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 770 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1055 double *kernel = (double *)malloc (size * sizeof (double)); 771 double *kernel = (double *)malloc (size * sizeof (double));
1056 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 772 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1057 773
774 XRenderPictureAttributes pa;
1058 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 775 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1059 776
777 pa.repeat = RepeatPad;
1060 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, 0); 778 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
779 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1061 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, 0); 780 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
781 XFreePixmap (dpy, tmp);
1062 782
1063 if (kernel && params) 783 if (kernel && params)
1064 { 784 {
1065 if (h_blurRadius)
1066 {
1067 size = h_blurRadius * 2 + 1; 785 size = h_blurRadius * 2 + 1;
1068 get_gaussian_kernel (h_blurRadius, size, kernel, params); 786 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1069 787
1070 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 788 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1071 XRenderComposite (dpy, 789 XRenderComposite (dpy,
1072 PictOpSrc, 790 PictOpSrc,
1073 src, 791 src,
1074 None, 792 None,
1075 dst, 793 dst,
1076 0, 0, 794 0, 0,
1077 0, 0, 795 0, 0,
1078 0, 0, 796 0, 0,
1079 width, height); 797 width, height);
1080 }
1081 798
1082 if (v_blurRadius) 799 ::swap (src, dst);
1083 { 800
1084 size = v_blurRadius * 2 + 1; 801 size = v_blurRadius * 2 + 1;
1085 get_gaussian_kernel (v_blurRadius, size, kernel, params); 802 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1086 ::swap (params[0], params[1]); 803 ::swap (params[0], params[1]);
1087 804
1088 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 805 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1089 XRenderComposite (dpy, 806 XRenderComposite (dpy,
1090 PictOpSrc, 807 PictOpSrc,
1091 src, 808 src,
1092 None, 809 None,
1093 dst, 810 dst,
1094 0, 0, 811 0, 0,
1095 0, 0, 812 0, 0,
1096 0, 0, 813 0, 0,
1097 width, height); 814 width, height);
1098 }
1099 815
1100 ret = true; 816 ret = true;
1101 } 817 }
1102 818
1103 free (kernel); 819 free (kernel);
1111bool 827bool
1112rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 828rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1113{ 829{
1114 bool ret = false; 830 bool ret = false;
1115 831
1116 if (bg_flags & BG_TINT_BITAND) 832 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1117 { 833 {
1118 XGCValues gcv; 834 XGCValues gcv;
1119 GC gc; 835 GC gc;
1120 836
1121 /* In this case we can tint image server-side getting significant 837 /* In this case we can tint image server-side getting significant
1133 } 849 }
1134 } 850 }
1135# if XRENDER 851# if XRENDER
1136 else if (bg_flags & BG_HAS_RENDER) 852 else if (bg_flags & BG_HAS_RENDER)
1137 { 853 {
1138 rgba c; 854 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1139 855
856 if (bg_flags & BG_TINT_SET)
1140 tint.get (c); 857 tint.get (c);
1141 858
1142 if (shade <= 100) 859 if (shade <= 100)
1143 { 860 {
1144 c.r = c.r * shade / 100; 861 c.r = c.r * shade / 100;
1145 c.g = c.g * shade / 100; 862 c.g = c.g * shade / 100;
1171 mask_c.alpha = 0; 888 mask_c.alpha = 0;
1172 mask_c.red = 0xffff - c.r; 889 mask_c.red = 0xffff - c.r;
1173 mask_c.green = 0xffff - c.g; 890 mask_c.green = 0xffff - c.g;
1174 mask_c.blue = 0xffff - c.b; 891 mask_c.blue = 0xffff - c.b;
1175 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 892 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
893
1176 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 894 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1177 895
1178 if (shade > 100) 896 if (shade > 100)
1179 { 897 {
1180 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1181 mask_c.alpha = 0; 898 mask_c.alpha = 0;
899 mask_c.red =
900 mask_c.green =
901 mask_c.blue = 0xffff * (shade - 100) / 100;
1182 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 902 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1183 903
1184 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 904 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1185 } 905 }
1186 906
1198/* 918/*
1199 * Builds a pixmap of the same size as the terminal window that contains 919 * Builds a pixmap of the same size as the terminal window that contains
1200 * the tiled portion of the root pixmap that is supposed to be covered by 920 * the tiled portion of the root pixmap that is supposed to be covered by
1201 * our window. 921 * our window.
1202 */ 922 */
1203unsigned long 923bool
1204rxvt_term::make_transparency_pixmap () 924rxvt_term::make_transparency_pixmap ()
1205{ 925{
1206 unsigned long result = 0; 926 bool ret = false;
1207 927
1208 /* root dimensions may change from call to call - but Display structure should 928 /* root dimensions may change from call to call - but Display structure should
1209 * be always up-to-date, so let's use it : 929 * be always up-to-date, so let's use it :
1210 */ 930 */
1211 int screen = display->screen; 931 int screen = display->screen;
1292 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1012 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1293 1013
1294 if (gc) 1014 if (gc)
1295 { 1015 {
1296 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1016 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1017 ret = true;
1018 bool need_blur = h_blurRadius && v_blurRadius;
1019 bool need_tint = shade != 100 || (bg_flags & BG_TINT_SET);
1298 1020
1299 if (!(bg_flags & BG_CLIENT_RENDER)) 1021 if (!(bg_flags & BG_CLIENT_RENDER))
1300 { 1022 {
1301 if (bg_flags & BG_NEEDS_BLUR) 1023 if (need_blur)
1302 { 1024 {
1303 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1025 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1304 result &= ~BG_NEEDS_BLUR; 1026 need_blur = false;
1305 } 1027 }
1306 if (bg_flags & BG_NEEDS_TINT) 1028 if (need_tint)
1307 { 1029 {
1308 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1030 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1309 result &= ~BG_NEEDS_TINT; 1031 need_tint = false;
1310 } 1032 }
1311# ifndef HAVE_AFTERIMAGE 1033 if (need_tint)
1312 if (result & BG_NEEDS_TINT)
1313 { 1034 {
1314 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1035 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1315 if (ximage) 1036 if (ximage)
1316 { 1037 {
1317 /* our own client-side tinting */ 1038 /* our own client-side tinting */
1319 1040
1320 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); 1041 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1321 XDestroyImage (ximage); 1042 XDestroyImage (ximage);
1322 } 1043 }
1323 } 1044 }
1324# endif
1325 } /* server side rendering completed */ 1045 } /* server side rendering completed */
1326 1046
1327 XFreeGC (dpy, gc); 1047 XFreeGC (dpy, gc);
1328 } 1048 }
1329 1049
1330 if (recoded_root_pmap != root_pixmap) 1050 if (recoded_root_pmap != root_pixmap)
1331 XFreePixmap (dpy, recoded_root_pmap); 1051 XFreePixmap (dpy, recoded_root_pmap);
1332 1052
1333 return result; 1053 return ret;
1334} 1054}
1335 1055
1336void 1056void
1337rxvt_term::bg_set_root_pixmap () 1057rxvt_term::bg_set_root_pixmap ()
1338{ 1058{
1345# endif /* ENABLE_TRANSPARENCY */ 1065# endif /* ENABLE_TRANSPARENCY */
1346 1066
1347bool 1067bool
1348rxvt_term::bg_render () 1068rxvt_term::bg_render ()
1349{ 1069{
1350 unsigned long tr_flags = 0; 1070 bool transparent = false;
1351 1071
1352 bg_invalidate (); 1072 bg_invalidate ();
1353# ifdef ENABLE_TRANSPARENCY 1073# ifdef ENABLE_TRANSPARENCY
1354 if (bg_flags & BG_IS_TRANSPARENT) 1074 if (bg_flags & BG_IS_TRANSPARENT)
1355 { 1075 {
1356 /* we need to re-generate transparency pixmap in that case ! */ 1076 /* we need to re-generate transparency pixmap in that case ! */
1357 tr_flags = make_transparency_pixmap (); 1077 transparent = make_transparency_pixmap ();
1358 if (tr_flags == 0) 1078 if (transparent)
1359 return false;
1360 bg_flags |= BG_IS_VALID; 1079 bg_flags |= BG_IS_VALID;
1361 } 1080 }
1362# endif 1081# endif
1363 1082
1364# ifdef BG_IMAGE_FROM_FILE 1083# ifdef BG_IMAGE_FROM_FILE
1365 if ((bg_flags & BG_IS_FROM_FILE) 1084 if (bg_flags & BG_IS_FROM_FILE)
1366 || (tr_flags & BG_EFFECTS_FLAGS))
1367 { 1085 {
1368 if (render_image (tr_flags)) 1086 if (render_image (transparent))
1369 bg_flags |= BG_IS_VALID; 1087 bg_flags |= BG_IS_VALID;
1370 } 1088 }
1371# endif 1089# endif
1372 1090
1373 if (!(bg_flags & BG_IS_VALID)) 1091 if (!(bg_flags & BG_IS_VALID))
1389 1107
1390void 1108void
1391rxvt_term::bg_init () 1109rxvt_term::bg_init ()
1392{ 1110{
1393#ifdef ENABLE_TRANSPARENCY 1111#ifdef ENABLE_TRANSPARENCY
1394 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1395 tint.set (this, c);
1396 shade = 100; 1112 shade = 100;
1397#endif 1113#endif
1398 1114
1399 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1115 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1400#if XRENDER 1116#if XRENDER
1413#endif 1129#endif
1414} 1130}
1415 1131
1416#endif /* HAVE_BG_PIXMAP */ 1132#endif /* HAVE_BG_PIXMAP */
1417 1133
1418#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1134#ifdef ENABLE_TRANSPARENCY
1419/* based on code from aterm-0.4.2 */ 1135/* based on code from aterm-0.4.2 */
1420 1136
1421static inline void 1137static inline void
1422fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) 1138fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1423{ 1139{
1431} 1147}
1432 1148
1433void 1149void
1434rxvt_term::tint_ximage (Visual *visual, XImage *ximage) 1150rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1435{ 1151{
1152 unsigned int size_r, size_g, size_b;
1436 int sh_r, sh_g, sh_b; 1153 int sh_r, sh_g, sh_b;
1437 uint32_t mask_r, mask_g, mask_b; 1154 uint32_t mask_r, mask_g, mask_b;
1438 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1155 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1439 unsigned short low; 1156 unsigned short low;
1440 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1157 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1445 mask_r = visual->red_mask; 1162 mask_r = visual->red_mask;
1446 mask_g = visual->green_mask; 1163 mask_g = visual->green_mask;
1447 mask_b = visual->blue_mask; 1164 mask_b = visual->blue_mask;
1448 1165
1449 /* boring lookup table pre-initialization */ 1166 /* boring lookup table pre-initialization */
1450 switch (ximage->depth) 1167 sh_r = ecb_ctz32 (mask_r);
1451 { 1168 sh_g = ecb_ctz32 (mask_g);
1452 case 15: 1169 sh_b = ecb_ctz32 (mask_b);
1453 if ((mask_r != 0x7c00) || 1170
1454 (mask_g != 0x03e0) || 1171 size_r = mask_r >> sh_r;
1455 (mask_b != 0x001f)) 1172 size_g = mask_g >> sh_g;
1173 size_b = mask_b >> sh_b;
1174
1175 if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255)
1456 return; 1176 return;
1457 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); 1177
1178 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1458 lookup_r = lookup; 1179 lookup_r = lookup;
1459 lookup_g = lookup+32; 1180 lookup_g = lookup + size_r;
1460 lookup_b = lookup+32+32; 1181 lookup_b = lookup + size_r + size_g;
1461 sh_r = 10;
1462 sh_g = 5;
1463 sh_b = 0;
1464 break;
1465 case 16:
1466 if ((mask_r != 0xf800) ||
1467 (mask_g != 0x07e0) ||
1468 (mask_b != 0x001f))
1469 return;
1470 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1471 lookup_r = lookup;
1472 lookup_g = lookup+32;
1473 lookup_b = lookup+32+64;
1474 sh_r = 11;
1475 sh_g = 5;
1476 sh_b = 0;
1477 break;
1478 case 24:
1479 if ((mask_r != 0xff0000) ||
1480 (mask_g != 0x00ff00) ||
1481 (mask_b != 0x0000ff))
1482 return;
1483 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1484 lookup_r = lookup;
1485 lookup_g = lookup+256;
1486 lookup_b = lookup+256+256;
1487 sh_r = 16;
1488 sh_g = 8;
1489 sh_b = 0;
1490 break;
1491 case 32:
1492 if ((mask_r != 0xff0000) ||
1493 (mask_g != 0x00ff00) ||
1494 (mask_b != 0x0000ff))
1495 return;
1496 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1497 lookup_r = lookup;
1498 lookup_g = lookup+256;
1499 lookup_b = lookup+256+256;
1500 sh_r = 16;
1501 sh_g = 8;
1502 sh_b = 0;
1503 break;
1504 default:
1505 return; /* we do not support this color depth */
1506 }
1507 1182
1508 rgba c; 1183 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1509 1184
1185 if (bg_flags & BG_TINT_SET)
1510 tint.get (c); 1186 tint.get (c);
1511 1187
1512 /* prepare limits for color transformation (each channel is handled separately) */ 1188 /* prepare limits for color transformation (each channel is handled separately) */
1513 if (shade > 100) 1189 if (shade > 100)
1514 { 1190 {
1515 c.r = c.r * (200 - shade) / 100; 1191 c.r = c.r * (200 - shade) / 100;
1532 fill_lut (lookup_g, mask_g, sh_g, low, c.g); 1208 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1533 fill_lut (lookup_b, mask_b, sh_b, low, c.b); 1209 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1534 1210
1535 /* apply table to input image (replacing colors by newly calculated ones) */ 1211 /* apply table to input image (replacing colors by newly calculated ones) */
1536 if (ximage->bits_per_pixel == 32 1212 if (ximage->bits_per_pixel == 32
1537 && (ximage->depth == 24 || ximage->depth == 32)
1538 && ximage->byte_order == host_byte_order) 1213 && ximage->byte_order == host_byte_order)
1539 { 1214 {
1540 uint32_t *p1, *pf, *p, *pl; 1215 char *line = ximage->data;
1541 p1 = (uint32_t *) ximage->data;
1542 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1543 1216
1544 while (p1 < pf) 1217 for (int y = 0; y < ximage->height; y++)
1545 {
1546 p = p1;
1547 pl = p1 + ximage->width;
1548 for (; p < pl; p++)
1549 { 1218 {
1550 *p = lookup_r[(*p & 0xff0000) >> 16] | 1219 uint32_t *p = (uint32_t *)line;
1551 lookup_g[(*p & 0x00ff00) >> 8] | 1220 for (int x = 0; x < ximage->width; x++)
1552 lookup_b[(*p & 0x0000ff)] |
1553 (*p & 0xff000000);
1554 } 1221 {
1555 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); 1222 *p = lookup_r[(*p & mask_r) >> sh_r] |
1223 lookup_g[(*p & mask_g) >> sh_g] |
1224 lookup_b[(*p & mask_b) >> sh_b];
1225 p++;
1226 }
1227 line += ximage->bytes_per_line;
1556 } 1228 }
1557 } 1229 }
1558 else 1230 else
1559 { 1231 {
1560 for (int y = 0; y < ximage->height; y++) 1232 for (int y = 0; y < ximage->height; y++)
1568 } 1240 }
1569 } 1241 }
1570 1242
1571 free (lookup); 1243 free (lookup);
1572} 1244}
1573#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1245#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines