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.37 by sf-exg, Sun Jan 31 09:02:48 2010 UTC vs.
Revision 1.95 by sf-exg, Fri Oct 22 16:21:05 2010 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 <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
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 * 9 *
9 * 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
10 * 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
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
19 * 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
20 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
25#include <cmath>
24#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
26 28
27#define DO_TIMING_TEST 0 29#define DO_TIMING_TEST 0
28 30
29#if DO_TIMING_TEST 31#if DO_TIMING_TEST
30# include <sys/time.h> 32# include <sys/time.h>
31#define TIMING_TEST_START(id) \ 33#define TIMING_TEST_START(id) \
32 struct timeval timing_test_##id##_stv;\ 34 struct timeval timing_test_##id##_stv; \
33 gettimeofday (&timing_test_##id##_stv, NULL); 35 gettimeofday (&timing_test_##id##_stv, NULL);
34 36
35#define TIMING_TEST_PRINT_RESULT(id) \ 37#define TIMING_TEST_PRINT_RESULT(id) \
36 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 38 do { \
39 struct timeval tv; \
40 gettimeofday (&tv, NULL); \
41 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
37 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 42 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
38 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0) 43 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
44 } while (0)
39 45
40#else 46#else
41#define TIMING_TEST_START(id) do{}while (0) 47#define TIMING_TEST_START(id) do {} while (0)
42#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 48#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
43#endif 49#endif
44 50
45/* 51/*
46 * Pixmap geometry string interpretation : 52 * Pixmap geometry string interpretation :
47 * Each geometry string contains zero or one scale/position 53 * Each geometry string contains zero or one scale/position
48 * adjustment and may optionally be followed by a colon and one or more 54 * adjustment and may optionally be followed by a colon and one or more
49 * colon-delimited pixmap operations. 55 * colon-delimited pixmap operations.
50 * The following table shows the valid geometry strings and their 56 * The following table shows the valid geometry strings and their
51 * affects on the background image : 57 * effects on the background image :
52 * 58 *
53 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 59 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
54 * W and H are percentages of the terminal window size. 60 * W and H are percentages of the terminal window size.
55 * X and Y are also percentages; e.g., +50+50 centers 61 * X and Y are also percentages; e.g., +50+50 centers
56 * the image in the window. 62 * the image in the window.
57 * WxH+X Assumes Y == X 63 * WxH+X Assumes Y == X
58 * WxH Assumes Y == X == 50 (centers the image) 64 * WxH Assumes Y == X == 50 (centers the image)
59 * W+X+Y Assumes H == W 65 * W+X+Y Assumes H == W
60 * W+X Assumes H == W and Y == X 66 * W+X Assumes H == W and Y == X
61 * W Assumes H == W and Y == X == 50 67 * W Assumes H == W and Y == X == 50
62 * 68 *
63 * Adjusting position only : 69 * Adjusting position only :
64 * =+X+Y Set position to X% by Y% (absolute). 70 * =+X+Y Set position to X% by Y% (absolute).
65 * =+X Set position to X% by X%. 71 * =+X Set position to X% by X%.
66 * +X+Y Adjust position horizontally X% and vertically Y% 72 * +X+Y Adjust position horizontally X% and vertically Y%
67 * from current position (relative). 73 * from current position (relative).
68 * +X Adjust position horizontally X% and vertically X% 74 * +X Adjust position horizontally X% and vertically X%
69 * from current position. 75 * from current position.
70 * 76 *
71 * Adjusting scale only : 77 * Adjusting scale only :
72 * Wx0 Multiply horizontal scaling factor by W% 78 * Wx0 Multiply horizontal scaling factor by W%
73 * 0xH Multiply vertical scaling factor by H% 79 * 0xH Multiply vertical scaling factor by H%
74 * 0x0 No scaling (show image at normal size). 80 * 0x0 No scaling (show image at normal size).
75 * 81 *
76 * Pixmap Operations : (should be prepended by a colon) 82 * Pixmap Operations : (should be prepended by a colon)
77 * tile Tile image. Scaling/position modifiers above will affect 83 * tile Tile image. Scaling/position modifiers above will affect
78 * the tile size and origin. 84 * the tile size and origin.
79 * propscale When scaling, scale proportionally. That is, maintain the 85 * propscale When scaling, scale proportionally. That is, maintain the
80 * proper aspect ratio for the image. Any portion of the 86 * proper aspect ratio for the image. Any portion of the
81 * background not covered by the image is filled with the 87 * background not covered by the image is filled with the
82 * current background color. 88 * current background color.
83 * hscale Scale horizontally, tile vertically ? 89 * hscale Scale horizontally, tile vertically ?
84 * vscale Tile horizontally, scale vertically ? 90 * vscale Tile horizontally, scale vertically ?
92 // this is basically redundant as bgPixmap_t is only used in 98 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs 99 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE 100#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 101 original_asim = NULL;
96#endif 102#endif
103#ifdef HAVE_PIXBUF
104 pixbuf = NULL;
105#endif
97#ifdef BG_IMAGE_FROM_FILE 106#ifdef BG_IMAGE_FROM_FILE
107 have_image = false;
98 h_scale = v_scale = 0; 108 h_scale = v_scale = 0;
99 h_align = v_align = 0; 109 h_align = v_align = 0;
110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
100#endif 113#endif
101 flags = 0; 114 flags = 0;
102 pixmap = None; 115 pixmap = None;
103 valid_since = invalid_since = 0; 116 valid_since = invalid_since = 0;
104 target = 0; 117 target = 0;
110#ifdef HAVE_AFTERIMAGE 123#ifdef HAVE_AFTERIMAGE
111 if (original_asim) 124 if (original_asim)
112 safe_asimage_destroy (original_asim); 125 safe_asimage_destroy (original_asim);
113#endif 126#endif
114 127
128#ifdef HAVE_PIXBUF
129 if (pixbuf)
130 g_object_unref (pixbuf);
131#endif
132
115 if (pixmap && target) 133 if (pixmap && target)
116 XFreePixmap (target->dpy, pixmap); 134 XFreePixmap (target->dpy, pixmap);
117} 135}
118 136
119bool 137bool
123 if (flags & isTransparent) 141 if (flags & isTransparent)
124 return true; 142 return true;
125# endif 143# endif
126 144
127# ifdef BG_IMAGE_FROM_FILE 145# ifdef BG_IMAGE_FROM_FILE
128# ifdef HAVE_AFTERIMAGE 146 if (have_image)
129 if (original_asim)
130# endif
131 { 147 {
132 if (h_scale != 0 || v_scale != 0 148 if (flags & sizeSensitive)
133 || h_align != 0 || v_align != 0)
134 return true; 149 return true;
135 } 150 }
136# endif 151# endif
137 152
138 return false; 153 return false;
145 if (flags & isTransparent) 160 if (flags & isTransparent)
146 return true; 161 return true;
147# endif 162# endif
148 163
149# ifdef BG_IMAGE_FROM_FILE 164# ifdef BG_IMAGE_FROM_FILE
150# ifdef HAVE_AFTERIMAGE 165 if (have_image)
151 if (original_asim)
152# endif
153 { 166 {
154 if (h_align == rootAlign || v_align == rootAlign) 167 if (flags & rootAlign)
155 return true; 168 return true;
156 } 169 }
157# endif 170# endif
158 171
159 return false; 172 return false;
163{ 176{
164# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
165 if (original_asim) 178 if (original_asim)
166 return true; 179 return true;
167# endif 180# endif
168# ifdef ENABLE_TRANSPARENCY
169 if (flags & isTransparent)
170 {
171# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
172 if ((flags & blurNeeded) && !(flags & blurServerSide))
173 return true;
174# endif
175 if ((flags & tintNeeded) && !(flags & tintServerSide))
176 return true;
177 }
178# endif
179 return false; 181 return false;
180} 182}
181 183
182# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
183static inline bool 185static inline bool
199static inline bool 201static inline bool
200check_set_align_value (int geom_flags, int flag, int &align, int new_value) 202check_set_align_value (int geom_flags, int flag, int &align, int new_value)
201{ 203{
202 if (geom_flags & flag) 204 if (geom_flags & flag)
203 { 205 {
204 if (new_value != bgPixmap_t::rootAlign)
205 {
206 if (new_value < -100) 206 if (new_value < -100)
207 new_value = -100; 207 new_value = -100;
208 else if (new_value > 200) 208 else if (new_value > 200)
209 new_value = 200; 209 new_value = 200;
210 }
211 if (new_value != align) 210 if (new_value != align)
212 { 211 {
213 align = new_value; 212 align = new_value;
214 return true; 213 return true;
215 } 214 }
219 218
220static inline int 219static inline int
221make_align_position (int align, int window_size, int image_size) 220make_align_position (int align, int window_size, int image_size)
222{ 221{
223 int diff = window_size - image_size; 222 int diff = window_size - image_size;
224 int smaller = MIN (image_size,window_size); 223 int smaller = min (image_size, window_size);
225 224
226 if (align >= 0 && align <= 50) 225 if (align >= 0 && align <= 100)
227 return diff * align / 100; 226 return diff * align / 100;
228 else if (align > 50 && align <= 100)
229 return window_size - image_size - diff * (100 - align) / 100;
230 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
231 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
232 else if (align > -100 && align < 0) 229 else if (align >= -100 && align < 0)
233 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
234 return 0; 231 return 0;
235} 232}
236 233
237static inline int 234static inline int
238make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 235make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
239{ 236{
240 int src_pos = 0; 237 int src_pos = 0;
241 dst_pos = 0; 238 dst_pos = pos;
242 dst_size = size; 239 dst_size = size;
243 if (pos < 0 && size > target_size) 240 if (pos < 0)
244 { 241 {
245 src_pos = -pos; 242 src_pos = -pos;
243 dst_pos = 0;
246 dst_size += pos; 244 dst_size += pos;
247 } 245 }
248 else if (pos > 0)
249 dst_pos = pos;
250 246
251 if (dst_pos + dst_size > target_size) 247 if (dst_pos + dst_size > target_size)
252 dst_size = target_size - dst_pos; 248 dst_size = target_size - dst_pos;
253 return src_pos; 249 return src_pos;
254} 250}
379 w = h = noScale; 375 w = h = noScale;
380 geom_flags |= WidthValue|HeightValue; 376 geom_flags |= WidthValue|HeightValue;
381 } 377 }
382 else if (CHECK_GEOM_OPS ("propscale")) 378 else if (CHECK_GEOM_OPS ("propscale"))
383 { 379 {
384 if (w == 0 && h == 0)
385 {
386 w = windowScale;
387 geom_flags |= WidthValue;
388 }
389 new_flags |= propScale; 380 new_flags |= propScale;
390 } 381 }
391 else if (CHECK_GEOM_OPS ("hscale")) 382 else if (CHECK_GEOM_OPS ("hscale"))
392 { 383 {
393 if (w == 0) w = windowScale; 384 if (w == 0) w = windowScale;
415 x = y = centerAlign; 406 x = y = centerAlign;
416 geom_flags |= WidthValue|HeightValue|XValue|YValue; 407 geom_flags |= WidthValue|HeightValue|XValue|YValue;
417 } 408 }
418 else if (CHECK_GEOM_OPS ("root")) 409 else if (CHECK_GEOM_OPS ("root"))
419 { 410 {
411 new_flags |= rootAlign;
420 w = h = noScale; 412 w = h = noScale;
421 x = y = rootAlign;
422 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue;
423 } 414 }
424# undef CHECK_GEOM_OPS 415# undef CHECK_GEOM_OPS
425 416
426 while (*ops != ':' && *ops != '\0') ++ops; 417 while (*ops != ':' && *ops != '\0') ++ops;
427 } /* done parsing ops */ 418 } /* done parsing ops */
437 { 428 {
438 flags = new_flags; 429 flags = new_flags;
439 changed++; 430 changed++;
440 } 431 }
441 432
442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
443// flags, h_scale, v_scale, h_align, v_align); 434 // flags, h_scale, v_scale, h_align, v_align);
444 return (changed > 0); 435 return (changed > 0);
436}
437
438void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{
441 int target_width = target->szHint.width;
442 int target_height = target->szHint.height;
443
444 if (flags & propScale)
445 {
446 float scale = (float)target_width / image_width;
447 min_it (scale, (float)target_height / image_height);
448 w = image_width * scale + 0.5;
449 h = image_height * scale + 0.5;
450 }
451 else
452 {
453 w = h_scale * target_width / 100;
454 h = v_scale * target_height / 100;
455 }
456
457 if (!w) w = image_width;
458 if (!h) h = image_height;
459
460 if (flags & rootAlign)
461 {
462 target->get_window_origin (x, y);
463 x = -x;
464 y = -y;
465 }
466 else
467 {
468 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h);
470 }
471
472 flags &= ~sizeSensitive;
473 if ((flags & propScale) || h_scale || v_scale
474 || (!(flags & rootAlign) && (h_align || v_align))
475 || w > target_width || h > target_height)
476 flags |= sizeSensitive;
445} 477}
446 478
447# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
448bool 480bool
449bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 481bgPixmap_t::render_image (unsigned long background_flags)
450{ 482{
451 if (target == NULL) 483 if (target == NULL)
452 return false; 484 return false;
453 485
454 target->init_asv (); 486 target->init_asv ();
487
488 ASImage *background = NULL;
489 ARGB32 background_tint = TINT_LEAVE_SAME;
490
491# ifdef ENABLE_TRANSPARENCY
492 if (background_flags)
493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
494
495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
496 {
497 ShadingInfo as_shade;
498 as_shade.shading = shade;
499
500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
501 if (flags & tintSet)
502 tint.get (c);
503 as_shade.tintColor.red = c.r;
504 as_shade.tintColor.green = c.g;
505 as_shade.tintColor.blue = c.b;
506
507 background_tint = shading2tint32 (&as_shade);
508 }
509
510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
511 {
512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
514 100, ASIMAGE_QUALITY_DEFAULT);
515 if (tmp)
516 {
517 destroy_asimage (&background);
518 background = tmp;
519 }
520 }
521# endif
455 522
456 ASImage *result = 0; 523 ASImage *result = 0;
457 524
458 int target_width = target->szHint.width; 525 int target_width = target->szHint.width;
459 int target_height = target->szHint.height; 526 int target_height = target->szHint.height;
460 int new_pmap_width = target_width; 527 int new_pmap_width = target_width;
461 int new_pmap_height = target_height; 528 int new_pmap_height = target_height;
462 529
463 int x = 0; 530 int x = 0;
464 int y = 0; 531 int y = 0;
465 int w = h_scale * target_width / 100; 532 int w = 0;
466 int h = v_scale * target_height / 100; 533 int h = 0;
467
468 TIMING_TEST_START (asim);
469 534
470 if (original_asim) 535 if (original_asim)
471 { 536 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
472 if (h_align == rootAlign || v_align == rootAlign)
473 {
474 target->get_window_origin(x, y);
475 x = -x;
476 y = -y;
477 }
478
479 if (h_align != rootAlign)
480 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
481
482 if (v_align != rootAlign)
483 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
484 }
485 537
486 if (!original_asim 538 if (!original_asim
539 || (!(flags & rootAlign)
487 || x >= target_width 540 && (x >= target_width
488 || y >= target_height 541 || y >= target_height
489 || (w > 0 && x + w <= 0) 542 || (x + w <= 0)
490 || (h > 0 && y + h <= 0)) 543 || (y + h <= 0))))
491 { 544 {
492 if (background) 545 if (background)
493 { 546 {
494 new_pmap_width = background->width; 547 new_pmap_width = background->width;
495 new_pmap_height = background->height; 548 new_pmap_height = background->height;
509 } 562 }
510 else 563 else
511 { 564 {
512 result = original_asim; 565 result = original_asim;
513 566
514 if ((w > 0 && w != original_asim->width) 567 if ((w != original_asim->width)
515 || (h > 0 && h != original_asim->height)) 568 || (h != original_asim->height))
516 { 569 {
517 result = scale_asimage (target->asv, original_asim, 570 result = scale_asimage (target->asv, original_asim,
518 w > 0 ? w : original_asim->width, 571 w, h,
519 h > 0 ? h : original_asim->height,
520 background ? ASA_ASImage : ASA_XImage, 572 background ? ASA_ASImage : ASA_XImage,
521 100, ASIMAGE_QUALITY_DEFAULT); 573 100, ASIMAGE_QUALITY_DEFAULT);
522 } 574 }
523 575
524 if (background == NULL) 576 if (background == NULL)
525 { 577 {
526 /* if tiling - pixmap has to be sized exactly as the image,
527 but there is no need to make it bigger than the window! */
528 if (h_scale == 0)
529 new_pmap_width = min (result->width, target_width);
530 if (v_scale == 0)
531 new_pmap_height = min (result->height, target_height);
532 /* we also need to tile our image in one or both directions */
533 if (h_scale == 0 || v_scale == 0) 578 if (h_scale == 0 || v_scale == 0)
534 { 579 {
580 /* if tiling - pixmap has to be sized exactly as the image,
581 but there is no need to make it bigger than the window! */
582 new_pmap_width = min (result->width, target_width);
583 new_pmap_height = min (result->height, target_height);
584
585 /* we also need to tile our image in both directions */
535 ASImage *tmp = tile_asimage (target->asv, result, 586 ASImage *tmp = tile_asimage (target->asv, result,
536 (h_scale > 0) ? 0 : (int)result->width - x, 587 (int)result->width - x,
537 (v_scale > 0) ? 0 : (int)result->height - y, 588 (int)result->height - y,
538 new_pmap_width, 589 new_pmap_width,
539 new_pmap_height, 590 new_pmap_height,
540 TINT_LEAVE_SAME, ASA_XImage, 591 TINT_LEAVE_SAME, ASA_XImage,
541 100, ASIMAGE_QUALITY_DEFAULT); 592 100, ASIMAGE_QUALITY_DEFAULT);
542 if (tmp) 593 if (tmp)
550 } 601 }
551 else 602 else
552 { 603 {
553 /* if blending background and image - pixmap has to be sized same as target window */ 604 /* if blending background and image - pixmap has to be sized same as target window */
554 ASImageLayer *layers = create_image_layers (2); 605 ASImageLayer *layers = create_image_layers (2);
555 ASImage *merged_im = NULL;
556 606
557 layers[0].im = background; 607 layers[0].im = background;
558 layers[0].clip_width = target_width; 608 layers[0].clip_width = target_width;
559 layers[0].clip_height = target_height; 609 layers[0].clip_height = target_height;
560 layers[0].tint = background_tint; 610 layers[0].tint = background_tint;
561 layers[1].im = result; 611 layers[1].im = result;
562 612
563 if (w <= 0) 613 if (h_scale == 0 || v_scale == 0)
564 { 614 {
565 /* tile horizontally */ 615 /* tile horizontally */
566 while (x > 0) x -= (int)result->width; 616 while (x > 0) x -= (int)result->width;
567 layers[1].dst_x = x; 617 layers[1].dst_x = x;
568 layers[1].clip_width = result->width+target_width; 618 layers[1].clip_width = result->width+target_width;
572 /* clip horizontally */ 622 /* clip horizontally */
573 layers[1].dst_x = x; 623 layers[1].dst_x = x;
574 layers[1].clip_width = result->width; 624 layers[1].clip_width = result->width;
575 } 625 }
576 626
577 if (h <= 0) 627 if (h_scale == 0 || v_scale == 0)
578 { 628 {
579 while (y > 0) y -= (int)result->height; 629 while (y > 0) y -= (int)result->height;
580 layers[1].dst_y = y; 630 layers[1].dst_y = y;
581 layers[1].clip_height = result->height + target_height; 631 layers[1].clip_height = result->height + target_height;
582 } 632 }
605 } 655 }
606 656
607 free (layers); 657 free (layers);
608 } 658 }
609 } 659 }
610 TIMING_TEST_PRINT_RESULT (asim);
611 660
612 if (pixmap) 661 bool ret = false;
613 {
614 if (result == NULL
615 || pmap_width != new_pmap_width
616 || pmap_height != new_pmap_height
617 || pmap_depth != target->depth)
618 {
619 XFreePixmap (target->dpy, pixmap);
620 pixmap = None;
621 }
622 }
623 662
624 if (result) 663 if (result)
625 { 664 {
626 XGCValues gcv; 665 XGCValues gcv;
627 GC gc; 666 GC gc;
667
668 if (pixmap)
669 {
670 if (pmap_width != new_pmap_width
671 || pmap_height != new_pmap_height
672 || pmap_depth != target->depth)
673 {
674 XFreePixmap (target->dpy, pixmap);
675 pixmap = None;
676 }
677 }
628 678
629 /* create Pixmap */ 679 /* create Pixmap */
630 if (pixmap == None) 680 if (pixmap == None)
631 { 681 {
632 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 682 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
633 pmap_width = new_pmap_width; 683 pmap_width = new_pmap_width;
634 pmap_height = new_pmap_height; 684 pmap_height = new_pmap_height;
635 pmap_depth = target->depth; 685 pmap_depth = target->depth;
636 } 686 }
637 /* fill with background color ( if result's not completely overlapping it)*/ 687 /* fill with background color (if result's not completely overlapping it) */
638 gcv.foreground = target->pix_colors[Color_bg]; 688 gcv.foreground = target->pix_colors[Color_bg];
639 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 689 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
640 690
641 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 691 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
642 int dst_width = result->width, dst_height = result->height; 692 int dst_width = result->width, dst_height = result->height;
643 if (background == NULL) 693 if (background == NULL)
644 { 694 {
695 if (!(h_scale == 0 || v_scale == 0))
696 {
645 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 697 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
646 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 698 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
699 }
647 700
648 if (dst_x > 0 || dst_y > 0 701 if (dst_x > 0 || dst_y > 0
649 || dst_x + dst_width < new_pmap_width 702 || dst_x + dst_width < new_pmap_width
650 || dst_y + dst_height < new_pmap_height) 703 || dst_y + dst_height < new_pmap_height)
651 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 704 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
657 710
658 if (result != background && result != original_asim) 711 if (result != background && result != original_asim)
659 destroy_asimage (&result); 712 destroy_asimage (&result);
660 713
661 XFreeGC (target->dpy, gc); 714 XFreeGC (target->dpy, gc);
662 TIMING_TEST_PRINT_RESULT (asim);
663 }
664 715
716 ret = true;
717 }
718
719 if (background)
720 destroy_asimage (&background);
721
665 return true; 722 return ret;
666} 723}
667# endif /* HAVE_AFTERIMAGE */ 724# endif /* HAVE_AFTERIMAGE */
725
726# ifdef HAVE_PIXBUF
727bool
728bgPixmap_t::render_image (unsigned long background_flags)
729{
730 if (target == NULL)
731 return false;
732
733 if (!pixbuf)
734 return false;
735
736#if !XFT
737 if (background_flags)
738 return false;
739#endif
740
741 GdkPixbuf *result;
742
743 int image_width = gdk_pixbuf_get_width (pixbuf);
744 int image_height = gdk_pixbuf_get_height (pixbuf);
745
746 int target_width = target->szHint.width;
747 int target_height = target->szHint.height;
748 int new_pmap_width = target_width;
749 int new_pmap_height = target_height;
750
751 int x = 0;
752 int y = 0;
753 int w = 0;
754 int h = 0;
755
756 get_image_geometry (image_width, image_height, w, h, x, y);
757
758 if (!(flags & rootAlign)
759 && (x >= target_width
760 || y >= target_height
761 || (x + w <= 0)
762 || (y + h <= 0)))
763 return false;
764
765 result = pixbuf;
766
767 if ((w != image_width)
768 || (h != image_height))
769 {
770 result = gdk_pixbuf_scale_simple (pixbuf,
771 w, h,
772 GDK_INTERP_BILINEAR);
773 }
774
775 bool ret = false;
776
777 if (result)
778 {
779 XGCValues gcv;
780 GC gc;
781 Pixmap root_pmap;
782
783 image_width = gdk_pixbuf_get_width (result);
784 image_height = gdk_pixbuf_get_height (result);
785
786 if (background_flags)
787 {
788 root_pmap = pixmap;
789 pixmap = None;
790 }
791 else
792 {
793 if (h_scale == 0 || v_scale == 0)
794 {
795 new_pmap_width = min (image_width, target_width);
796 new_pmap_height = min (image_height, target_height);
797 }
798 }
799
800 if (pixmap)
801 {
802 if (pmap_width != new_pmap_width
803 || pmap_height != new_pmap_height
804 || pmap_depth != target->depth)
805 {
806 XFreePixmap (target->dpy, pixmap);
807 pixmap = None;
808 }
809 }
810
811 if (pixmap == None)
812 {
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height;
816 pmap_depth = target->depth;
817 }
818
819 gcv.foreground = target->pix_colors[Color_bg];
820 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
821
822 if (h_scale == 0 || v_scale == 0)
823 {
824 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
825 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
826 0, 0,
827 0, 0,
828 image_width, image_height,
829 XLIB_RGB_DITHER_NONE,
830 0, 0);
831
832 gcv.tile = tile;
833 gcv.fill_style = FillTiled;
834 gcv.ts_x_origin = x;
835 gcv.ts_y_origin = y;
836 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
837
838 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
839 XFreePixmap (target->dpy, tile);
840 }
841 else
842 {
843 int src_x, src_y, dst_x, dst_y;
844 int dst_width, dst_height;
845
846 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
847 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
848
849 if (dst_x > 0 || dst_y > 0
850 || dst_x + dst_width < new_pmap_width
851 || dst_y + dst_height < new_pmap_height)
852 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
853
854 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
855 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
856 src_x, src_y,
857 dst_x, dst_y,
858 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE,
860 0, 0);
861 }
862
863#if XFT
864 if (background_flags)
865 {
866 Display *dpy = target->dpy;
867 XRenderPictureAttributes pa;
868
869 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
870 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
871
872 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
873 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
874
875 pa.repeat = True;
876 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
877 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
878 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
879 XFreePixmap (dpy, mask_pmap);
880
881 if (src && dst && mask)
882 {
883 XRenderColor mask_c;
884
885 mask_c.alpha = 0x8000;
886 mask_c.red = 0;
887 mask_c.green = 0;
888 mask_c.blue = 0;
889 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
890 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
891 }
892
893 XRenderFreePicture (dpy, src);
894 XRenderFreePicture (dpy, dst);
895 XRenderFreePicture (dpy, mask);
896
897 XFreePixmap (dpy, root_pmap);
898 }
899#endif
900
901 if (result != pixbuf)
902 g_object_unref (result);
903
904 XFreeGC (target->dpy, gc);
905
906 ret = true;
907 }
908
909 return ret;
910}
911# endif /* HAVE_PIXBUF */
668 912
669bool 913bool
670bgPixmap_t::set_file (const char *file) 914bgPixmap_t::set_file (const char *file)
671{ 915{
672 assert (file); 916 assert (file);
673 917
674 if (*file) 918 if (*file)
675 { 919 {
920 if (const char *p = strchr (file, ';'))
921 {
922 size_t len = p - file;
923 char *f = rxvt_temp_buf<char> (len + 1);
924 memcpy (f, file, len);
925 f[len] = '\0';
926 file = f;
927 }
928
676# ifdef HAVE_AFTERIMAGE 929# ifdef HAVE_AFTERIMAGE
677 if (!target->asimman) 930 if (!target->asimman)
678 target->asimman = create_generic_imageman (target->rs[Rs_path]); 931 target->asimman = create_generic_imageman (target->rs[Rs_path]);
679
680 if (const char *p = strchr (file, ';'))
681 {
682 size_t len = p - file;
683 char *f = (char *)malloc (len + 1);
684 memcpy (f, file, len);
685 f[len] = '\0';
686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 932 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
687 free (f); 933 if (image)
688 } 934 {
689 else 935 if (original_asim)
690 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 936 safe_asimage_destroy (original_asim);
937 original_asim = image;
938 have_image = true;
939 return true;
940 }
941# endif
691 942
692 return original_asim; 943# ifdef HAVE_PIXBUF
944 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
945 if (image)
946 {
947 if (pixbuf)
948 g_object_unref (pixbuf);
949 pixbuf = image;
950 have_image = true;
951 return true;
952 }
693# endif 953# endif
694 } 954 }
695 955
696 return false; 956 return false;
697} 957}
717 int changed = 0; 977 int changed = 0;
718 unsigned int hr, vr; 978 unsigned int hr, vr;
719 int junk; 979 int junk;
720 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 980 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
721 981
722 if (!(geom_flags&WidthValue)) 982 if (!(geom_flags & WidthValue))
723 hr = 1; 983 hr = 1;
724 if (!(geom_flags&HeightValue)) 984 if (!(geom_flags & HeightValue))
725 vr = hr; 985 vr = hr;
986
987 min_it (hr, 128);
988 min_it (vr, 128);
726 989
727 if (h_blurRadius != hr) 990 if (h_blurRadius != hr)
728 { 991 {
729 ++changed; 992 ++changed;
730 h_blurRadius = hr; 993 h_blurRadius = hr;
739 if (v_blurRadius == 0 && h_blurRadius == 0) 1002 if (v_blurRadius == 0 && h_blurRadius == 0)
740 flags &= ~blurNeeded; 1003 flags &= ~blurNeeded;
741 else 1004 else
742 flags |= blurNeeded; 1005 flags |= blurNeeded;
743 1006
1007#if XFT
1008 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1009 if (filters)
1010 {
1011 for (int i = 0; i < filters->nfilter; i++)
1012 if (!strcmp (filters->filter[i], FilterConvolution))
1013 flags |= bgPixmap_t::blurServerSide;
1014
1015 XFree (filters);
1016 }
1017#endif
1018
744 return (changed>0); 1019 return (changed > 0);
745} 1020}
746 1021
747static inline unsigned long 1022static inline unsigned long
748compute_tint_shade_flags (rxvt_color *tint, int shade) 1023compute_tint_shade_flags (rxvt_color *tint, int shade)
749{ 1024{
750 unsigned long flags = 0; 1025 unsigned long flags = 0;
751 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1026 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
752 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1027 bool has_shade = shade != 100;
753 1028
754 if (tint) 1029 if (tint)
755 { 1030 {
756 tint->get (c); 1031 tint->get (c);
757# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1032# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
766 flags |= bgPixmap_t::tintNeeded; 1041 flags |= bgPixmap_t::tintNeeded;
767 else if (tint) 1042 else if (tint)
768 { 1043 {
769 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 1044 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
770 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 1045 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
771 { 1046 {
772 flags |= bgPixmap_t::tintNeeded; 1047 flags |= bgPixmap_t::tintNeeded;
773 } 1048 }
774 } 1049 }
775 1050
776 if (flags & bgPixmap_t::tintNeeded) 1051 if (flags & bgPixmap_t::tintNeeded)
777 { 1052 {
778 if (flags & bgPixmap_t::tintWholesome) 1053 if (flags & bgPixmap_t::tintWholesome)
789} 1064}
790 1065
791bool 1066bool
792bgPixmap_t::set_tint (rxvt_color &new_tint) 1067bgPixmap_t::set_tint (rxvt_color &new_tint)
793{ 1068{
794 if (tint != new_tint) 1069 if (!(flags & tintSet) || tint != new_tint)
795 { 1070 {
796 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1071 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
797 tint = new_tint; 1072 tint = new_tint;
798 flags = (flags & ~tintFlags) | new_flags | tintSet; 1073 flags = (flags & ~tintFlags) | new_flags | tintSet;
799 return true; 1074 return true;
807{ 1082{
808 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1083 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
809 1084
810 if (new_flags != (flags & tintFlags)) 1085 if (new_flags != (flags & tintFlags))
811 { 1086 {
812 flags = (flags&~tintFlags)|new_flags; 1087 flags = (flags & ~tintFlags) | new_flags;
813 return true; 1088 return true;
814 } 1089 }
815 1090
816 return false; 1091 return false;
817} 1092}
818 1093
819bool 1094bool
820bgPixmap_t::set_shade (const char *shade_str) 1095bgPixmap_t::set_shade (const char *shade_str)
821{ 1096{
822 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1097 int new_shade = (shade_str) ? atoi (shade_str) : 100;
823 1098
824 if (new_shade < 0 && new_shade > -100) 1099 clamp_it (new_shade, -100, 200);
1100 if (new_shade < 0)
825 new_shade = 200 - (100 + new_shade); 1101 new_shade = 200 - (100 + new_shade);
826 else if (new_shade == 100)
827 new_shade = 0;
828 1102
829 if (new_shade != shade) 1103 if (new_shade != shade)
830 { 1104 {
831 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1105 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
832 shade = new_shade; 1106 shade = new_shade;
833 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1107 flags = (flags & (~tintFlags | tintSet)) | new_flags;
834 return true; 1108 return true;
835 } 1109 }
836 1110
837 return false; 1111 return false;
1112}
1113
1114#if XFT
1115static void
1116get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1117{
1118 double sigma = radius / 2.0;
1119 double scale = sqrt (2.0 * M_PI) * sigma;
1120 double sum = 0.0;
1121
1122 for (int i = 0; i < width; i++)
1123 {
1124 double x = i - width / 2;
1125 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1126 sum += kernel[i];
1127 }
1128
1129 params[0] = XDoubleToFixed (width);
1130 params[1] = XDoubleToFixed (1);
1131
1132 for (int i = 0; i < width; i++)
1133 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1134}
1135#endif
1136
1137bool
1138bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1139{
1140 bool ret = false;
1141#if XFT
1142 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1143 double *kernel = (double *)malloc (size * sizeof (double));
1144 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1145
1146 Display *dpy = target->dpy;
1147 XRenderPictureAttributes pa;
1148 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1149
1150 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1151 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1152
1153 if (kernel && params && src && dst)
1154 {
1155 if (h_blurRadius)
1156 {
1157 size = h_blurRadius * 2 + 1;
1158 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1159
1160 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1161 XRenderComposite (dpy,
1162 PictOpSrc,
1163 src,
1164 None,
1165 dst,
1166 0, 0,
1167 0, 0,
1168 0, 0,
1169 width, height);
1170 }
1171
1172 if (v_blurRadius)
1173 {
1174 size = v_blurRadius * 2 + 1;
1175 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1176 swap (params[0], params[1]);
1177
1178 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1179 XRenderComposite (dpy,
1180 PictOpSrc,
1181 src,
1182 None,
1183 dst,
1184 0, 0,
1185 0, 0,
1186 0, 0,
1187 width, height);
1188 }
1189
1190 ret = true;
1191 }
1192
1193 free (kernel);
1194 free (params);
1195 XRenderFreePicture (dpy, src);
1196 XRenderFreePicture (dpy, dst);
1197#endif
1198 return ret;
1199}
1200
1201bool
1202bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1203{
1204 Display *dpy = target->dpy;
1205 bool ret = false;
1206
1207 if (flags & tintWholesome)
1208 {
1209 XGCValues gcv;
1210 GC gc;
1211
1212 /* In this case we can tint image server-side getting significant
1213 * performance improvements, as we eliminate XImage transfer
1214 */
1215 gcv.foreground = Pixel (tint);
1216 gcv.function = GXand;
1217 gcv.fill_style = FillSolid;
1218 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1219 if (gc)
1220 {
1221 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1222 ret = true;
1223 XFreeGC (dpy, gc);
1224 }
1225 }
1226 else
1227 {
1228# if XFT
1229 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1230
1231 if (flags & tintSet)
1232 tint.get (c);
1233
1234 if (shade <= 100)
1235 {
1236 c.r = (c.r * shade) / 100;
1237 c.g = (c.g * shade) / 100;
1238 c.b = (c.b * shade) / 100;
1239 }
1240 else
1241 {
1242 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1243 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1244 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1245 }
1246
1247 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1248 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1249 XRenderPictureAttributes pa;
1250
1251 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1252
1253 pa.repeat = True;
1254
1255 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1256 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1257 XFreePixmap (dpy, overlay_pmap);
1258
1259 pa.component_alpha = True;
1260 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1261 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1262 XFreePixmap (dpy, mask_pmap);
1263
1264 if (mask_pic && overlay_pic && back_pic)
1265 {
1266 XRenderColor mask_c;
1267
1268 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1269 mask_c.alpha = 0xffff;
1270 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1271
1272 mask_c.alpha = 0;
1273 mask_c.red = 0xffff - c.r;
1274 mask_c.green = 0xffff - c.g;
1275 mask_c.blue = 0xffff - c.b;
1276 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1277 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1278 ret = true;
1279 }
1280
1281 XRenderFreePicture (dpy, mask_pic);
1282 XRenderFreePicture (dpy, overlay_pic);
1283 XRenderFreePicture (dpy, back_pic);
1284# endif
1285 }
1286
1287 return ret;
838} 1288}
839 1289
840/* make_transparency_pixmap() 1290/* make_transparency_pixmap()
841 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1291 * Builds a pixmap sized the same as terminal window, with depth same as the root window
842 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1292 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
848 unsigned long result = 0; 1298 unsigned long result = 0;
849 1299
850 if (target == NULL) 1300 if (target == NULL)
851 return 0; 1301 return 0;
852 1302
853 /* root dimentions may change from call to call - but Display structure should 1303 /* root dimensions may change from call to call - but Display structure should
854 * be always up-to-date, so let's use it : 1304 * be always up-to-date, so let's use it :
855 */ 1305 */
856 Window root = target->display->root; 1306 Window root = target->display->root;
857 int screen = target->display->screen; 1307 int screen = target->display->screen;
858 Display *dpy = target->dpy; 1308 Display *dpy = target->dpy;
861 unsigned int root_pmap_width, root_pmap_height; 1311 unsigned int root_pmap_width, root_pmap_height;
862 int window_width = target->szHint.width; 1312 int window_width = target->szHint.width;
863 int window_height = target->szHint.height; 1313 int window_height = target->szHint.height;
864 int sx, sy; 1314 int sx, sy;
865 XGCValues gcv; 1315 XGCValues gcv;
1316 GC gc;
866 1317
867 TIMING_TEST_START (tp);
868 target->get_window_origin (sx, sy); 1318 target->get_window_origin (sx, sy);
869 1319
870 /* check if we are outside of the visible part of the virtual screen : */ 1320 /* check if we are outside of the visible part of the virtual screen : */
871 if (sx + window_width <= 0 || sy + window_height <= 0 1321 if (sx + window_width <= 0 || sy + window_height <= 0
872 || sx >= root_width || sy >= root_height) 1322 || sx >= root_width || sy >= root_height)
873 return 0; 1323 return 0;
874 1324
875 if (root_pixmap != None) 1325 if (root_pixmap != None)
876 { 1326 {
877 /* we want to validate the pixmap and get it's size at the same time : */ 1327 /* we want to validate the pixmap and get its size at the same time : */
878 int junk; 1328 int junk;
879 unsigned int ujunk; 1329 unsigned int ujunk;
880 /* root pixmap may be bad - allow a error */ 1330 /* root pixmap may be bad - allow a error */
881 target->allowedxerror = -1; 1331 target->allowedxerror = -1;
882 1332
884 root_pixmap = None; 1334 root_pixmap = None;
885 1335
886 target->allowedxerror = 0; 1336 target->allowedxerror = 0;
887 } 1337 }
888 1338
1339 if (root_pixmap == None)
1340 return 0;
1341
889 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1342 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
890 GC gc = NULL;
891 1343
892 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1344 if (tiled_root_pmap == None) /* something really bad happened - abort */
893 return 0; 1345 return 0;
894 1346
895 if (root_pixmap == None)
896 {
897 /* use tricks to obtain the root background image :*/
898 /* we want to create Overrideredirect window overlapping out window
899 with background type of Parent Relative and then grab it */
900 XSetWindowAttributes attr;
901 Window src;
902 bool success = false;
903
904 attr.background_pixmap = ParentRelative;
905 attr.backing_store = Always;
906 attr.event_mask = ExposureMask;
907 attr.override_redirect = True;
908 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
909 CopyFromParent, CopyFromParent, CopyFromParent,
910 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
911 &attr);
912
913 if (src != None)
914 {
915 XEvent event;
916 int ev_count = 0;
917 XGrabServer (dpy);
918 XMapRaised (dpy, src);
919 XSync (dpy, False);
920
921 /* XSync should get window where it's properly exposed,
922 * but to be on the safe side - let's check for the actual event to arrive : */
923 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
924 ++ev_count;
925
926 if (ev_count > 0);
927 {
928 /* hooray! - we can grab the image! */
929 gc = XCreateGC (dpy, root, 0, NULL);
930 if (gc)
931 {
932 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
933 success = true;
934 }
935 }
936
937 XDestroyWindow (dpy, src);
938 XUngrabServer (dpy);
939 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
940 }
941
942 if (!success)
943 {
944 XFreePixmap (dpy, tiled_root_pmap);
945 tiled_root_pmap = None;
946 }
947 else
948 result |= transpPmapTiled;
949 }
950 else
951 {
952 /* strightforward pixmap copy */ 1347 /* straightforward pixmap copy */
953 gcv.tile = root_pixmap; 1348 gcv.tile = root_pixmap;
954 gcv.fill_style = FillTiled; 1349 gcv.fill_style = FillTiled;
955 1350
956 while (sx < 0) sx += (int)root_width; 1351 while (sx < 0) sx += (int)root_width;
957 while (sy < 0) sy += (int)root_height; 1352 while (sy < 0) sy += (int)root_height;
958 1353
959 gcv.ts_x_origin = -sx; 1354 gcv.ts_x_origin = -sx;
960 gcv.ts_y_origin = -sy; 1355 gcv.ts_y_origin = -sy;
961 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1356 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
962 1357
963 if (gc) 1358 if (gc)
964 { 1359 {
965 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1360 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
966 result |= transpPmapTiled; 1361 result |= transpPmapTiled;
967 } 1362 XFreeGC (dpy, gc);
968 } 1363 }
969 TIMING_TEST_PRINT_RESULT (tp);
970 1364
971 if (tiled_root_pmap != None) 1365 if (tiled_root_pmap != None)
972 { 1366 {
973 if (!need_client_side_rendering ()) 1367 if (!need_client_side_rendering ())
974 { 1368 {
975 if ((flags & tintNeeded)) 1369 if (flags & (blurNeeded | blurServerSide))
976 {
977 if (flags & tintWholesome)
978 { 1370 {
979 /* In this case we can tint image server-side getting significant 1371 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
980 * performance improvements, as we eliminate XImage transfer
981 */
982 gcv.foreground = Pixel (tint);
983 gcv.function = GXand;
984 gcv.fill_style = FillSolid;
985 if (gc)
986 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
987 else
988 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
989 if (gc)
990 {
991 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
992 result |= transpPmapTinted; 1372 result |= transpPmapBlurred;
993 }
994 }
995 else
996 {
997# if XFT
998 Picture back_pic = 0;
999 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1000
1001 if (flags & tintSet)
1002 tint.get (c);
1003
1004 if (shade > 0 && shade < 100)
1005 {
1006 c.r = (c.r * shade) / 100;
1007 c.g = (c.g * shade) / 100;
1008 c.b = (c.b * shade) / 100;
1009 }
1010 else if (shade > 100 && shade < 200)
1011 {
1012 c.r = (c.r * (200 - shade)) / 100;
1013 c.g = (c.g * (200 - shade)) / 100;
1014 c.b = (c.b * (200 - shade)) / 100;
1015 }
1016
1017 XRenderPictFormat pf;
1018 pf.type = PictTypeDirect;
1019 pf.depth = 32;
1020 pf.direct.redMask = 0xff;
1021 pf.direct.greenMask = 0xff;
1022 pf.direct.blueMask = 0xff;
1023 pf.direct.alphaMask = 0xff;
1024
1025 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1026 (PictFormatType|
1027 PictFormatDepth|
1028 PictFormatRedMask|
1029 PictFormatGreenMask|
1030 PictFormatBlueMask|
1031 PictFormatAlphaMask),
1032 &pf,
1033 0);
1034 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1035 XRenderPictureAttributes pa ;
1036
1037 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1038
1039 pa.repeat = True;
1040
1041 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1042 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1043 XFreePixmap (dpy, overlay_pmap);
1044
1045 pa.component_alpha = True;
1046 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1047 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1048 XFreePixmap (dpy, mask_pmap);
1049
1050 if (mask_pic && overlay_pic && back_pic)
1051 {
1052 XRenderColor mask_c;
1053
1054 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1055 mask_c.alpha = 0xffff;
1056 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1057
1058 mask_c.alpha = 0;
1059 mask_c.red = 0xffff - c.r;
1060 mask_c.green = 0xffff - c.g;
1061 mask_c.blue = 0xffff - c.b;
1062 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1063 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1064 result |= transpPmapTinted;
1065 }
1066
1067 XRenderFreePicture (dpy, mask_pic);
1068 XRenderFreePicture (dpy, overlay_pic);
1069 XRenderFreePicture (dpy, back_pic);
1070# if DO_TIMING_TEST
1071 XSync (dpy, False);
1072# endif
1073# endif
1074 }
1075 } 1373 }
1374 if (flags & (tintNeeded | tintServerSide))
1375 {
1376 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1377 result |= transpPmapTinted;
1378 }
1076 } /* server side rendering completed */ 1379 } /* server side rendering completed */
1077 1380
1078 if (pixmap) 1381 if (pixmap)
1079 XFreePixmap (dpy, pixmap); 1382 XFreePixmap (dpy, pixmap);
1080 1383
1082 pmap_width = window_width; 1385 pmap_width = window_width;
1083 pmap_height = window_height; 1386 pmap_height = window_height;
1084 pmap_depth = root_depth; 1387 pmap_depth = root_depth;
1085 } 1388 }
1086 1389
1087 if (gc)
1088 XFreeGC (dpy, gc);
1089
1090 TIMING_TEST_PRINT_RESULT (tp);
1091
1092 return result; 1390 return result;
1093} 1391}
1094 1392
1095bool 1393bool
1096bgPixmap_t::set_root_pixmap () 1394bgPixmap_t::set_root_pixmap ()
1108 return false; 1406 return false;
1109} 1407}
1110# endif /* ENABLE_TRANSPARENCY */ 1408# endif /* ENABLE_TRANSPARENCY */
1111 1409
1112# ifndef HAVE_AFTERIMAGE 1410# ifndef HAVE_AFTERIMAGE
1113static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1411static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1114# endif 1412# endif
1115 1413
1116bool 1414bool
1117bgPixmap_t::render () 1415bgPixmap_t::render ()
1118{ 1416{
1119 unsigned long background_flags = 0; 1417 unsigned long background_flags = 0;
1120 1418
1121 if (target == NULL) 1419 if (target == NULL)
1122 return false; 1420 return false;
1123
1124 TIMING_TEST_START (tp);
1125 1421
1126 invalidate (); 1422 invalidate ();
1127# ifdef ENABLE_TRANSPARENCY 1423# ifdef ENABLE_TRANSPARENCY
1128 if (flags & isTransparent) 1424 if (flags & isTransparent)
1129 { 1425 {
1130 /* we need to re-generate transparency pixmap in that case ! */ 1426 /* we need to re-generate transparency pixmap in that case ! */
1131 background_flags = make_transparency_pixmap (); 1427 background_flags = make_transparency_pixmap ();
1132 if (background_flags == 0) 1428 if (background_flags == 0)
1133 return false; 1429 return false;
1134 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1430 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1135 && pmap_depth == target->depth) 1431 && pmap_depth == target->depth)
1136 flags = flags & ~isInvalid; 1432 flags = flags & ~isInvalid;
1137 } 1433 }
1138# endif 1434# endif
1139 1435
1436# ifdef BG_IMAGE_FROM_FILE
1437 if (have_image
1438 || (background_flags & transpTransformations) != (flags & transpTransformations))
1439 {
1440 if (render_image (background_flags))
1441 flags = flags & ~isInvalid;
1442 }
1443# endif
1444
1140 XImage *result = NULL; 1445 XImage *result = NULL;
1141# ifdef HAVE_AFTERIMAGE 1446
1142 if (original_asim 1447 if (background_flags && (flags & isInvalid))
1143 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1448 {
1449 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1144 { 1450 }
1145 target->init_asv ();
1146 1451
1147 ASImage *background = NULL; 1452 if (result)
1148 ARGB32 as_tint = TINT_LEAVE_SAME; 1453 {
1149 if (background_flags) 1454# if !defined(HAVE_AFTERIMAGE) && !XFT
1150 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 1455 /* our own client-side tinting */
1151 1456 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1152# ifdef ENABLE_TRANSPARENCY 1457 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1153 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1458 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1154 { 1459 {
1155 ShadingInfo as_shade;
1156 as_shade.shading = (shade == 0) ? 100 : shade;
1157
1158 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1460 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1159 if (flags & tintSet) 1461 if (flags & tintSet)
1160 tint.get (c); 1462 tint.get (c);
1161 as_shade.tintColor.red = c.r; 1463 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1162 as_shade.tintColor.green = c.g;
1163 as_shade.tintColor.blue = c.b;
1164
1165 as_tint = shading2tint32 (&as_shade);
1166 }
1167
1168 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1169 {
1170 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1171 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1172 100, ASIMAGE_QUALITY_DEFAULT);
1173 if (tmp)
1174 {
1175 destroy_asimage (&background);
1176 background = tmp;
1177 }
1178 } 1464 }
1179# endif 1465# endif
1180 1466
1181 if (render_asim (background, as_tint))
1182 flags = flags & ~isInvalid;
1183 if (background)
1184 destroy_asimage (&background);
1185 }
1186 else if (background_flags && pmap_depth != target->depth)
1187 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1188
1189# elif !XFT /* our own client-side tinting */
1190
1191 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1192 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1193
1194 if (background_flags && (flags & isInvalid))
1195 {
1196 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1197
1198 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1199 {
1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1201 if (flags & tintSet)
1202 tint.get (c);
1203 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1204 }
1205 }
1206# endif /* HAVE_AFTERIMAGE */
1207
1208 if (result)
1209 {
1210 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1467 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1211 1468
1212 if (gc) 1469 if (gc)
1213 { 1470 {
1214 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1471 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1243 1500
1244 XFreeGC (target->dpy, gc); 1501 XFreeGC (target->dpy, gc);
1245 flags = flags & ~isInvalid; 1502 flags = flags & ~isInvalid;
1246 } 1503 }
1247 1504
1248 XDestroyImage (result); 1505 XDestroyImage (result);
1249 } 1506 }
1250 1507
1251 if (flags & isInvalid) 1508 if (flags & isInvalid)
1252 { 1509 {
1253 if (pixmap != None) 1510 if (pixmap != None)
1257 } 1514 }
1258 } 1515 }
1259 1516
1260 apply (); 1517 apply ();
1261 1518
1262 XSync (target->dpy, False);
1263 valid_since = ev::now (); 1519 valid_since = ev::now ();
1264
1265 TIMING_TEST_PRINT_RESULT (tp);
1266 1520
1267 return true; 1521 return true;
1268} 1522}
1269 1523
1270bool 1524bool
1343#endif /* HAVE_BG_PIXMAP */ 1597#endif /* HAVE_BG_PIXMAP */
1344 1598
1345#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1599#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1346/* taken from aterm-0.4.2 */ 1600/* taken from aterm-0.4.2 */
1347 1601
1348typedef uint32_t RUINT32T;
1349
1350static void 1602static void
1351ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1603ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1352{ 1604{
1353 int sh_r, sh_g, sh_b; 1605 int sh_r, sh_g, sh_b;
1354 RUINT32T mask_r, mask_g, mask_b; 1606 uint32_t mask_r, mask_g, mask_b;
1355 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1607 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1356 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1608 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1357 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1609 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1358 int i; 1610 int i;
1611 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1359 1612
1360 Visual *visual = term->visual;
1361
1362 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1613 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1363
1364 if (shade == 0)
1365 shade = 100;
1366 1614
1367 /* for convenience */ 1615 /* for convenience */
1368 mask_r = visual->red_mask; 1616 mask_r = visual->red_mask;
1369 mask_g = visual->green_mask; 1617 mask_g = visual->green_mask;
1370 mask_b = visual->blue_mask; 1618 mask_b = visual->blue_mask;
1371 1619
1372 /* boring lookup table pre-initialization */ 1620 /* boring lookup table pre-initialization */
1373 switch (srcImage->bits_per_pixel) { 1621 switch (srcImage->depth)
1622 {
1374 case 15: 1623 case 15:
1375 if ((mask_r != 0x7c00) || 1624 if ((mask_r != 0x7c00) ||
1376 (mask_g != 0x03e0) || 1625 (mask_g != 0x03e0) ||
1377 (mask_b != 0x001f)) 1626 (mask_b != 0x001f))
1378 return; 1627 return;
1379 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1628 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1380 lookup_r = lookup; 1629 lookup_r = lookup;
1381 lookup_g = lookup+32; 1630 lookup_g = lookup+32;
1382 lookup_b = lookup+32+32; 1631 lookup_b = lookup+32+32;
1383 sh_r = 10; 1632 sh_r = 10;
1384 sh_g = 5; 1633 sh_g = 5;
1385 sh_b = 0; 1634 sh_b = 0;
1386 break; 1635 break;
1387 case 16: 1636 case 16:
1388 if ((mask_r != 0xf800) || 1637 if ((mask_r != 0xf800) ||
1389 (mask_g != 0x07e0) || 1638 (mask_g != 0x07e0) ||
1390 (mask_b != 0x001f)) 1639 (mask_b != 0x001f))
1391 return; 1640 return;
1392 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1641 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1393 lookup_r = lookup; 1642 lookup_r = lookup;
1394 lookup_g = lookup+32; 1643 lookup_g = lookup+32;
1395 lookup_b = lookup+32+64; 1644 lookup_b = lookup+32+64;
1396 sh_r = 11; 1645 sh_r = 11;
1397 sh_g = 5; 1646 sh_g = 5;
1398 sh_b = 0; 1647 sh_b = 0;
1399 break; 1648 break;
1400 case 24: 1649 case 24:
1401 if ((mask_r != 0xff0000) || 1650 if ((mask_r != 0xff0000) ||
1402 (mask_g != 0x00ff00) || 1651 (mask_g != 0x00ff00) ||
1403 (mask_b != 0x0000ff)) 1652 (mask_b != 0x0000ff))
1404 return; 1653 return;
1405 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1654 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1406 lookup_r = lookup; 1655 lookup_r = lookup;
1407 lookup_g = lookup+256; 1656 lookup_g = lookup+256;
1408 lookup_b = lookup+256+256; 1657 lookup_b = lookup+256+256;
1409 sh_r = 16; 1658 sh_r = 16;
1410 sh_g = 8; 1659 sh_g = 8;
1411 sh_b = 0; 1660 sh_b = 0;
1412 break; 1661 break;
1413 case 32: 1662 case 32:
1414 if ((mask_r != 0xff0000) || 1663 if ((mask_r != 0xff0000) ||
1415 (mask_g != 0x00ff00) || 1664 (mask_g != 0x00ff00) ||
1416 (mask_b != 0x0000ff)) 1665 (mask_b != 0x0000ff))
1417 return; 1666 return;
1418 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1667 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1419 lookup_r = lookup; 1668 lookup_r = lookup;
1420 lookup_g = lookup+256; 1669 lookup_g = lookup+256;
1421 lookup_b = lookup+256+256; 1670 lookup_b = lookup+256+256;
1422 sh_r = 16; 1671 sh_r = 16;
1423 sh_g = 8; 1672 sh_g = 8;
1424 sh_b = 0; 1673 sh_b = 0;
1425 break; 1674 break;
1426 default: 1675 default:
1427 return; /* we do not support this color depth */ 1676 return; /* we do not support this color depth */
1428 } 1677 }
1429 1678
1430 /* prepare limits for color transformation (each channel is handled separately) */ 1679 /* prepare limits for color transformation (each channel is handled separately) */
1431 if (shade < 0) { 1680 if (shade > 100)
1681 {
1432 shade = -shade; 1682 shade = 200 - shade;
1433 if (shade < 0) shade = 0;
1434 if (shade > 100) shade = 100;
1435 1683
1436 lower_lim_r = 65535-rm; 1684 lower_lim_r = 65535-rm;
1437 lower_lim_g = 65535-gm; 1685 lower_lim_g = 65535-gm;
1438 lower_lim_b = 65535-bm; 1686 lower_lim_b = 65535-bm;
1439 1687
1440 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1688 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1441 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1689 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1442 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1690 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1443 1691
1444 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1692 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1693 }
1445 } else { 1694 else
1446 if (shade < 0) shade = 0; 1695 {
1447 if (shade > 100) shade = 100;
1448 1696
1449 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1697 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1450 1698
1451 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1699 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1452 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1700 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1453 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1701 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1454 } 1702 }
1455
1456 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1457 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1458 {
1459 unsigned int tmp;
1460
1461 tmp = lower_lim_r;
1462 lower_lim_r = lower_lim_b;
1463 lower_lim_b = tmp;
1464
1465 tmp = upper_lim_r;
1466 upper_lim_r = upper_lim_b;
1467 upper_lim_b = tmp;
1468 }
1469 1703
1470 /* fill our lookup tables */ 1704 /* fill our lookup tables */
1471 for (i = 0; i <= mask_r>>sh_r; i++) 1705 for (i = 0; i <= mask_r>>sh_r; i++)
1472 { 1706 {
1473 RUINT32T tmp; 1707 uint32_t tmp;
1474 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1708 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1475 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1709 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1476 lookup_r[i] = (tmp/65535)<<sh_r; 1710 lookup_r[i] = (tmp/65535)<<sh_r;
1477 } 1711 }
1478 for (i = 0; i <= mask_g>>sh_g; i++) 1712 for (i = 0; i <= mask_g>>sh_g; i++)
1479 { 1713 {
1480 RUINT32T tmp; 1714 uint32_t tmp;
1481 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1715 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1482 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1716 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1483 lookup_g[i] = (tmp/65535)<<sh_g; 1717 lookup_g[i] = (tmp/65535)<<sh_g;
1484 } 1718 }
1485 for (i = 0; i <= mask_b>>sh_b; i++) 1719 for (i = 0; i <= mask_b>>sh_b; i++)
1486 { 1720 {
1487 RUINT32T tmp; 1721 uint32_t tmp;
1488 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1722 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1489 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1723 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1490 lookup_b[i] = (tmp/65535)<<sh_b; 1724 lookup_b[i] = (tmp/65535)<<sh_b;
1491 } 1725 }
1492 1726
1493 /* apply table to input image (replacing colors by newly calculated ones) */ 1727 /* apply table to input image (replacing colors by newly calculated ones) */
1494 switch (srcImage->bits_per_pixel) 1728 if (srcImage->bits_per_pixel == 32
1729 && (srcImage->depth == 24 || srcImage->depth == 32)
1730 && srcImage->byte_order == host_byte_order)
1495 { 1731 {
1496 case 15:
1497 {
1498 unsigned short *p1, *pf, *p, *pl; 1732 uint32_t *p1, *pf, *p, *pl;
1499 p1 = (unsigned short *) srcImage->data; 1733 p1 = (uint32_t *) srcImage->data;
1500 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1734 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1735
1501 while (p1 < pf) 1736 while (p1 < pf)
1502 { 1737 {
1503 p = p1; 1738 p = p1;
1504 pl = p1 + srcImage->width; 1739 pl = p1 + srcImage->width;
1505 for (; p < pl; p++) 1740 for (; p < pl; p++)
1506 { 1741 {
1507 *p = lookup_r[(*p & 0x7c00)>>10] |
1508 lookup_g[(*p & 0x03e0)>> 5] |
1509 lookup_b[(*p & 0x001f)];
1510 }
1511 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1512 }
1513 break;
1514 }
1515 case 16:
1516 {
1517 unsigned short *p1, *pf, *p, *pl;
1518 p1 = (unsigned short *) srcImage->data;
1519 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1520 while (p1 < pf)
1521 {
1522 p = p1;
1523 pl = p1 + srcImage->width;
1524 for (; p < pl; p++)
1525 {
1526 *p = lookup_r[(*p & 0xf800)>>11] |
1527 lookup_g[(*p & 0x07e0)>> 5] |
1528 lookup_b[(*p & 0x001f)];
1529 }
1530 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1531 }
1532 break;
1533 }
1534 case 24:
1535 {
1536 unsigned char *p1, *pf, *p, *pl;
1537 p1 = (unsigned char *) srcImage->data;
1538 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1539 while (p1 < pf)
1540 {
1541 p = p1;
1542 pl = p1 + srcImage->width * 3;
1543 for (; p < pl; p += 3)
1544 {
1545 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1546 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1547 p[2] = lookup_r[(p[2] & 0x0000ff)];
1548 }
1549 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1550 }
1551 break;
1552 }
1553 case 32:
1554 {
1555 RUINT32T *p1, *pf, *p, *pl;
1556 p1 = (RUINT32T *) srcImage->data;
1557 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1558
1559 while (p1 < pf)
1560 {
1561 p = p1;
1562 pl = p1 + srcImage->width;
1563 for (; p < pl; p++)
1564 {
1565 *p = lookup_r[(*p & 0xff0000)>>16] | 1742 *p = lookup_r[(*p & 0xff0000) >> 16] |
1566 lookup_g[(*p & 0x00ff00)>> 8] | 1743 lookup_g[(*p & 0x00ff00) >> 8] |
1567 lookup_b[(*p & 0x0000ff)] | 1744 lookup_b[(*p & 0x0000ff)] |
1568 (*p & ~0xffffff); 1745 (*p & 0xff000000);
1746 }
1747 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1748 }
1749 }
1750 else
1751 {
1752 for (int y = 0; y < srcImage->height; y++)
1753 for (int x = 0; x < srcImage->width; x++)
1754 {
1755 unsigned long pixel = XGetPixel (srcImage, x, y);
1756 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1757 lookup_g[(pixel & mask_g) >> sh_g] |
1758 lookup_b[(pixel & mask_b) >> sh_b];
1759 XPutPixel (srcImage, x, y, pixel);
1569 } 1760 }
1570 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1571 } 1761 }
1572 break;
1573 }
1574 }
1575 1762
1576 free (lookup); 1763 free (lookup);
1577} 1764}
1578#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1765#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines