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