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.7 by sasha, Fri Oct 26 17:10:48 2007 UTC vs.
Revision 1.96 by sf-exg, Fri Oct 22 16:49:26 2010 UTC

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

Diff Legend

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