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

Diff Legend

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