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

Diff Legend

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