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.34 by root, Sun Apr 26 01:59:53 2009 UTC vs.
Revision 1.119 by sf-exg, Thu Nov 18 17:28:12 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines