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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines