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

Diff Legend

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