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