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

Diff Legend

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