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.19 by ayin, Tue Dec 18 11:15:24 2007 UTC vs.
Revision 1.93 by sf-exg, Tue Oct 19 14:44:30 2010 UTC

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

Diff Legend

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