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

Diff Legend

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