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.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 ?
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 <= 100)
223 return diff * align / 100; 232 return diff * align / 100;
224 else if (align > 50 && align <= 100)
225 return window_size - image_size - diff * (100 - align) / 100;
226 else if (align > 100 && align <= 200 ) 233 else if (align > 100 && align <= 200 )
227 return ((align - 100) * smaller / 100) + window_size - smaller; 234 return ((align - 100) * smaller / 100) + window_size - smaller;
228 else if (align > -100 && align < 0) 235 else if (align >= -100 && align < 0)
229 return ((align + 100) * smaller / 100) - image_size; 236 return ((align + 100) * smaller / 100) - image_size;
230 return 0; 237 return 0;
231} 238}
232 239
233static inline int 240static inline int
234make_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)
235{ 242{
236 int src_pos = 0; 243 int src_pos = 0;
237 dst_pos = 0; 244 dst_pos = pos;
238 dst_size = size; 245 dst_size = size;
239 if (pos < 0 && size > target_size) 246 if (pos < 0)
240 { 247 {
241 src_pos = -pos; 248 src_pos = -pos;
249 dst_pos = 0;
242 dst_size += pos; 250 dst_size += pos;
243 } 251 }
244 else if (pos > 0)
245 dst_pos = pos;
246 252
247 if (dst_pos + dst_size > target_size) 253 if (dst_pos + dst_size > target_size)
248 dst_size = target_size - dst_pos; 254 dst_size = target_size - dst_pos;
249 return src_pos; 255 return src_pos;
250} 256}
… …
255 int geom_flags = 0, changed = 0; 261 int geom_flags = 0, changed = 0;
256 int x = 0, y = 0; 262 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 263 unsigned int w = 0, h = 0;
258 unsigned int n; 264 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 265 unsigned long new_flags = (flags & (~geometryFlags));
260 char *p; 266 const char *p;
261# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 268
263 if (geom == NULL) 269 if (geom == NULL)
264 return false; 270 return false;
265 271
266 char str[MAXLEN_GEOM]; 272 char str[MAXLEN_GEOM];
… …
273 if (n < MAXLEN_GEOM) 279 if (n < MAXLEN_GEOM)
274 { 280 {
275 char *ops; 281 char *ops;
276 new_flags |= geometrySet; 282 new_flags |= geometrySet;
277 283
278 strncpy (str, geom, n); 284 memcpy (str, geom, n);
279 str[n] = '\0'; 285 str[n] = '\0';
280 if (str[0] == ':') 286 if (str[0] == ':')
281 ops = &str[0]; 287 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 288 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0]; 289 ops = &str[0];
… …
303 y = x; 309 y = x;
304 geom_flags |= YValue; 310 geom_flags |= YValue;
305 } 311 }
306 312
307 if (flags & geometrySet) 313 if (flags & geometrySet)
314 {
308 {/* new geometry is an adjustment to the old one ! */ 315 /* new geometry is an adjustment to the old one ! */
309 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 316 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
310 { 317 {
311 if (w == 0 && h != 0) 318 if (w == 0 && h != 0)
312 { 319 {
313 w = h_scale; 320 w = h_scale;
… …
329 } 336 }
330 } 337 }
331 else /* setting up geometry from scratch */ 338 else /* setting up geometry from scratch */
332 { 339 {
333 if (!(geom_flags & XValue)) 340 if (!(geom_flags & XValue))
341 {
334 {/* use default geometry - centered */ 342 /* use default geometry - centered */
335 x = y = defaultAlign; 343 x = y = defaultAlign;
336 } 344 }
337 else if (!(geom_flags & YValue)) 345 else if (!(geom_flags & YValue))
338 y = x; 346 y = x;
339 347
340 if ((geom_flags & (WidthValue|HeightValue)) == 0) 348 if ((geom_flags & (WidthValue|HeightValue)) == 0)
349 {
341 {/* use default geometry - scaled */ 350 /* use default geometry - scaled */
342 w = h = defaultScale; 351 w = h = defaultScale;
343 } 352 }
344 else if (geom_flags & WidthValue) 353 else if (geom_flags & WidthValue)
345 { 354 {
346 if (!(geom_flags & HeightValue)) 355 if (!(geom_flags & HeightValue))
… …
349 else 358 else
350 w = h; 359 w = h;
351 } 360 }
352 } /* done parsing geometry string */ 361 } /* done parsing geometry string */
353 else if (!(flags & geometrySet)) 362 else if (!(flags & geometrySet))
363 {
354 { /* default geometry - scaled and centered */ 364 /* default geometry - scaled and centered */
355 x = y = defaultAlign; 365 x = y = defaultAlign;
356 w = h = defaultScale; 366 w = h = defaultScale;
357 } 367 }
358 368
359 if (!(flags & geometrySet)) 369 if (!(flags & geometrySet))
… …
362 if (ops) 372 if (ops)
363 { 373 {
364 while (*ops) 374 while (*ops)
365 { 375 {
366 while (*ops == ':' || isspace(*ops)) ++ops; 376 while (*ops == ':' || isspace(*ops)) ++ops;
377
367# 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)
368 if (CHECK_GEOM_OPS("tile")) 379 if (CHECK_GEOM_OPS ("tile"))
369 { 380 {
370 w = h = noScale; 381 w = h = noScale;
371 geom_flags |= WidthValue|HeightValue; 382 geom_flags |= WidthValue|HeightValue;
372 } 383 }
373 else if (CHECK_GEOM_OPS("propscale")) 384 else if (CHECK_GEOM_OPS ("propscale"))
374 { 385 {
375 if (w == 0 && h == 0)
376 {
377 w = windowScale;
378 geom_flags |= WidthValue;
379 }
380 new_flags |= propScale; 386 new_flags |= propScale;
381 } 387 }
382 else if (CHECK_GEOM_OPS("hscale")) 388 else if (CHECK_GEOM_OPS ("hscale"))
383 { 389 {
384 if (w == 0)
385 w = windowScale; 390 if (w == 0) w = windowScale;
391
386 h = noScale; 392 h = noScale;
387 geom_flags |= WidthValue|HeightValue; 393 geom_flags |= WidthValue|HeightValue;
388 } 394 }
389 else if (CHECK_GEOM_OPS("vscale")) 395 else if (CHECK_GEOM_OPS ("vscale"))
390 { 396 {
391 if (h == 0)
392 h = windowScale; 397 if (h == 0) h = windowScale;
398
393 w = noScale; 399 w = noScale;
394 geom_flags |= WidthValue|HeightValue; 400 geom_flags |= WidthValue|HeightValue;
395 } 401 }
396 else if (CHECK_GEOM_OPS("scale")) 402 else if (CHECK_GEOM_OPS ("scale"))
397 { 403 {
398 if (h == 0)
399 h = windowScale; 404 if (h == 0) h = windowScale;
400 if (w == 0)
401 w = windowScale; 405 if (w == 0) w = windowScale;
406
402 geom_flags |= WidthValue|HeightValue; 407 geom_flags |= WidthValue|HeightValue;
403 } 408 }
404 else if (CHECK_GEOM_OPS("auto")) 409 else if (CHECK_GEOM_OPS ("auto"))
405 { 410 {
406 w = h = windowScale; 411 w = h = windowScale;
407 x = y = centerAlign; 412 x = y = centerAlign;
408 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue|XValue|YValue;
409 } 414 }
410 else if (CHECK_GEOM_OPS("root")) 415 else if (CHECK_GEOM_OPS ("root"))
411 { 416 {
417 new_flags |= rootAlign;
412 w = h = noScale; 418 w = h = noScale;
413 x = y = rootAlign;
414 geom_flags |= WidthValue|HeightValue|XValue|YValue; 419 geom_flags |= WidthValue|HeightValue;
415 } 420 }
416# undef CHECK_GEOM_OPS 421# undef CHECK_GEOM_OPS
422
417 while (*ops != ':' && *ops != '\0') ++ops; 423 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 424 } /* done parsing ops */
419 } 425 }
420 426
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 427 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)) 428 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)) 429 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)) 430 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
428 ++changed;
429 } 431 }
430 432
431 if (new_flags != flags) 433 if (new_flags != flags)
432 { 434 {
433 flags = new_flags; 435 flags = new_flags;
434 changed++; 436 changed++;
435 } 437 }
438
436//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
437// flags, h_scale, v_scale, h_align, v_align); 440 // flags, h_scale, v_scale, h_align, v_align);
438 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;
439} 480}
440 481
441# ifdef HAVE_AFTERIMAGE 482# ifdef HAVE_AFTERIMAGE
442bool 483bool
443bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 484bgPixmap_t::render_image (unsigned long background_flags)
444{ 485{
445 if (target == NULL) 486 if (target == NULL)
446 return false; 487 return false;
447 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
448 int target_width = (int)target->szHint.width; 528 int target_width = target->szHint.width;
449 int target_height = (int)target->szHint.height; 529 int target_height = target->szHint.height;
450 int new_pmap_width = target_width, new_pmap_height = target_height; 530 int new_pmap_width = target_width;
451 ASImage *result = NULL; 531 int new_pmap_height = target_height;
452 532
453 int x = 0; 533 int x = 0;
454 int y = 0; 534 int y = 0;
455 int w = h_scale * target_width / 100; 535 int w = 0;
456 int h = v_scale * target_height / 100; 536 int h = 0;
457 537
458 TIMING_TEST_START (asim); 538 TIMING_TEST_START (asim);
459 539
460 if (original_asim) 540 if (original_asim)
461 { 541 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 542
474 if (original_asim == NULL 543 if (!original_asim
475 || x >= target_width 544 || x >= target_width
476 || y >= target_height 545 || y >= target_height
477 || (w > 0 && x + w <= 0) 546 || (w > 0 && x + w <= 0)
478 || (h > 0 && y + h <= 0)) 547 || (h > 0 && y + h <= 0))
479 { 548 {
480 if (background) 549 if (background)
481 { 550 {
482 new_pmap_width = background->width; 551 new_pmap_width = background->width;
483 new_pmap_height = background->height; 552 new_pmap_height = background->height;
484 result = background; 553 result = background;
554
485 if (background_tint != TINT_LEAVE_SAME) 555 if (background_tint != TINT_LEAVE_SAME)
486 { 556 {
487 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 557 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
488 target_width, target_height, background_tint, 558 target_width, target_height, background_tint,
489 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 559 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
490 if (tmp) 560 if (tmp)
491 result = tmp; 561 result = tmp;
492 } 562 }
… …
495 new_pmap_width = new_pmap_height = 0; 565 new_pmap_width = new_pmap_height = 0;
496 } 566 }
497 else 567 else
498 { 568 {
499 result = original_asim; 569 result = original_asim;
570
500 if ((w > 0 && w != original_asim->width) 571 if ((w > 0 && w != original_asim->width)
501 || (h > 0 && h != original_asim->height)) 572 || (h > 0 && h != original_asim->height))
502 { 573 {
503 result = scale_asimage (target->asv, original_asim, 574 result = scale_asimage (target->asv, original_asim,
504 w > 0 ? w : original_asim->width, 575 w > 0 ? w : original_asim->width,
505 h > 0 ? h : original_asim->height, 576 h > 0 ? h : original_asim->height,
506 background ? ASA_ASImage : ASA_XImage, 577 background ? ASA_ASImage : ASA_XImage,
507 100, ASIMAGE_QUALITY_DEFAULT); 578 100, ASIMAGE_QUALITY_DEFAULT);
508 } 579 }
580
509 if (background == NULL) 581 if (background == NULL)
510 {/* if tiling - pixmap has to be sized exactly as the image, 582 {
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) 583 if (h_scale == 0 || v_scale == 0)
518 { 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 */
519 ASImage *tmp = tile_asimage (target->asv, result, 591 ASImage *tmp = tile_asimage (target->asv, result,
520 (h_scale > 0) ? 0 : (int)result->width - x, 592 (int)result->width - x,
521 (v_scale > 0) ? 0 : (int)result->height - y, 593 (int)result->height - y,
522 new_pmap_width, 594 new_pmap_width,
523 new_pmap_height, 595 new_pmap_height,
524 TINT_LEAVE_SAME, ASA_XImage, 596 TINT_LEAVE_SAME, ASA_XImage,
525 100, ASIMAGE_QUALITY_DEFAULT); 597 100, ASIMAGE_QUALITY_DEFAULT);
526 if (tmp) 598 if (tmp)
527 { 599 {
528 if (result != original_asim) 600 if (result != original_asim)
529 destroy_asimage (&result); 601 destroy_asimage (&result);
602
530 result = tmp; 603 result = tmp;
531 } 604 }
532 } 605 }
533 } 606 }
534 else 607 else
608 {
535 {/* 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 */
536 ASImageLayer *layers = create_image_layers (2); 610 ASImageLayer *layers = create_image_layers (2);
537 ASImage *merged_im = NULL;
538 611
539 layers[0].im = background; 612 layers[0].im = background;
540 layers[0].clip_width = target_width; 613 layers[0].clip_width = target_width;
541 layers[0].clip_height = target_height; 614 layers[0].clip_height = target_height;
542 layers[0].tint = background_tint; 615 layers[0].tint = background_tint;
543 layers[1].im = result; 616 layers[1].im = result;
617
544 if (w <= 0) 618 if (w <= 0)
619 {
545 {/* tile horizontally */ 620 /* tile horizontally */
546 while (x > 0) x -= (int)result->width; 621 while (x > 0) x -= (int)result->width;
547 layers[1].dst_x = x; 622 layers[1].dst_x = x;
548 layers[1].clip_width = result->width+target_width; 623 layers[1].clip_width = result->width+target_width;
549 } 624 }
550 else 625 else
626 {
551 {/* clip horizontally */ 627 /* clip horizontally */
552 layers[1].dst_x = x; 628 layers[1].dst_x = x;
553 layers[1].clip_width = result->width; 629 layers[1].clip_width = result->width;
554 } 630 }
631
555 if (h <= 0) 632 if (h <= 0)
556 { 633 {
557 while (y > 0) y -= (int)result->height; 634 while (y > 0) y -= (int)result->height;
558 layers[1].dst_y = y; 635 layers[1].dst_y = y;
559 layers[1].clip_height = result->height + target_height; 636 layers[1].clip_height = result->height + target_height;
… …
561 else 638 else
562 { 639 {
563 layers[1].dst_y = y; 640 layers[1].dst_y = y;
564 layers[1].clip_height = result->height; 641 layers[1].clip_height = result->height;
565 } 642 }
643
566 if (target->rs[Rs_blendtype]) 644 if (target->rs[Rs_blendtype])
567 { 645 {
568 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 646 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
569 if (layers[1].merge_scanlines == NULL) 647 if (layers[1].merge_scanlines == NULL)
570 layers[1].merge_scanlines = alphablend_scanlines; 648 layers[1].merge_scanlines = alphablend_scanlines;
571 } 649 }
650
572 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,
573 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 652 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
653
574 if (tmp) 654 if (tmp)
575 { 655 {
576 if (result != original_asim) 656 if (result != original_asim)
577 destroy_asimage (&result); 657 destroy_asimage (&result);
658
578 result = tmp; 659 result = tmp;
579 } 660 }
661
580 free (layers); 662 free (layers);
581 } 663 }
582 } 664 }
583 TIMING_TEST_PRINT_RESULT (asim); 665 TIMING_TEST_PRINT_RESULT (asim);
584 666
585 if (pixmap) 667 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 668
597 if (result) 669 if (result)
598 { 670 {
599 XGCValues gcv; 671 XGCValues gcv;
600 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 }
601 684
602 /* create Pixmap */ 685 /* create Pixmap */
603 if (pixmap == None) 686 if (pixmap == None)
604 { 687 {
605 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);
606 pmap_width = new_pmap_width; 689 pmap_width = new_pmap_width;
607 pmap_height = new_pmap_height; 690 pmap_height = new_pmap_height;
608 pmap_depth = target->depth; 691 pmap_depth = target->depth;
609 } 692 }
610 /* fill with background color ( if result's not completely overlapping it)*/ 693 /* fill with background color (if result's not completely overlapping it) */
611 gcv.foreground = target->pix_colors[Color_bg]; 694 gcv.foreground = target->pix_colors[Color_bg];
612 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 695 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
613 696
614 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;
615 int dst_width = result->width, dst_height = result->height; 698 int dst_width = result->width, dst_height = result->height;
616 if (background == NULL) 699 if (background == NULL)
617 { 700 {
618 if (h_scale > 0) 701 if (!(h_scale == 0 || v_scale == 0))
702 {
619 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 );
620 if (v_scale > 0)
621 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 }
622 706
623 if (dst_x > 0 || dst_y > 0 707 if (dst_x > 0 || dst_y > 0
624 || dst_x + dst_width < new_pmap_width 708 || dst_x + dst_width < new_pmap_width
625 || dst_y + dst_height < new_pmap_height) 709 || dst_y + dst_height < new_pmap_height)
626 {
627 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);
628 }
629 } 711 }
630 712
631 /* put result on pixmap */ 713 /* put result on pixmap */
632 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 714 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); 715 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) 717 if (result != background && result != original_asim)
636 destroy_asimage (&result); 718 destroy_asimage (&result);
637 719
638 XFreeGC (target->dpy, gc); 720 XFreeGC (target->dpy, gc);
639 TIMING_TEST_PRINT_RESULT (asim); 721 TIMING_TEST_PRINT_RESULT (asim);
640 }
641 722
723 ret = true;
724 }
725
726 if (background)
727 destroy_asimage (&background);
728
642 return true; 729 return ret;
643} 730}
644# 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 */
645 871
646bool 872bool
647bgPixmap_t::set_file (const char *file) 873bgPixmap_t::set_file (const char *file)
648{ 874{
649 char *f;
650
651 assert (file != NULL); 875 assert (file);
652 876
653 if (*file != '\0') 877 if (*file)
654 { 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
655# ifdef HAVE_AFTERIMAGE 888# ifdef HAVE_AFTERIMAGE
656 if (target->asimman == NULL) 889 if (!target->asimman)
657 target->asimman = create_generic_imageman (target->rs[Rs_path]); 890 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); 891 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
660 else 892 if (original_asim)
661 { 893 have_image = true;
662 size_t len = f - file; 894 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 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
671 } 903 }
904
672 return false; 905 return false;
673} 906}
674 907
675# endif /* BG_IMAGE_FROM_FILE */ 908# endif /* BG_IMAGE_FROM_FILE */
676 909
… …
681 if (!(flags & isTransparent)) 914 if (!(flags & isTransparent))
682 { 915 {
683 flags |= isTransparent; 916 flags |= isTransparent;
684 return true; 917 return true;
685 } 918 }
919
686 return false; 920 return false;
687} 921}
688 922
689bool 923bool
690bgPixmap_t::set_blur_radius (const char *geom) 924bgPixmap_t::set_blur_radius (const char *geom)
… …
692 int changed = 0; 926 int changed = 0;
693 unsigned int hr, vr; 927 unsigned int hr, vr;
694 int junk; 928 int junk;
695 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 929 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
696 930
697 if (!(geom_flags&WidthValue)) 931 if (!(geom_flags & WidthValue))
698 hr = 1; 932 hr = 1;
699 if (!(geom_flags&HeightValue)) 933 if (!(geom_flags & HeightValue))
700 vr = hr; 934 vr = hr;
701 935
702 if (h_blurRadius != hr) 936 if (h_blurRadius != hr)
703 { 937 {
704 ++changed; 938 ++changed;
… …
714 if (v_blurRadius == 0 && h_blurRadius == 0) 948 if (v_blurRadius == 0 && h_blurRadius == 0)
715 flags &= ~blurNeeded; 949 flags &= ~blurNeeded;
716 else 950 else
717 flags |= blurNeeded; 951 flags |= blurNeeded;
718 952
719 return (changed>0); 953 return (changed > 0);
720} 954}
721 955
722static inline unsigned long 956static inline unsigned long
723compute_tint_shade_flags (rxvt_color *tint, int shade) 957compute_tint_shade_flags (rxvt_color *tint, int shade)
724{ 958{
… …
741 flags |= bgPixmap_t::tintNeeded; 975 flags |= bgPixmap_t::tintNeeded;
742 else if (tint) 976 else if (tint)
743 { 977 {
744 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 978 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
745 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 979 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
746 { 980 {
747 flags |= bgPixmap_t::tintNeeded; 981 flags |= bgPixmap_t::tintNeeded;
748 } 982 }
749 } 983 }
750 984
751 if (flags & bgPixmap_t::tintNeeded) 985 if (flags & bgPixmap_t::tintNeeded)
752 { 986 {
753 if (flags & bgPixmap_t::tintWholesome) 987 if (flags & bgPixmap_t::tintWholesome)
… …
771 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1005 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
772 tint = new_tint; 1006 tint = new_tint;
773 flags = (flags & ~tintFlags) | new_flags | tintSet; 1007 flags = (flags & ~tintFlags) | new_flags | tintSet;
774 return true; 1008 return true;
775 } 1009 }
1010
776 return false; 1011 return false;
777} 1012}
778 1013
779bool 1014bool
780bgPixmap_t::unset_tint () 1015bgPixmap_t::unset_tint ()
781{ 1016{
782 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1017 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
783 1018
784 if (new_flags != (flags & tintFlags)) 1019 if (new_flags != (flags & tintFlags))
785 { 1020 {
786 flags = (flags&~tintFlags)|new_flags; 1021 flags = (flags & ~tintFlags) | new_flags;
787 return true; 1022 return true;
788 } 1023 }
1024
789 return false; 1025 return false;
790} 1026}
791 1027
792bool 1028bool
793bgPixmap_t::set_shade (const char *shade_str) 1029bgPixmap_t::set_shade (const char *shade_str)
794{ 1030{
795 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1031 int new_shade = (shade_str) ? atoi (shade_str) : 0;
796 1032
797 if (new_shade < 0 && new_shade > -100) 1033 if (new_shade < 0 && new_shade > -100)
798 new_shade = 200 - (100 + new_shade); 1034 new_shade = 200 - (100 + new_shade);
799 else if (new_shade == 100) 1035 else if (new_shade == 100)
800 new_shade = 0; 1036 new_shade = 0;
801 1037
802 if (new_shade != shade) 1038 if (new_shade != shade)
803 { 1039 {
804 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);
805 shade = new_shade; 1041 shade = new_shade;
806 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1042 flags = (flags & (~tintFlags | tintSet)) | new_flags;
807 return true; 1043 return true;
808 } 1044 }
1045
809 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;
810} 1158}
811 1159
812/* make_transparency_pixmap() 1160/* make_transparency_pixmap()
813 * 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
814 * 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
… …
820 unsigned long result = 0; 1168 unsigned long result = 0;
821 1169
822 if (target == NULL) 1170 if (target == NULL)
823 return 0; 1171 return 0;
824 1172
825 /* 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
826 * be always up-to-date, so let's use it : 1174 * be always up-to-date, so let's use it :
827 */ 1175 */
828 Window root = target->display->root; 1176 Window root = target->display->root;
829 int screen = target->display->screen; 1177 int screen = target->display->screen;
830 Display *dpy = target->dpy; 1178 Display *dpy = target->dpy;
… …
843 if (sx + window_width <= 0 || sy + window_height <= 0 1191 if (sx + window_width <= 0 || sy + window_height <= 0
844 || sx >= root_width || sy >= root_height) 1192 || sx >= root_width || sy >= root_height)
845 return 0; 1193 return 0;
846 1194
847 if (root_pixmap != None) 1195 if (root_pixmap != None)
1196 {
848 {/* 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 : */
849 int junk; 1198 int junk;
850 unsigned int ujunk; 1199 unsigned int ujunk;
851 /* root pixmap may be bad - allow a error */ 1200 /* root pixmap may be bad - allow a error */
852 target->allowedxerror = -1; 1201 target->allowedxerror = -1;
853 1202
… …
862 1211
863 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1212 if (tiled_root_pmap == None) /* something really bad happened - abort */
864 return 0; 1213 return 0;
865 1214
866 if (root_pixmap == None) 1215 if (root_pixmap == None)
1216 {
867 { /* use tricks to obtain the root background image :*/ 1217 /* use tricks to obtain the root background image :*/
868 /* we want to create Overrideredirect window overlapping out window 1218 /* we want to create Overrideredirect window overlapping out window
869 with background type of Parent Relative and then grab it */ 1219 with background type of Parent Relative and then grab it */
870 XSetWindowAttributes attr; 1220 XSetWindowAttributes attr;
871 Window src; 1221 Window src;
872 bool success = false; 1222 bool success = false;
873 1223
874 attr.background_pixmap = ParentRelative; 1224 attr.background_pixmap = ParentRelative;
875 attr.backing_store = Always; 1225 attr.backing_store = Always;
876 attr.event_mask = ExposureMask; 1226 attr.event_mask = ExposureMask;
877 attr.override_redirect = True; 1227 attr.override_redirect = True;
878 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1228 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
879 CopyFromParent, CopyFromParent, CopyFromParent, 1229 CopyFromParent, CopyFromParent, CopyFromParent,
880 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1230 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
881 &attr); 1231 &attr);
882 1232
883 if (src != None) 1233 if (src != None)
… …
887 XGrabServer (dpy); 1237 XGrabServer (dpy);
888 XMapRaised (dpy, src); 1238 XMapRaised (dpy, src);
889 XSync (dpy, False); 1239 XSync (dpy, False);
890 1240
891 /* XSync should get window where it's properly exposed, 1241 /* 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 : */ 1242 * but to be on the safe side - let's check for the actual event to arrive : */
893 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1243 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
894 ++ev_count; 1244 ++ev_count;
895 1245
896 if (ev_count > 0); 1246 if (ev_count > 0);
1247 {
897 { /* hooray! - we can grab the image! */ 1248 /* hooray! - we can grab the image! */
898 gc = XCreateGC (dpy, root, 0, NULL); 1249 gc = XCreateGC (dpy, root, 0, NULL);
899 if (gc) 1250 if (gc)
900 { 1251 {
901 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);
902 success = true; 1253 success = true;
903 } 1254 }
904 } 1255 }
1256
905 XDestroyWindow (dpy, src); 1257 XDestroyWindow (dpy, src);
906 XUngrabServer (dpy); 1258 XUngrabServer (dpy);
907 //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);
908 } 1260 }
909 1261
910 if (!success) 1262 if (!success)
911 { 1263 {
912 XFreePixmap (dpy, tiled_root_pmap); 1264 XFreePixmap (dpy, tiled_root_pmap);
913 tiled_root_pmap = None; 1265 tiled_root_pmap = None;
914 } 1266 }
915 else 1267 else
916 result |= transpPmapTiled; 1268 result |= transpPmapTiled;
917 } 1269 }
918 else 1270 else
1271 {
919 {/* strightforward pixmap copy */ 1272 /* straightforward pixmap copy */
920 gcv.tile = root_pixmap; 1273 gcv.tile = root_pixmap;
921 gcv.fill_style = FillTiled; 1274 gcv.fill_style = FillTiled;
922 1275
923 while (sx < 0) sx += (int)root_width; 1276 while (sx < 0) sx += (int)root_width;
924 while (sy < 0) sy += (int)root_height; 1277 while (sy < 0) sy += (int)root_height;
… …
939 { 1292 {
940 if (!need_client_side_rendering ()) 1293 if (!need_client_side_rendering ())
941 { 1294 {
942 if ((flags & tintNeeded)) 1295 if ((flags & tintNeeded))
943 { 1296 {
944 if (flags & tintWholesome) 1297 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; 1298 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 } 1299 }
1042 } /* server side rendering completed */ 1300 } /* server side rendering completed */
1043 1301
1044 if (pixmap) 1302 if (pixmap)
1045 XFreePixmap (dpy, pixmap); 1303 XFreePixmap (dpy, pixmap);
1046 1304
… …
1059} 1317}
1060 1318
1061bool 1319bool
1062bgPixmap_t::set_root_pixmap () 1320bgPixmap_t::set_root_pixmap ()
1063{ 1321{
1064 Pixmap new_root_pixmap = None;
1065
1066 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1322 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1067 if (new_root_pixmap == None) 1323 if (new_root_pixmap == None)
1068 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1324 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1069 1325
1070 if (new_root_pixmap != root_pixmap) 1326 if (new_root_pixmap != root_pixmap)
1071 { 1327 {
1072 root_pixmap = new_root_pixmap; 1328 root_pixmap = new_root_pixmap;
1073 return true; 1329 return true;
1074 } 1330 }
1331
1075 return false; 1332 return false;
1076} 1333}
1077# endif /* ENABLE_TRANSPARENCY */ 1334# endif /* ENABLE_TRANSPARENCY */
1078 1335
1079# ifndef HAVE_AFTERIMAGE 1336# ifndef HAVE_AFTERIMAGE
1080static 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);
1081# endif 1338# endif
1082
1083 1339
1084bool 1340bool
1085bgPixmap_t::render () 1341bgPixmap_t::render ()
1086{ 1342{
1087 unsigned long background_flags = 0; 1343 unsigned long background_flags = 0;
… …
1089 if (target == NULL) 1345 if (target == NULL)
1090 return false; 1346 return false;
1091 1347
1092 TIMING_TEST_START (tp); 1348 TIMING_TEST_START (tp);
1093 1349
1094 invalidate(); 1350 invalidate ();
1095# ifdef ENABLE_TRANSPARENCY 1351# ifdef ENABLE_TRANSPARENCY
1096 if (flags & isTransparent) 1352 if (flags & isTransparent)
1097 { 1353 {
1098 /* we need to re-generate transparency pixmap in that case ! */ 1354 /* we need to re-generate transparency pixmap in that case ! */
1099 background_flags = make_transparency_pixmap (); 1355 background_flags = make_transparency_pixmap ();
1100 if (background_flags == 0) 1356 if (background_flags == 0)
1101 return false; 1357 return false;
1102 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1358 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1103 && pmap_depth == target->depth) 1359 && pmap_depth == target->depth)
1104 flags = flags & ~isInvalid; 1360 flags = flags & ~isInvalid;
1105 } 1361 }
1106# endif 1362# endif
1107 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
1108 XImage *result = NULL; 1373 XImage *result = NULL;
1109# ifdef HAVE_AFTERIMAGE 1374
1110 if (original_asim 1375 if (background_flags && (flags & isInvalid))
1111 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1376 {
1377 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1112 { 1378 }
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 1379
1118# 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 !!! */
1119 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1386 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 { 1387 {
1166 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1388 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1167 if (flags & tintSet) 1389 if (flags & tintSet)
1168 tint.get (c); 1390 tint.get (c);
1169 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1391 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1170 } 1392 }
1171 } 1393# endif
1172# endif /* HAVE_AFTERIMAGE */
1173 1394
1174 if (result != NULL)
1175 {
1176 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1395 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1396
1177 if (gc) 1397 if (gc)
1178 { 1398 {
1179 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1399 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1180 { 1400 {
1181 XFreePixmap (target->dpy, pixmap); 1401 XFreePixmap (target->dpy, pixmap);
1182 pixmap = None; 1402 pixmap = None;
1183 } 1403 }
1404
1184 if (pixmap == None) 1405 if (pixmap == None)
1185 { 1406 {
1186 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);
1187 pmap_width = result->width; 1408 pmap_width = result->width;
1188 pmap_height = result->height; 1409 pmap_height = result->height;
1189 pmap_depth = target->depth; 1410 pmap_depth = target->depth;
1190 } 1411 }
1412
1191 if (pmap_depth != result->depth) 1413 if (pmap_depth != result->depth)
1414 {
1192 { /* Bad Match error will ensue ! stupid X !!!! */ 1415 /* Bad Match error will ensue ! stupid X !!!! */
1193 if( result->depth == 24 && pmap_depth == 32) 1416 if (result->depth == 24 && pmap_depth == 32)
1194 result->depth = 32; 1417 result->depth = 32;
1195 else if( result->depth == 32 && pmap_depth == 24) 1418 else if (result->depth == 32 && pmap_depth == 24)
1196 result->depth = 24; 1419 result->depth = 24;
1197 else 1420 else
1198 { 1421 {
1199 /* TODO: implement image recoding */ 1422 /* TODO: implement image recoding */
1200 } 1423 }
1201 } 1424 }
1425
1202 if (pmap_depth == result->depth) 1426 if (pmap_depth == result->depth)
1203 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
1204 XFreeGC (target->dpy, gc); 1429 XFreeGC (target->dpy, gc);
1205 flags = flags & ~isInvalid; 1430 flags = flags & ~isInvalid;
1206 } 1431 }
1432
1207 XDestroyImage (result); 1433 XDestroyImage (result);
1208 } 1434 }
1209 1435
1210 if (flags & isInvalid) 1436 if (flags & isInvalid)
1211 { 1437 {
1212 if (pixmap != None) 1438 if (pixmap != None)
… …
1215 pixmap = None; 1441 pixmap = None;
1216 } 1442 }
1217 } 1443 }
1218 1444
1219 apply (); 1445 apply ();
1446
1447 XSync (target->dpy, False);
1448 valid_since = ev::now ();
1220 1449
1221 TIMING_TEST_PRINT_RESULT (tp); 1450 TIMING_TEST_PRINT_RESULT (tp);
1222 1451
1223 return true; 1452 return true;
1224} 1453}
… …
1233# ifdef ENABLE_TRANSPARENCY 1462# ifdef ENABLE_TRANSPARENCY
1234 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1463 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1235# endif 1464# endif
1236 return true; 1465 return true;
1237 } 1466 }
1467
1238 return false; 1468 return false;
1239} 1469}
1240 1470
1241void 1471void
1242bgPixmap_t::apply() 1472bgPixmap_t::apply ()
1243{ 1473{
1244 if (target) 1474 if (target)
1245 { 1475 {
1246 flags &= ~isVtOrigin; 1476 flags &= ~isVtOrigin;
1477
1247 if (pixmap != None) 1478 if (pixmap != None)
1479 {
1248 { /* set target's background to pixmap */ 1480 /* set target's background to pixmap */
1249# ifdef ENABLE_TRANSPARENCY 1481# ifdef ENABLE_TRANSPARENCY
1250 if (flags & isTransparent) 1482 if (flags & isTransparent)
1251 { 1483 {
1252 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1484 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1253 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1485 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1254# if HAVE_SCROLLBARS 1486
1255 if (target->scrollBar.win) 1487 if (target->scrollBar.win)
1256 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1488 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1257# endif
1258 } 1489 }
1259 else 1490 else
1260# endif 1491# endif
1261 { 1492 {
1262 flags |= isVtOrigin; 1493 flags |= isVtOrigin;
1263 /* force old pixmap dereference in case it was transparent before :*/ 1494 /* force old pixmap dereference in case it was transparent before :*/
1264 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1495 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1265 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1496 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1266 /* do we also need to set scrollbar's background here ? */ 1497 /* do we also need to set scrollbar's background here ? */
1267# if HAVE_SCROLLBARS 1498
1268 if (target->scrollBar.win) 1499 if (target->scrollBar.win)
1269 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1500 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1270# endif
1271 } 1501 }
1272 } 1502 }
1273 else 1503 else
1504 {
1274 { /* set target background to a pixel */ 1505 /* set target background to a pixel */
1275 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1506 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1276 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1507 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1277 /* do we also need to set scrollbar's background here ? */ 1508 /* do we also need to set scrollbar's background here ? */
1278# if HAVE_SCROLLBARS
1279 if (target->scrollBar.win) 1509 if (target->scrollBar.win)
1280 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1510 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1281# endif
1282 } 1511 }
1512
1283 /* 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
1284 scr_touch or we get a great deal of flicker otherwise: */ 1514 scr_touch or we get a great deal of flicker otherwise: */
1285 XClearWindow (target->dpy, target->parent[0]); 1515 XClearWindow (target->dpy, target->parent[0]);
1286 1516
1287# if HAVE_SCROLLBARS 1517 if (target->scrollBar.state && target->scrollBar.win)
1288 if (target->scrollBar.win)
1289 { 1518 {
1290 target->scrollBar.setIdle (); 1519 target->scrollBar.state = STATE_IDLE;
1291 target->scrollbar_show (0); 1520 target->scrollBar.show (0);
1292 } 1521 }
1293# endif
1294 1522
1295 target->want_refresh = 1; 1523 target->want_refresh = 1;
1296 flags |= hasChanged; 1524 flags |= hasChanged;
1297 } 1525 }
1298} 1526}
… …
1303/* taken from aterm-0.4.2 */ 1531/* taken from aterm-0.4.2 */
1304 1532
1305typedef uint32_t RUINT32T; 1533typedef uint32_t RUINT32T;
1306 1534
1307static void 1535static void
1308ShadeXImage(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)
1309{ 1537{
1310 int sh_r, sh_g, sh_b; 1538 int sh_r, sh_g, sh_b;
1311 RUINT32T mask_r, mask_g, mask_b; 1539 RUINT32T mask_r, mask_g, mask_b;
1312 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1540 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1313 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