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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines