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.9 by sasha, Mon Oct 29 13:39:43 2007 UTC vs.
Revision 1.103 by sf-exg, Sun Oct 31 11:15:29 2010 UTC

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

Diff Legend

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