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

Diff Legend

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