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

Diff Legend

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