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.1 by sasha, Wed Sep 12 20:29:24 2007 UTC vs.
Revision 1.55 by sf-exg, Thu Sep 2 15:48:10 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines