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.95 by sf-exg, Fri Oct 22 16:21:05 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 }
432
441//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
442// flags, h_scale, v_scale, h_align, v_align); 434 // flags, h_scale, v_scale, h_align, v_align);
443 return (changed > 0); 435 return (changed > 0);
436}
437
438void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{
441 int target_width = target->szHint.width;
442 int target_height = target->szHint.height;
443
444 if (flags & propScale)
445 {
446 float scale = (float)target_width / image_width;
447 min_it (scale, (float)target_height / image_height);
448 w = image_width * scale + 0.5;
449 h = image_height * scale + 0.5;
450 }
451 else
452 {
453 w = h_scale * target_width / 100;
454 h = v_scale * target_height / 100;
455 }
456
457 if (!w) w = image_width;
458 if (!h) h = image_height;
459
460 if (flags & rootAlign)
461 {
462 target->get_window_origin (x, y);
463 x = -x;
464 y = -y;
465 }
466 else
467 {
468 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h);
470 }
471
472 flags &= ~sizeSensitive;
473 if ((flags & propScale) || h_scale || v_scale
474 || (!(flags & rootAlign) && (h_align || v_align))
475 || w > target_width || h > target_height)
476 flags |= sizeSensitive;
444} 477}
445 478
446# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
447bool 480bool
448bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 481bgPixmap_t::render_image (unsigned long background_flags)
449{ 482{
450 if (target == NULL) 483 if (target == NULL)
451 return false; 484 return false;
452 485
486 target->init_asv ();
487
488 ASImage *background = NULL;
489 ARGB32 background_tint = TINT_LEAVE_SAME;
490
491# ifdef ENABLE_TRANSPARENCY
492 if (background_flags)
493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
494
495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
496 {
497 ShadingInfo as_shade;
498 as_shade.shading = shade;
499
500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
501 if (flags & tintSet)
502 tint.get (c);
503 as_shade.tintColor.red = c.r;
504 as_shade.tintColor.green = c.g;
505 as_shade.tintColor.blue = c.b;
506
507 background_tint = shading2tint32 (&as_shade);
508 }
509
510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
511 {
512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
514 100, ASIMAGE_QUALITY_DEFAULT);
515 if (tmp)
516 {
517 destroy_asimage (&background);
518 background = tmp;
519 }
520 }
521# endif
522
523 ASImage *result = 0;
524
453 int target_width = (int)target->szHint.width; 525 int target_width = target->szHint.width;
454 int target_height = (int)target->szHint.height; 526 int target_height = target->szHint.height;
455 int new_pmap_width = target_width, new_pmap_height = target_height; 527 int new_pmap_width = target_width;
456 ASImage *result = NULL; 528 int new_pmap_height = target_height;
457 529
458 int x = 0; 530 int x = 0;
459 int y = 0; 531 int y = 0;
460 int w = h_scale * target_width / 100; 532 int w = 0;
461 int h = v_scale * target_height / 100; 533 int h = 0;
462
463 TIMING_TEST_START (asim);
464 534
465 if (original_asim) 535 if (original_asim)
466 { 536 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 537
479 if (original_asim == NULL 538 if (!original_asim
539 || (!(flags & rootAlign)
480 || x >= target_width 540 && (x >= target_width
481 || y >= target_height 541 || y >= target_height
482 || (w > 0 && x + w <= 0) 542 || (x + w <= 0)
483 || (h > 0 && y + h <= 0)) 543 || (y + h <= 0))))
484 { 544 {
485 if (background) 545 if (background)
486 { 546 {
487 new_pmap_width = background->width; 547 new_pmap_width = background->width;
488 new_pmap_height = background->height; 548 new_pmap_height = background->height;
489 result = background; 549 result = background;
550
490 if (background_tint != TINT_LEAVE_SAME) 551 if (background_tint != TINT_LEAVE_SAME)
491 { 552 {
492 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 553 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
493 target_width, target_height, background_tint, 554 target_width, target_height, background_tint,
494 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 555 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
495 if (tmp) 556 if (tmp)
496 result = tmp; 557 result = tmp;
497 } 558 }
… …
500 new_pmap_width = new_pmap_height = 0; 561 new_pmap_width = new_pmap_height = 0;
501 } 562 }
502 else 563 else
503 { 564 {
504 result = original_asim; 565 result = original_asim;
566
505 if ((w > 0 && w != original_asim->width) 567 if ((w != original_asim->width)
506 || (h > 0 && h != original_asim->height)) 568 || (h != original_asim->height))
507 { 569 {
508 result = scale_asimage (target->asv, original_asim, 570 result = scale_asimage (target->asv, original_asim,
509 w > 0 ? w : original_asim->width, 571 w, h,
510 h > 0 ? h : original_asim->height,
511 background ? ASA_ASImage : ASA_XImage, 572 background ? ASA_ASImage : ASA_XImage,
512 100, ASIMAGE_QUALITY_DEFAULT); 573 100, ASIMAGE_QUALITY_DEFAULT);
513 } 574 }
575
514 if (background == NULL) 576 if (background == NULL)
515 { 577 {
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) 578 if (h_scale == 0 || v_scale == 0)
524 { 579 {
580 /* if tiling - pixmap has to be sized exactly as the image,
581 but there is no need to make it bigger than the window! */
582 new_pmap_width = min (result->width, target_width);
583 new_pmap_height = min (result->height, target_height);
584
585 /* we also need to tile our image in both directions */
525 ASImage *tmp = tile_asimage (target->asv, result, 586 ASImage *tmp = tile_asimage (target->asv, result,
526 (h_scale > 0) ? 0 : (int)result->width - x, 587 (int)result->width - x,
527 (v_scale > 0) ? 0 : (int)result->height - y, 588 (int)result->height - y,
528 new_pmap_width, 589 new_pmap_width,
529 new_pmap_height, 590 new_pmap_height,
530 TINT_LEAVE_SAME, ASA_XImage, 591 TINT_LEAVE_SAME, ASA_XImage,
531 100, ASIMAGE_QUALITY_DEFAULT); 592 100, ASIMAGE_QUALITY_DEFAULT);
532 if (tmp) 593 if (tmp)
533 { 594 {
534 if (result != original_asim) 595 if (result != original_asim)
535 destroy_asimage (&result); 596 destroy_asimage (&result);
597
536 result = tmp; 598 result = tmp;
537 } 599 }
538 } 600 }
539 } 601 }
540 else 602 else
541 { 603 {
542 /* if blending background and image - pixmap has to be sized same as target window */ 604 /* if blending background and image - pixmap has to be sized same as target window */
543 ASImageLayer *layers = create_image_layers (2); 605 ASImageLayer *layers = create_image_layers (2);
544 ASImage *merged_im = NULL;
545 606
546 layers[0].im = background; 607 layers[0].im = background;
547 layers[0].clip_width = target_width; 608 layers[0].clip_width = target_width;
548 layers[0].clip_height = target_height; 609 layers[0].clip_height = target_height;
549 layers[0].tint = background_tint; 610 layers[0].tint = background_tint;
550 layers[1].im = result; 611 layers[1].im = result;
551 if (w <= 0) 612
613 if (h_scale == 0 || v_scale == 0)
552 { 614 {
553 /* tile horizontally */ 615 /* tile horizontally */
554 while (x > 0) x -= (int)result->width; 616 while (x > 0) x -= (int)result->width;
555 layers[1].dst_x = x; 617 layers[1].dst_x = x;
556 layers[1].clip_width = result->width+target_width; 618 layers[1].clip_width = result->width+target_width;
… …
559 { 621 {
560 /* clip horizontally */ 622 /* clip horizontally */
561 layers[1].dst_x = x; 623 layers[1].dst_x = x;
562 layers[1].clip_width = result->width; 624 layers[1].clip_width = result->width;
563 } 625 }
564 if (h <= 0) 626
627 if (h_scale == 0 || v_scale == 0)
565 { 628 {
566 while (y > 0) y -= (int)result->height; 629 while (y > 0) y -= (int)result->height;
567 layers[1].dst_y = y; 630 layers[1].dst_y = y;
568 layers[1].clip_height = result->height + target_height; 631 layers[1].clip_height = result->height + target_height;
569 } 632 }
570 else 633 else
571 { 634 {
572 layers[1].dst_y = y; 635 layers[1].dst_y = y;
573 layers[1].clip_height = result->height; 636 layers[1].clip_height = result->height;
574 } 637 }
638
575 if (target->rs[Rs_blendtype]) 639 if (target->rs[Rs_blendtype])
576 { 640 {
577 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 641 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
578 if (layers[1].merge_scanlines == NULL) 642 if (layers[1].merge_scanlines == NULL)
579 layers[1].merge_scanlines = alphablend_scanlines; 643 layers[1].merge_scanlines = alphablend_scanlines;
580 } 644 }
645
581 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 646 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
582 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 647 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
648
583 if (tmp) 649 if (tmp)
584 { 650 {
585 if (result != original_asim) 651 if (result != original_asim)
586 destroy_asimage (&result); 652 destroy_asimage (&result);
653
587 result = tmp; 654 result = tmp;
588 } 655 }
656
589 free (layers); 657 free (layers);
590 } 658 }
591 } 659 }
592 TIMING_TEST_PRINT_RESULT (asim);
593 660
594 if (pixmap) 661 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 662
606 if (result) 663 if (result)
607 { 664 {
608 XGCValues gcv; 665 XGCValues gcv;
609 GC gc; 666 GC gc;
667
668 if (pixmap)
669 {
670 if (pmap_width != new_pmap_width
671 || pmap_height != new_pmap_height
672 || pmap_depth != target->depth)
673 {
674 XFreePixmap (target->dpy, pixmap);
675 pixmap = None;
676 }
677 }
610 678
611 /* create Pixmap */ 679 /* create Pixmap */
612 if (pixmap == None) 680 if (pixmap == None)
613 { 681 {
614 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 682 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
615 pmap_width = new_pmap_width; 683 pmap_width = new_pmap_width;
616 pmap_height = new_pmap_height; 684 pmap_height = new_pmap_height;
617 pmap_depth = target->depth; 685 pmap_depth = target->depth;
618 } 686 }
619 /* fill with background color ( if result's not completely overlapping it)*/ 687 /* fill with background color (if result's not completely overlapping it) */
620 gcv.foreground = target->pix_colors[Color_bg]; 688 gcv.foreground = target->pix_colors[Color_bg];
621 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 689 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
622 690
623 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 691 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
624 int dst_width = result->width, dst_height = result->height; 692 int dst_width = result->width, dst_height = result->height;
625 if (background == NULL) 693 if (background == NULL)
626 { 694 {
627 if (h_scale > 0) 695 if (!(h_scale == 0 || v_scale == 0))
696 {
628 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 697 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); 698 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
699 }
631 700
632 if (dst_x > 0 || dst_y > 0 701 if (dst_x > 0 || dst_y > 0
633 || dst_x + dst_width < new_pmap_width 702 || dst_x + dst_width < new_pmap_width
634 || dst_y + dst_height < new_pmap_height) 703 || dst_y + dst_height < new_pmap_height)
635 {
636 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 704 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
637 }
638 } 705 }
639 706
640 /* put result on pixmap */ 707 /* put result on pixmap */
641 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 708 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); 709 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
643 710
644 if (result != background && result != original_asim) 711 if (result != background && result != original_asim)
645 destroy_asimage (&result); 712 destroy_asimage (&result);
646 713
647 XFreeGC (target->dpy, gc); 714 XFreeGC (target->dpy, gc);
648 TIMING_TEST_PRINT_RESULT (asim);
649 }
650 715
716 ret = true;
717 }
718
719 if (background)
720 destroy_asimage (&background);
721
651 return true; 722 return ret;
652} 723}
653# endif /* HAVE_AFTERIMAGE */ 724# endif /* HAVE_AFTERIMAGE */
725
726# ifdef HAVE_PIXBUF
727bool
728bgPixmap_t::render_image (unsigned long background_flags)
729{
730 if (target == NULL)
731 return false;
732
733 if (!pixbuf)
734 return false;
735
736#if !XFT
737 if (background_flags)
738 return false;
739#endif
740
741 GdkPixbuf *result;
742
743 int image_width = gdk_pixbuf_get_width (pixbuf);
744 int image_height = gdk_pixbuf_get_height (pixbuf);
745
746 int target_width = target->szHint.width;
747 int target_height = target->szHint.height;
748 int new_pmap_width = target_width;
749 int new_pmap_height = target_height;
750
751 int x = 0;
752 int y = 0;
753 int w = 0;
754 int h = 0;
755
756 get_image_geometry (image_width, image_height, w, h, x, y);
757
758 if (!(flags & rootAlign)
759 && (x >= target_width
760 || y >= target_height
761 || (x + w <= 0)
762 || (y + h <= 0)))
763 return false;
764
765 result = pixbuf;
766
767 if ((w != image_width)
768 || (h != image_height))
769 {
770 result = gdk_pixbuf_scale_simple (pixbuf,
771 w, h,
772 GDK_INTERP_BILINEAR);
773 }
774
775 bool ret = false;
776
777 if (result)
778 {
779 XGCValues gcv;
780 GC gc;
781 Pixmap root_pmap;
782
783 image_width = gdk_pixbuf_get_width (result);
784 image_height = gdk_pixbuf_get_height (result);
785
786 if (background_flags)
787 {
788 root_pmap = pixmap;
789 pixmap = None;
790 }
791 else
792 {
793 if (h_scale == 0 || v_scale == 0)
794 {
795 new_pmap_width = min (image_width, target_width);
796 new_pmap_height = min (image_height, target_height);
797 }
798 }
799
800 if (pixmap)
801 {
802 if (pmap_width != new_pmap_width
803 || pmap_height != new_pmap_height
804 || pmap_depth != target->depth)
805 {
806 XFreePixmap (target->dpy, pixmap);
807 pixmap = None;
808 }
809 }
810
811 if (pixmap == None)
812 {
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height;
816 pmap_depth = target->depth;
817 }
818
819 gcv.foreground = target->pix_colors[Color_bg];
820 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
821
822 if (h_scale == 0 || v_scale == 0)
823 {
824 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
825 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
826 0, 0,
827 0, 0,
828 image_width, image_height,
829 XLIB_RGB_DITHER_NONE,
830 0, 0);
831
832 gcv.tile = tile;
833 gcv.fill_style = FillTiled;
834 gcv.ts_x_origin = x;
835 gcv.ts_y_origin = y;
836 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
837
838 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
839 XFreePixmap (target->dpy, tile);
840 }
841 else
842 {
843 int src_x, src_y, dst_x, dst_y;
844 int dst_width, dst_height;
845
846 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
847 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
848
849 if (dst_x > 0 || dst_y > 0
850 || dst_x + dst_width < new_pmap_width
851 || dst_y + dst_height < new_pmap_height)
852 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
853
854 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
855 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
856 src_x, src_y,
857 dst_x, dst_y,
858 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE,
860 0, 0);
861 }
862
863#if XFT
864 if (background_flags)
865 {
866 Display *dpy = target->dpy;
867 XRenderPictureAttributes pa;
868
869 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
870 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
871
872 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
873 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
874
875 pa.repeat = True;
876 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
877 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
878 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
879 XFreePixmap (dpy, mask_pmap);
880
881 if (src && dst && mask)
882 {
883 XRenderColor mask_c;
884
885 mask_c.alpha = 0x8000;
886 mask_c.red = 0;
887 mask_c.green = 0;
888 mask_c.blue = 0;
889 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
890 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
891 }
892
893 XRenderFreePicture (dpy, src);
894 XRenderFreePicture (dpy, dst);
895 XRenderFreePicture (dpy, mask);
896
897 XFreePixmap (dpy, root_pmap);
898 }
899#endif
900
901 if (result != pixbuf)
902 g_object_unref (result);
903
904 XFreeGC (target->dpy, gc);
905
906 ret = true;
907 }
908
909 return ret;
910}
911# endif /* HAVE_PIXBUF */
654 912
655bool 913bool
656bgPixmap_t::set_file (const char *file) 914bgPixmap_t::set_file (const char *file)
657{ 915{
658 char *f;
659
660 assert (file != NULL); 916 assert (file);
661 917
662 if (*file != '\0') 918 if (*file)
663 { 919 {
920 if (const char *p = strchr (file, ';'))
921 {
922 size_t len = p - file;
923 char *f = rxvt_temp_buf<char> (len + 1);
924 memcpy (f, file, len);
925 f[len] = '\0';
926 file = f;
927 }
928
664# ifdef HAVE_AFTERIMAGE 929# ifdef HAVE_AFTERIMAGE
665 if (target->asimman == NULL) 930 if (!target->asimman)
666 target->asimman = create_generic_imageman (target->rs[Rs_path]); 931 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); 932 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
669 else 933 if (image)
670 {
671 size_t len = f - file;
672 f = (char *)malloc (len + 1);
673 strncpy (f, file, len);
674 f[len] = '\0';
675 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
676 free (f);
677 } 934 {
678 return (original_asim != NULL); 935 if (original_asim)
936 safe_asimage_destroy (original_asim);
937 original_asim = image;
938 have_image = true;
939 return true;
940 }
679# endif 941# endif
942
943# ifdef HAVE_PIXBUF
944 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
945 if (image)
946 {
947 if (pixbuf)
948 g_object_unref (pixbuf);
949 pixbuf = image;
950 have_image = true;
951 return true;
952 }
953# endif
680 } 954 }
955
681 return false; 956 return false;
682} 957}
683 958
684# endif /* BG_IMAGE_FROM_FILE */ 959# endif /* BG_IMAGE_FROM_FILE */
685 960
… …
690 if (!(flags & isTransparent)) 965 if (!(flags & isTransparent))
691 { 966 {
692 flags |= isTransparent; 967 flags |= isTransparent;
693 return true; 968 return true;
694 } 969 }
970
695 return false; 971 return false;
696} 972}
697 973
698bool 974bool
699bgPixmap_t::set_blur_radius (const char *geom) 975bgPixmap_t::set_blur_radius (const char *geom)
… …
701 int changed = 0; 977 int changed = 0;
702 unsigned int hr, vr; 978 unsigned int hr, vr;
703 int junk; 979 int junk;
704 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 980 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
705 981
706 if (!(geom_flags&WidthValue)) 982 if (!(geom_flags & WidthValue))
707 hr = 1; 983 hr = 1;
708 if (!(geom_flags&HeightValue)) 984 if (!(geom_flags & HeightValue))
709 vr = hr; 985 vr = hr;
986
987 min_it (hr, 128);
988 min_it (vr, 128);
710 989
711 if (h_blurRadius != hr) 990 if (h_blurRadius != hr)
712 { 991 {
713 ++changed; 992 ++changed;
714 h_blurRadius = hr; 993 h_blurRadius = hr;
… …
723 if (v_blurRadius == 0 && h_blurRadius == 0) 1002 if (v_blurRadius == 0 && h_blurRadius == 0)
724 flags &= ~blurNeeded; 1003 flags &= ~blurNeeded;
725 else 1004 else
726 flags |= blurNeeded; 1005 flags |= blurNeeded;
727 1006
1007#if XFT
1008 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1009 if (filters)
1010 {
1011 for (int i = 0; i < filters->nfilter; i++)
1012 if (!strcmp (filters->filter[i], FilterConvolution))
1013 flags |= bgPixmap_t::blurServerSide;
1014
1015 XFree (filters);
1016 }
1017#endif
1018
728 return (changed>0); 1019 return (changed > 0);
729} 1020}
730 1021
731static inline unsigned long 1022static inline unsigned long
732compute_tint_shade_flags (rxvt_color *tint, int shade) 1023compute_tint_shade_flags (rxvt_color *tint, int shade)
733{ 1024{
734 unsigned long flags = 0; 1025 unsigned long flags = 0;
735 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1026 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
736 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1027 bool has_shade = shade != 100;
737 1028
738 if (tint) 1029 if (tint)
739 { 1030 {
740 tint->get (c); 1031 tint->get (c);
741# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1032# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
750 flags |= bgPixmap_t::tintNeeded; 1041 flags |= bgPixmap_t::tintNeeded;
751 else if (tint) 1042 else if (tint)
752 { 1043 {
753 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 1044 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
754 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 1045 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
755 { 1046 {
756 flags |= bgPixmap_t::tintNeeded; 1047 flags |= bgPixmap_t::tintNeeded;
757 } 1048 }
758 } 1049 }
759 1050
760 if (flags & bgPixmap_t::tintNeeded) 1051 if (flags & bgPixmap_t::tintNeeded)
761 { 1052 {
762 if (flags & bgPixmap_t::tintWholesome) 1053 if (flags & bgPixmap_t::tintWholesome)
… …
773} 1064}
774 1065
775bool 1066bool
776bgPixmap_t::set_tint (rxvt_color &new_tint) 1067bgPixmap_t::set_tint (rxvt_color &new_tint)
777{ 1068{
778 if (tint != new_tint) 1069 if (!(flags & tintSet) || tint != new_tint)
779 { 1070 {
780 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1071 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
781 tint = new_tint; 1072 tint = new_tint;
782 flags = (flags & ~tintFlags) | new_flags | tintSet; 1073 flags = (flags & ~tintFlags) | new_flags | tintSet;
783 return true; 1074 return true;
… …
791{ 1082{
792 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1083 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
793 1084
794 if (new_flags != (flags & tintFlags)) 1085 if (new_flags != (flags & tintFlags))
795 { 1086 {
796 flags = (flags&~tintFlags)|new_flags; 1087 flags = (flags & ~tintFlags) | new_flags;
797 return true; 1088 return true;
798 } 1089 }
799 1090
800 return false; 1091 return false;
801} 1092}
802 1093
803bool 1094bool
804bgPixmap_t::set_shade (const char *shade_str) 1095bgPixmap_t::set_shade (const char *shade_str)
805{ 1096{
806 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1097 int new_shade = (shade_str) ? atoi (shade_str) : 100;
807 1098
808 if (new_shade < 0 && new_shade > -100) 1099 clamp_it (new_shade, -100, 200);
1100 if (new_shade < 0)
809 new_shade = 200 - (100 + new_shade); 1101 new_shade = 200 - (100 + new_shade);
810 else if (new_shade == 100)
811 new_shade = 0;
812 1102
813 if (new_shade != shade) 1103 if (new_shade != shade)
814 { 1104 {
815 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1105 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
816 shade = new_shade; 1106 shade = new_shade;
817 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1107 flags = (flags & (~tintFlags | tintSet)) | new_flags;
818 return true; 1108 return true;
819 } 1109 }
820 1110
821 return false; 1111 return false;
1112}
1113
1114#if XFT
1115static void
1116get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1117{
1118 double sigma = radius / 2.0;
1119 double scale = sqrt (2.0 * M_PI) * sigma;
1120 double sum = 0.0;
1121
1122 for (int i = 0; i < width; i++)
1123 {
1124 double x = i - width / 2;
1125 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1126 sum += kernel[i];
1127 }
1128
1129 params[0] = XDoubleToFixed (width);
1130 params[1] = XDoubleToFixed (1);
1131
1132 for (int i = 0; i < width; i++)
1133 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1134}
1135#endif
1136
1137bool
1138bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1139{
1140 bool ret = false;
1141#if XFT
1142 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1143 double *kernel = (double *)malloc (size * sizeof (double));
1144 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1145
1146 Display *dpy = target->dpy;
1147 XRenderPictureAttributes pa;
1148 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1149
1150 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1151 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1152
1153 if (kernel && params && src && dst)
1154 {
1155 if (h_blurRadius)
1156 {
1157 size = h_blurRadius * 2 + 1;
1158 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1159
1160 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1161 XRenderComposite (dpy,
1162 PictOpSrc,
1163 src,
1164 None,
1165 dst,
1166 0, 0,
1167 0, 0,
1168 0, 0,
1169 width, height);
1170 }
1171
1172 if (v_blurRadius)
1173 {
1174 size = v_blurRadius * 2 + 1;
1175 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1176 swap (params[0], params[1]);
1177
1178 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1179 XRenderComposite (dpy,
1180 PictOpSrc,
1181 src,
1182 None,
1183 dst,
1184 0, 0,
1185 0, 0,
1186 0, 0,
1187 width, height);
1188 }
1189
1190 ret = true;
1191 }
1192
1193 free (kernel);
1194 free (params);
1195 XRenderFreePicture (dpy, src);
1196 XRenderFreePicture (dpy, dst);
1197#endif
1198 return ret;
1199}
1200
1201bool
1202bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1203{
1204 Display *dpy = target->dpy;
1205 bool ret = false;
1206
1207 if (flags & tintWholesome)
1208 {
1209 XGCValues gcv;
1210 GC gc;
1211
1212 /* In this case we can tint image server-side getting significant
1213 * performance improvements, as we eliminate XImage transfer
1214 */
1215 gcv.foreground = Pixel (tint);
1216 gcv.function = GXand;
1217 gcv.fill_style = FillSolid;
1218 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1219 if (gc)
1220 {
1221 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1222 ret = true;
1223 XFreeGC (dpy, gc);
1224 }
1225 }
1226 else
1227 {
1228# if XFT
1229 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1230
1231 if (flags & tintSet)
1232 tint.get (c);
1233
1234 if (shade <= 100)
1235 {
1236 c.r = (c.r * shade) / 100;
1237 c.g = (c.g * shade) / 100;
1238 c.b = (c.b * shade) / 100;
1239 }
1240 else
1241 {
1242 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1243 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1244 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1245 }
1246
1247 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1248 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1249 XRenderPictureAttributes pa;
1250
1251 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1252
1253 pa.repeat = True;
1254
1255 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1256 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1257 XFreePixmap (dpy, overlay_pmap);
1258
1259 pa.component_alpha = True;
1260 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1261 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1262 XFreePixmap (dpy, mask_pmap);
1263
1264 if (mask_pic && overlay_pic && back_pic)
1265 {
1266 XRenderColor mask_c;
1267
1268 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1269 mask_c.alpha = 0xffff;
1270 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1271
1272 mask_c.alpha = 0;
1273 mask_c.red = 0xffff - c.r;
1274 mask_c.green = 0xffff - c.g;
1275 mask_c.blue = 0xffff - c.b;
1276 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1277 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1278 ret = true;
1279 }
1280
1281 XRenderFreePicture (dpy, mask_pic);
1282 XRenderFreePicture (dpy, overlay_pic);
1283 XRenderFreePicture (dpy, back_pic);
1284# endif
1285 }
1286
1287 return ret;
822} 1288}
823 1289
824/* make_transparency_pixmap() 1290/* make_transparency_pixmap()
825 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1291 * Builds a pixmap sized the same as terminal window, with depth same as the root window
826 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1292 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
832 unsigned long result = 0; 1298 unsigned long result = 0;
833 1299
834 if (target == NULL) 1300 if (target == NULL)
835 return 0; 1301 return 0;
836 1302
837 /* root dimentions may change from call to call - but Display structure should 1303 /* root dimensions may change from call to call - but Display structure should
838 * be always up-to-date, so let's use it : 1304 * be always up-to-date, so let's use it :
839 */ 1305 */
840 Window root = target->display->root; 1306 Window root = target->display->root;
841 int screen = target->display->screen; 1307 int screen = target->display->screen;
842 Display *dpy = target->dpy; 1308 Display *dpy = target->dpy;
… …
845 unsigned int root_pmap_width, root_pmap_height; 1311 unsigned int root_pmap_width, root_pmap_height;
846 int window_width = target->szHint.width; 1312 int window_width = target->szHint.width;
847 int window_height = target->szHint.height; 1313 int window_height = target->szHint.height;
848 int sx, sy; 1314 int sx, sy;
849 XGCValues gcv; 1315 XGCValues gcv;
1316 GC gc;
850 1317
851 TIMING_TEST_START (tp);
852 target->get_window_origin (sx, sy); 1318 target->get_window_origin (sx, sy);
853 1319
854 /* check if we are outside of the visible part of the virtual screen : */ 1320 /* check if we are outside of the visible part of the virtual screen : */
855 if (sx + window_width <= 0 || sy + window_height <= 0 1321 if (sx + window_width <= 0 || sy + window_height <= 0
856 || sx >= root_width || sy >= root_height) 1322 || sx >= root_width || sy >= root_height)
857 return 0; 1323 return 0;
858 1324
859 if (root_pixmap != None) 1325 if (root_pixmap != None)
860 { 1326 {
861 /* we want to validate the pixmap and get it's size at the same time : */ 1327 /* we want to validate the pixmap and get its size at the same time : */
862 int junk; 1328 int junk;
863 unsigned int ujunk; 1329 unsigned int ujunk;
864 /* root pixmap may be bad - allow a error */ 1330 /* root pixmap may be bad - allow a error */
865 target->allowedxerror = -1; 1331 target->allowedxerror = -1;
866 1332
… …
868 root_pixmap = None; 1334 root_pixmap = None;
869 1335
870 target->allowedxerror = 0; 1336 target->allowedxerror = 0;
871 } 1337 }
872 1338
1339 if (root_pixmap == None)
1340 return 0;
1341
873 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1342 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
874 GC gc = NULL;
875 1343
876 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1344 if (tiled_root_pmap == None) /* something really bad happened - abort */
877 return 0; 1345 return 0;
878 1346
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 */ 1347 /* straightforward pixmap copy */
937 gcv.tile = root_pixmap; 1348 gcv.tile = root_pixmap;
938 gcv.fill_style = FillTiled; 1349 gcv.fill_style = FillTiled;
939 1350
940 while (sx < 0) sx += (int)root_width; 1351 while (sx < 0) sx += (int)root_width;
941 while (sy < 0) sy += (int)root_height; 1352 while (sy < 0) sy += (int)root_height;
942 1353
943 gcv.ts_x_origin = -sx; 1354 gcv.ts_x_origin = -sx;
944 gcv.ts_y_origin = -sy; 1355 gcv.ts_y_origin = -sy;
945 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1356 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
946 1357
947 if (gc) 1358 if (gc)
948 { 1359 {
949 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1360 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
950 result |= transpPmapTiled; 1361 result |= transpPmapTiled;
951 } 1362 XFreeGC (dpy, gc);
952 } 1363 }
953 TIMING_TEST_PRINT_RESULT (tp);
954 1364
955 if (tiled_root_pmap != None) 1365 if (tiled_root_pmap != None)
956 { 1366 {
957 if (!need_client_side_rendering ()) 1367 if (!need_client_side_rendering ())
958 { 1368 {
959 if ((flags & tintNeeded)) 1369 if (flags & (blurNeeded | blurServerSide))
960 {
961 if (flags & tintWholesome)
962 { 1370 {
963 /* In this case we can tint image server-side getting significant 1371 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), 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; 1372 result |= transpPmapBlurred;
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 } 1373 }
1374 if (flags & (tintNeeded | tintServerSide))
1375 {
1376 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1377 result |= transpPmapTinted;
1378 }
1060 } /* server side rendering completed */ 1379 } /* server side rendering completed */
1061 1380
1062 if (pixmap) 1381 if (pixmap)
1063 XFreePixmap (dpy, pixmap); 1382 XFreePixmap (dpy, pixmap);
1064 1383
… …
1066 pmap_width = window_width; 1385 pmap_width = window_width;
1067 pmap_height = window_height; 1386 pmap_height = window_height;
1068 pmap_depth = root_depth; 1387 pmap_depth = root_depth;
1069 } 1388 }
1070 1389
1071 if (gc)
1072 XFreeGC (dpy, gc);
1073
1074 TIMING_TEST_PRINT_RESULT (tp);
1075
1076 return result; 1390 return result;
1077} 1391}
1078 1392
1079bool 1393bool
1080bgPixmap_t::set_root_pixmap () 1394bgPixmap_t::set_root_pixmap ()
… …
1092 return false; 1406 return false;
1093} 1407}
1094# endif /* ENABLE_TRANSPARENCY */ 1408# endif /* ENABLE_TRANSPARENCY */
1095 1409
1096# ifndef HAVE_AFTERIMAGE 1410# ifndef HAVE_AFTERIMAGE
1097static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1411static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1098# endif 1412# endif
1099 1413
1100bool 1414bool
1101bgPixmap_t::render () 1415bgPixmap_t::render ()
1102{ 1416{
1103 unsigned long background_flags = 0; 1417 unsigned long background_flags = 0;
1104 1418
1105 if (target == NULL) 1419 if (target == NULL)
1106 return false; 1420 return false;
1107 1421
1108 TIMING_TEST_START (tp);
1109
1110 invalidate(); 1422 invalidate ();
1111# ifdef ENABLE_TRANSPARENCY 1423# ifdef ENABLE_TRANSPARENCY
1112 if (flags & isTransparent) 1424 if (flags & isTransparent)
1113 { 1425 {
1114 /* we need to re-generate transparency pixmap in that case ! */ 1426 /* we need to re-generate transparency pixmap in that case ! */
1115 background_flags = make_transparency_pixmap (); 1427 background_flags = make_transparency_pixmap ();
1116 if (background_flags == 0) 1428 if (background_flags == 0)
1117 return false; 1429 return false;
1118 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1430 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1119 && pmap_depth == target->depth) 1431 && pmap_depth == target->depth)
1120 flags = flags & ~isInvalid; 1432 flags = flags & ~isInvalid;
1121 } 1433 }
1122# endif 1434# endif
1123 1435
1436# ifdef BG_IMAGE_FROM_FILE
1437 if (have_image
1438 || (background_flags & transpTransformations) != (flags & transpTransformations))
1439 {
1440 if (render_image (background_flags))
1441 flags = flags & ~isInvalid;
1442 }
1443# endif
1444
1124 XImage *result = NULL; 1445 XImage *result = NULL;
1125# ifdef HAVE_AFTERIMAGE 1446
1126 if (original_asim 1447 if (background_flags && (flags & isInvalid))
1127 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1448 {
1449 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1128 { 1450 }
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 1451
1134# ifdef ENABLE_TRANSPARENCY 1452 if (result)
1453 {
1454# if !defined(HAVE_AFTERIMAGE) && !XFT
1455 /* our own client-side tinting */
1456 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1457 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1135 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1458 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1136 { 1459 {
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); 1460 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1141 if (flags & tintSet) 1461 if (flags & tintSet)
1142 tint.get (c); 1462 tint.get (c);
1143 as_shade.tintColor.red = c.r; 1463 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 } 1464 }
1160# endif 1465# endif
1161 1466
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); 1467 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1193 1468
1194 if (gc) 1469 if (gc)
1195 { 1470 {
1196 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1471 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1225 1500
1226 XFreeGC (target->dpy, gc); 1501 XFreeGC (target->dpy, gc);
1227 flags = flags & ~isInvalid; 1502 flags = flags & ~isInvalid;
1228 } 1503 }
1229 1504
1230 XDestroyImage (result); 1505 XDestroyImage (result);
1231 } 1506 }
1232 1507
1233 if (flags & isInvalid) 1508 if (flags & isInvalid)
1234 { 1509 {
1235 if (pixmap != None) 1510 if (pixmap != None)
… …
1239 } 1514 }
1240 } 1515 }
1241 1516
1242 apply (); 1517 apply ();
1243 1518
1244 XSync (target->dpy, False);
1245 valid_since = ev::now (); 1519 valid_since = ev::now ();
1246
1247 TIMING_TEST_PRINT_RESULT (tp);
1248 1520
1249 return true; 1521 return true;
1250} 1522}
1251 1523
1252bool 1524bool
… …
1259# ifdef ENABLE_TRANSPARENCY 1531# ifdef ENABLE_TRANSPARENCY
1260 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1532 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1261# endif 1533# endif
1262 return true; 1534 return true;
1263 } 1535 }
1536
1264 return false; 1537 return false;
1265} 1538}
1266 1539
1267void 1540void
1268bgPixmap_t::apply () 1541bgPixmap_t::apply ()
1269{ 1542{
1270 if (target) 1543 if (target)
1271 { 1544 {
1272 flags &= ~isVtOrigin; 1545 flags &= ~isVtOrigin;
1546
1273 if (pixmap != None) 1547 if (pixmap != None)
1274 { 1548 {
1275 /* set target's background to pixmap */ 1549 /* set target's background to pixmap */
1276# ifdef ENABLE_TRANSPARENCY 1550# ifdef ENABLE_TRANSPARENCY
1277 if (flags & isTransparent) 1551 if (flags & isTransparent)
1278 { 1552 {
1279 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1553 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1280 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1554 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1281# if HAVE_SCROLLBARS 1555
1282 if (target->scrollBar.win) 1556 if (target->scrollBar.win)
1283 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1557 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1284# endif
1285 } 1558 }
1286 else 1559 else
1287# endif 1560# endif
1288 { 1561 {
1289 flags |= isVtOrigin; 1562 flags |= isVtOrigin;
1290 /* force old pixmap dereference in case it was transparent before :*/ 1563 /* force old pixmap dereference in case it was transparent before :*/
1291 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1564 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1292 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1565 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1293 /* do we also need to set scrollbar's background here ? */ 1566 /* do we also need to set scrollbar's background here ? */
1294# if HAVE_SCROLLBARS 1567
1295 if (target->scrollBar.win) 1568 if (target->scrollBar.win)
1296 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1569 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1297# endif
1298 } 1570 }
1299 } 1571 }
1300 else 1572 else
1301 { 1573 {
1302 /* set target background to a pixel */ 1574 /* set target background to a pixel */
1303 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1575 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1304 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1576 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1305 /* do we also need to set scrollbar's background here ? */ 1577 /* do we also need to set scrollbar's background here ? */
1306# if HAVE_SCROLLBARS
1307 if (target->scrollBar.win) 1578 if (target->scrollBar.win)
1308 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1579 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1309# endif
1310 } 1580 }
1581
1311 /* don't want Expose on the parent or vt. It is better to use 1582 /* don't want Expose on the parent or vt. It is better to use
1312 scr_touch or we get a great deal of flicker otherwise: */ 1583 scr_touch or we get a great deal of flicker otherwise: */
1313 XClearWindow (target->dpy, target->parent[0]); 1584 XClearWindow (target->dpy, target->parent[0]);
1314 1585
1315# if HAVE_SCROLLBARS 1586 if (target->scrollBar.state && target->scrollBar.win)
1316 if (target->scrollBar.win)
1317 { 1587 {
1318 target->scrollBar.setIdle (); 1588 target->scrollBar.state = STATE_IDLE;
1319 target->scrollbar_show (0); 1589 target->scrollBar.show (0);
1320 } 1590 }
1321# endif
1322 1591
1323 target->want_refresh = 1; 1592 target->want_refresh = 1;
1324 flags |= hasChanged; 1593 flags |= hasChanged;
1325 } 1594 }
1326} 1595}
… …
1328#endif /* HAVE_BG_PIXMAP */ 1597#endif /* HAVE_BG_PIXMAP */
1329 1598
1330#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1599#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1331/* taken from aterm-0.4.2 */ 1600/* taken from aterm-0.4.2 */
1332 1601
1333typedef uint32_t RUINT32T;
1334
1335static void 1602static void
1336ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1603ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1337{ 1604{
1338 int sh_r, sh_g, sh_b; 1605 int sh_r, sh_g, sh_b;
1339 RUINT32T mask_r, mask_g, mask_b; 1606 uint32_t mask_r, mask_g, mask_b;
1340 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1607 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1341 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1608 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1342 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1609 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1343 int i; 1610 int i;
1611 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1344 1612
1345 Visual *visual = term->visual;
1346
1347 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1613 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1348
1349 if (shade == 0)
1350 shade = 100;
1351 1614
1352 /* for convenience */ 1615 /* for convenience */
1353 mask_r = visual->red_mask; 1616 mask_r = visual->red_mask;
1354 mask_g = visual->green_mask; 1617 mask_g = visual->green_mask;
1355 mask_b = visual->blue_mask; 1618 mask_b = visual->blue_mask;
1356 1619
1357 /* boring lookup table pre-initialization */ 1620 /* boring lookup table pre-initialization */
1358 switch (srcImage->bits_per_pixel) { 1621 switch (srcImage->depth)
1622 {
1359 case 15: 1623 case 15:
1360 if ((mask_r != 0x7c00) || 1624 if ((mask_r != 0x7c00) ||
1361 (mask_g != 0x03e0) || 1625 (mask_g != 0x03e0) ||
1362 (mask_b != 0x001f)) 1626 (mask_b != 0x001f))
1363 return; 1627 return;
1364 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1628 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1365 lookup_r = lookup; 1629 lookup_r = lookup;
1366 lookup_g = lookup+32; 1630 lookup_g = lookup+32;
1367 lookup_b = lookup+32+32; 1631 lookup_b = lookup+32+32;
1368 sh_r = 10; 1632 sh_r = 10;
1369 sh_g = 5; 1633 sh_g = 5;
1370 sh_b = 0; 1634 sh_b = 0;
1371 break; 1635 break;
1372 case 16: 1636 case 16:
1373 if ((mask_r != 0xf800) || 1637 if ((mask_r != 0xf800) ||
1374 (mask_g != 0x07e0) || 1638 (mask_g != 0x07e0) ||
1375 (mask_b != 0x001f)) 1639 (mask_b != 0x001f))
1376 return; 1640 return;
1377 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1641 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1378 lookup_r = lookup; 1642 lookup_r = lookup;
1379 lookup_g = lookup+32; 1643 lookup_g = lookup+32;
1380 lookup_b = lookup+32+64; 1644 lookup_b = lookup+32+64;
1381 sh_r = 11; 1645 sh_r = 11;
1382 sh_g = 5; 1646 sh_g = 5;
1383 sh_b = 0; 1647 sh_b = 0;
1384 break; 1648 break;
1385 case 24: 1649 case 24:
1386 if ((mask_r != 0xff0000) || 1650 if ((mask_r != 0xff0000) ||
1387 (mask_g != 0x00ff00) || 1651 (mask_g != 0x00ff00) ||
1388 (mask_b != 0x0000ff)) 1652 (mask_b != 0x0000ff))
1389 return; 1653 return;
1390 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1654 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1391 lookup_r = lookup; 1655 lookup_r = lookup;
1392 lookup_g = lookup+256; 1656 lookup_g = lookup+256;
1393 lookup_b = lookup+256+256; 1657 lookup_b = lookup+256+256;
1394 sh_r = 16; 1658 sh_r = 16;
1395 sh_g = 8; 1659 sh_g = 8;
1396 sh_b = 0; 1660 sh_b = 0;
1397 break; 1661 break;
1398 case 32: 1662 case 32:
1399 if ((mask_r != 0xff0000) || 1663 if ((mask_r != 0xff0000) ||
1400 (mask_g != 0x00ff00) || 1664 (mask_g != 0x00ff00) ||
1401 (mask_b != 0x0000ff)) 1665 (mask_b != 0x0000ff))
1402 return; 1666 return;
1403 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1667 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1404 lookup_r = lookup; 1668 lookup_r = lookup;
1405 lookup_g = lookup+256; 1669 lookup_g = lookup+256;
1406 lookup_b = lookup+256+256; 1670 lookup_b = lookup+256+256;
1407 sh_r = 16; 1671 sh_r = 16;
1408 sh_g = 8; 1672 sh_g = 8;
1409 sh_b = 0; 1673 sh_b = 0;
1410 break; 1674 break;
1411 default: 1675 default:
1412 return; /* we do not support this color depth */ 1676 return; /* we do not support this color depth */
1413 } 1677 }
1414 1678
1415 /* prepare limits for color transformation (each channel is handled separately) */ 1679 /* prepare limits for color transformation (each channel is handled separately) */
1416 if (shade < 0) { 1680 if (shade > 100)
1681 {
1417 shade = -shade; 1682 shade = 200 - shade;
1418 if (shade < 0) shade = 0;
1419 if (shade > 100) shade = 100;
1420 1683
1421 lower_lim_r = 65535-rm; 1684 lower_lim_r = 65535-rm;
1422 lower_lim_g = 65535-gm; 1685 lower_lim_g = 65535-gm;
1423 lower_lim_b = 65535-bm; 1686 lower_lim_b = 65535-bm;
1424 1687
1425 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1688 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); 1689 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); 1690 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1428 1691
1429 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1692 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1693 }
1430 } else { 1694 else
1431 if (shade < 0) shade = 0; 1695 {
1432 if (shade > 100) shade = 100;
1433 1696
1434 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1697 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1435 1698
1436 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1699 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1437 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1700 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1438 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1701 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1439 } 1702 }
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 1703
1455 /* fill our lookup tables */ 1704 /* fill our lookup tables */
1456 for (i = 0; i <= mask_r>>sh_r; i++) 1705 for (i = 0; i <= mask_r>>sh_r; i++)
1457 { 1706 {
1458 RUINT32T tmp; 1707 uint32_t tmp;
1459 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1708 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1460 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1709 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1461 lookup_r[i] = (tmp/65535)<<sh_r; 1710 lookup_r[i] = (tmp/65535)<<sh_r;
1462 } 1711 }
1463 for (i = 0; i <= mask_g>>sh_g; i++) 1712 for (i = 0; i <= mask_g>>sh_g; i++)
1464 { 1713 {
1465 RUINT32T tmp; 1714 uint32_t tmp;
1466 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1715 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1467 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1716 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1468 lookup_g[i] = (tmp/65535)<<sh_g; 1717 lookup_g[i] = (tmp/65535)<<sh_g;
1469 } 1718 }
1470 for (i = 0; i <= mask_b>>sh_b; i++) 1719 for (i = 0; i <= mask_b>>sh_b; i++)
1471 { 1720 {
1472 RUINT32T tmp; 1721 uint32_t tmp;
1473 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1722 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1474 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1723 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1475 lookup_b[i] = (tmp/65535)<<sh_b; 1724 lookup_b[i] = (tmp/65535)<<sh_b;
1476 } 1725 }
1477 1726
1478 /* apply table to input image (replacing colors by newly calculated ones) */ 1727 /* apply table to input image (replacing colors by newly calculated ones) */
1479 switch (srcImage->bits_per_pixel) 1728 if (srcImage->bits_per_pixel == 32
1729 && (srcImage->depth == 24 || srcImage->depth == 32)
1730 && srcImage->byte_order == host_byte_order)
1480 { 1731 {
1481 case 15:
1482 {
1483 unsigned short *p1, *pf, *p, *pl; 1732 uint32_t *p1, *pf, *p, *pl;
1484 p1 = (unsigned short *) srcImage->data; 1733 p1 = (uint32_t *) srcImage->data;
1485 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1734 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1735
1486 while (p1 < pf) 1736 while (p1 < pf)
1487 { 1737 {
1488 p = p1; 1738 p = p1;
1489 pl = p1 + srcImage->width; 1739 pl = p1 + srcImage->width;
1490 for (; p < pl; p++) 1740 for (; p < pl; p++)
1491 { 1741 {
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] | 1742 *p = lookup_r[(*p & 0xff0000) >> 16] |
1551 lookup_g[(*p & 0x00ff00)>> 8] | 1743 lookup_g[(*p & 0x00ff00) >> 8] |
1552 lookup_b[(*p & 0x0000ff)] | 1744 lookup_b[(*p & 0x0000ff)] |
1553 (*p & ~0xffffff); 1745 (*p & 0xff000000);
1746 }
1747 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1748 }
1749 }
1750 else
1751 {
1752 for (int y = 0; y < srcImage->height; y++)
1753 for (int x = 0; x < srcImage->width; x++)
1754 {
1755 unsigned long pixel = XGetPixel (srcImage, x, y);
1756 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1757 lookup_g[(pixel & mask_g) >> sh_g] |
1758 lookup_b[(pixel & mask_b) >> sh_b];
1759 XPutPixel (srcImage, x, y, pixel);
1554 } 1760 }
1555 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1556 } 1761 }
1557 break;
1558 }
1559 }
1560 1762
1561 free (lookup); 1763 free (lookup);
1562} 1764}
1563#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1765#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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