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

Diff Legend

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