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.131 by sf-exg, Mon Jan 10 19:58:24 2011 UTC vs.
Revision 1.162 by sf-exg, Thu Aug 11 12:27:26 2011 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) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it> 8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37#define DO_TIMING_TEST 0
38
39#if DO_TIMING_TEST
40# include <sys/time.h>
41#define TIMING_TEST_START(id) \
42 struct timeval timing_test_##id##_stv; \
43 gettimeofday (&timing_test_##id##_stv, NULL);
44
45#define TIMING_TEST_PRINT_RESULT(id) \
46 do { \
47 struct timeval tv; \
48 gettimeofday (&tv, NULL); \
49 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
50 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
51 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
52 } while (0)
53
54#else
55#define TIMING_TEST_START(id) do {} while (0)
56#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
57#endif
58
59/* 37/*
60 * Pixmap geometry string interpretation : 38 * Pixmap geometry string interpretation :
61 * Each geometry string contains zero or one scale/position 39 * Each geometry string contains zero or one scale/position
62 * adjustment and may optionally be followed by a colon and one or more 40 * adjustment and may optionally be followed by a colon and one or more
63 * colon-delimited pixmap operations. 41 * colon-delimited pixmap operations.
68 * W and H are percentages of the terminal window size. 46 * W and H are percentages of the terminal window size.
69 * X and Y are also percentages; e.g., +50+50 centers 47 * X and Y are also percentages; e.g., +50+50 centers
70 * the image in the window. 48 * the image in the window.
71 * 49 *
72 * Pixmap Operations : (should be prepended by a colon) 50 * Pixmap Operations : (should be prepended by a colon)
73 * tile Tile image. Scaling/position modifiers above will affect
74 * the tile size and origin.
75 * propscale When scaling, scale proportionally. That is, maintain the
76 * proper aspect ratio for the image. Any portion of the
77 * background not covered by the image is filled with the
78 * current background color.
79 * hscale Scale horizontally, tile vertically ?
80 * vscale Tile horizontally, scale vertically ?
81 * scale Scale both up and down
82 * auto Same as 100x100+50+50
83 */ 51 */
84 52
85#ifdef HAVE_BG_PIXMAP 53#ifdef HAVE_BG_PIXMAP
86bgPixmap_t::bgPixmap_t ()
87{
88 // this is basically redundant as bgPixmap_t is only used in
89 // zero_initialised-derived structs
90#ifdef HAVE_AFTERIMAGE
91 original_asim = NULL;
92#endif
93#ifdef HAVE_PIXBUF
94 pixbuf = NULL;
95#endif
96#ifdef BG_IMAGE_FROM_FILE
97 have_image = false;
98 h_scale = v_scale = 0;
99 h_align = v_align = 0;
100#endif
101#ifdef ENABLE_TRANSPARENCY
102 shade = 100;
103#endif
104 flags = 0;
105 pixmap = None;
106 valid_since = invalid_since = 0;
107 target = 0;
108 target_x = target_y = 0;
109}
110
111void 54void
112bgPixmap_t::destroy () 55rxvt_term::bg_destroy ()
113{ 56{
114#ifdef HAVE_AFTERIMAGE 57#ifdef HAVE_AFTERIMAGE
115 if (original_asim) 58 if (original_asim)
116 safe_asimage_destroy (original_asim); 59 safe_asimage_destroy (original_asim);
60 if (asv)
61 destroy_asvisual (asv, 0);
62 if (asimman)
63 destroy_image_manager (asimman, 0);
117#endif 64#endif
118 65
119#ifdef HAVE_PIXBUF 66#ifdef HAVE_PIXBUF
120 if (pixbuf) 67 if (pixbuf)
121 g_object_unref (pixbuf); 68 g_object_unref (pixbuf);
122#endif 69#endif
123 70
124 if (pixmap && target) 71 if (bg_pixmap)
125 XFreePixmap (target->dpy, pixmap); 72 XFreePixmap (dpy, bg_pixmap);
126} 73}
127 74
128bool 75bool
129bgPixmap_t::set_position (int x, int y) 76rxvt_term::bg_set_position (int x, int y)
130{ 77{
131 78
132 if (target_x != x 79 if (target_x != x
133 || target_y != y) 80 || target_y != y)
134 { 81 {
138 } 85 }
139 return false; 86 return false;
140} 87}
141 88
142bool 89bool
143bgPixmap_t::window_size_sensitive () 90rxvt_term::bg_window_size_sensitive ()
144{ 91{
145# ifdef ENABLE_TRANSPARENCY 92# ifdef ENABLE_TRANSPARENCY
146 if (flags & isTransparent) 93 if (bg_flags & BG_IS_TRANSPARENT)
147 return true; 94 return true;
148# endif 95# endif
149 96
150# ifdef BG_IMAGE_FROM_FILE 97# ifdef BG_IMAGE_FROM_FILE
151 if (have_image) 98 if (bg_flags & BG_IS_FROM_FILE)
152 { 99 {
153 if (flags & sizeSensitive) 100 if (bg_flags & BG_IS_SIZE_SENSITIVE)
154 return true; 101 return true;
155 } 102 }
156# endif 103# endif
157 104
158 return false; 105 return false;
159} 106}
160 107
161bool 108bool
162bgPixmap_t::window_position_sensitive () 109rxvt_term::bg_window_position_sensitive ()
163{ 110{
164# ifdef ENABLE_TRANSPARENCY 111# ifdef ENABLE_TRANSPARENCY
165 if (flags & isTransparent) 112 if (bg_flags & BG_IS_TRANSPARENT)
166 return true; 113 return true;
167# endif 114# endif
168 115
169# ifdef BG_IMAGE_FROM_FILE 116# ifdef BG_IMAGE_FROM_FILE
170 if (have_image) 117 if (bg_flags & BG_IS_FROM_FILE)
171 { 118 {
172 if (flags & rootAlign) 119 if (bg_flags & BG_ROOT_ALIGN)
173 return true; 120 return true;
174 } 121 }
175# endif 122# endif
176 123
177 return false;
178}
179
180bool bgPixmap_t::need_client_side_rendering ()
181{
182# ifdef HAVE_AFTERIMAGE
183 if (original_asim)
184 return true;
185# endif
186 return false; 124 return false;
187} 125}
188 126
189# ifdef BG_IMAGE_FROM_FILE 127# ifdef BG_IMAGE_FROM_FILE
190static inline bool 128static inline bool
253 dst_size = target_size - dst_pos; 191 dst_size = target_size - dst_pos;
254 return src_pos; 192 return src_pos;
255} 193}
256 194
257bool 195bool
258bgPixmap_t::set_geometry (const char *geom, bool update) 196rxvt_term::bg_set_geometry (const char *geom, bool update)
259{ 197{
260 bool changed = false; 198 bool changed = false;
261 int geom_flags = 0; 199 int geom_flags = 0;
262 int x = 0, y = 0; 200 int x = 0, y = 0;
263 unsigned int w = 0, h = 0; 201 unsigned int w = 0, h = 0;
264 unsigned int n; 202 unsigned int n;
265 unsigned long new_flags = (flags & (~geometryFlags)); 203 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
266 const char *ops; 204 const char *ops;
267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
268 205
269 if (geom == NULL) 206 if (geom == NULL)
270 return false; 207 return false;
271 208
272 char str[MAXLEN_GEOM]; 209 char str[256];
273 210
274 ops = strchr (geom, ':'); 211 ops = strchr (geom, ':');
275 if (ops == NULL) 212 if (ops == NULL)
276 n = strlen (geom); 213 n = strlen (geom);
277 else 214 else
278 n = ops - geom; 215 n = ops - geom;
279 216
280 if (n >= MAXLEN_GEOM) 217 if (n >= sizeof (str))
281 return false; 218 return false;
282 219
283 memcpy (str, geom, n); 220 memcpy (str, geom, n);
284 str[n] = '\0'; 221 str[n] = '\0';
285 rxvt_strtrim (str); 222 rxvt_strtrim (str);
311 { 248 {
312 char **arr = rxvt_strsplit (':', ops + 1); 249 char **arr = rxvt_strsplit (':', ops + 1);
313 250
314 for (int i = 0; arr[i]; i++) 251 for (int i = 0; arr[i]; i++)
315 { 252 {
316# define CHECK_GEOM_OPS(op_str) (strcasecmp (arr[i], (op_str)) == 0) 253 if (!strcasecmp (arr[i], "style=tiled"))
317 if (CHECK_GEOM_OPS ("tile")) 254 {
255 new_flags = BG_TILE;
256 w = h = noScale;
257 x = y = 0;
258 geom_flags = WidthValue|HeightValue|XValue|YValue;
318 { 259 }
260 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
261 {
262 new_flags = BG_PROP_SCALE;
263 x = y = centerAlign;
264 geom_flags = XValue|YValue;
265 }
266 else if (!strcasecmp (arr[i], "style=stretched"))
267 {
268 new_flags = 0;
269 w = h = windowScale;
270 geom_flags = WidthValue|HeightValue;
271 }
272 else if (!strcasecmp (arr[i], "style=centered"))
273 {
274 new_flags = 0;
275 w = h = noScale;
276 x = y = centerAlign;
277 geom_flags = WidthValue|HeightValue|XValue|YValue;
278 }
279 else if (!strcasecmp (arr[i], "style=root-tiled"))
280 {
281 new_flags = BG_TILE|BG_ROOT_ALIGN;
282 w = h = noScale;
283 geom_flags = WidthValue|HeightValue;
284 }
285 else if (!strcasecmp (arr[i], "op=tile"))
286 new_flags |= BG_TILE;
287 else if (!strcasecmp (arr[i], "op=pscale"))
288 new_flags |= BG_PROP_SCALE;
289 else if (!strcasecmp (arr[i], "op=root"))
290 new_flags |= BG_ROOT_ALIGN;
291
292 // deprecated
293 else if (!strcasecmp (arr[i], "tile"))
294 {
295 new_flags |= BG_TILE;
319 w = h = noScale; 296 w = h = noScale;
320 geom_flags |= WidthValue|HeightValue; 297 geom_flags |= WidthValue|HeightValue;
321 } 298 }
322 else if (CHECK_GEOM_OPS ("propscale")) 299 else if (!strcasecmp (arr[i], "propscale"))
323 {
324 new_flags |= propScale;
325 } 300 {
326 else if (CHECK_GEOM_OPS ("hscale")) 301 new_flags |= BG_PROP_SCALE;
327 { 302 }
303 else if (!strcasecmp (arr[i], "hscale"))
304 {
305 new_flags |= BG_TILE;
328 if (w == 0) w = windowScale; 306 w = windowScale;
329
330 h = noScale; 307 h = noScale;
331 geom_flags |= WidthValue|HeightValue; 308 geom_flags |= WidthValue|HeightValue;
332 } 309 }
333 else if (CHECK_GEOM_OPS ("vscale")) 310 else if (!strcasecmp (arr[i], "vscale"))
334 { 311 {
312 new_flags |= BG_TILE;
335 if (h == 0) h = windowScale; 313 h = windowScale;
336
337 w = noScale; 314 w = noScale;
338 geom_flags |= WidthValue|HeightValue; 315 geom_flags |= WidthValue|HeightValue;
339 } 316 }
340 else if (CHECK_GEOM_OPS ("scale")) 317 else if (!strcasecmp (arr[i], "scale"))
341 { 318 {
342 if (h == 0) h = windowScale;
343 if (w == 0) w = windowScale; 319 w = h = windowScale;
344
345 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
346 } 321 }
347 else if (CHECK_GEOM_OPS ("auto")) 322 else if (!strcasecmp (arr[i], "auto"))
348 { 323 {
349 w = h = windowScale; 324 w = h = windowScale;
350 x = y = centerAlign; 325 x = y = centerAlign;
351 geom_flags |= WidthValue|HeightValue|XValue|YValue; 326 geom_flags |= WidthValue|HeightValue|XValue|YValue;
352 } 327 }
353 else if (CHECK_GEOM_OPS ("root")) 328 else if (!strcasecmp (arr[i], "root"))
354 { 329 {
355 new_flags |= rootAlign; 330 new_flags |= BG_TILE|BG_ROOT_ALIGN;
356 w = h = noScale; 331 w = h = noScale;
357 geom_flags |= WidthValue|HeightValue; 332 geom_flags |= WidthValue|HeightValue;
358 } 333 }
359# undef CHECK_GEOM_OPS
360 } /* done parsing ops */ 334 } /* done parsing ops */
361 335
362 rxvt_free_strsplit (arr); 336 rxvt_free_strsplit (arr);
363 } 337 }
364 338
365 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 339 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
366 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 340 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
367 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 341 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
368 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 342 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
369 343
370 if (new_flags != flags) 344 if (new_flags != bg_flags)
371 { 345 {
372 flags = new_flags; 346 bg_flags = new_flags;
373 changed = true; 347 changed = true;
374 } 348 }
375 349
376 return changed; 350 return changed;
377} 351}
378 352
379void 353void
380bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 354rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
381{ 355{
382 int target_width = target->szHint.width; 356 int target_width = szHint.width;
383 int target_height = target->szHint.height; 357 int target_height = szHint.height;
384 358
385 if (flags & propScale) 359 if (bg_flags & BG_PROP_SCALE)
386 { 360 {
387 float scale = (float)target_width / image_width; 361 float scale = (float)target_width / image_width;
388 min_it (scale, (float)target_height / image_height); 362 min_it (scale, (float)target_height / image_height);
389 w = image_width * scale + 0.5; 363 w = image_width * scale + 0.5;
390 h = image_height * scale + 0.5; 364 h = image_height * scale + 0.5;
396 } 370 }
397 371
398 if (!w) w = image_width; 372 if (!w) w = image_width;
399 if (!h) h = image_height; 373 if (!h) h = image_height;
400 374
401 if (flags & rootAlign) 375 if (bg_flags & BG_ROOT_ALIGN)
402 { 376 {
403 x = -target_x; 377 x = -target_x;
404 y = -target_y; 378 y = -target_y;
405 } 379 }
406 else 380 else
407 { 381 {
408 x = make_align_position (h_align, target_width, w); 382 x = make_align_position (h_align, target_width, w);
409 y = make_align_position (v_align, target_height, h); 383 y = make_align_position (v_align, target_height, h);
410 } 384 }
411 385
412 flags &= ~sizeSensitive; 386 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
413 if ((flags & propScale) || h_scale || v_scale 387 if (!(bg_flags & BG_TILE)
388 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale
414 || (!(flags & rootAlign) && (h_align || v_align)) 389 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
415 || w > target_width || h > target_height) 390 || w > target_width || h > target_height)
416 flags |= sizeSensitive; 391 bg_flags |= BG_IS_SIZE_SENSITIVE;
417} 392}
418 393
419# ifdef HAVE_AFTERIMAGE 394# ifdef HAVE_AFTERIMAGE
420bool 395bool
421bgPixmap_t::render_image (unsigned long background_flags) 396rxvt_term::render_image (unsigned long tr_flags)
422{ 397{
423 if (target == NULL)
424 return false;
425
426 target->init_asv (); 398 init_asv ();
427 399
428 ASImage *background = NULL; 400 ASImage *background = NULL;
429 ARGB32 background_tint = TINT_LEAVE_SAME; 401 ARGB32 background_tint = TINT_LEAVE_SAME;
430 402
431# ifdef ENABLE_TRANSPARENCY 403# ifdef ENABLE_TRANSPARENCY
432 if (background_flags) 404 if (tr_flags)
433 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 405 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
434 406
435 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 407 if (tr_flags & BG_NEEDS_TINT)
436 { 408 {
437 ShadingInfo as_shade; 409 ShadingInfo as_shade;
438 as_shade.shading = shade; 410 as_shade.shading = shade;
439 411
440 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 412 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
441 if (flags & tintSet) 413 if (bg_flags & BG_TINT_SET)
442 tint.get (c); 414 tint.get (c);
443 as_shade.tintColor.red = c.r; 415 as_shade.tintColor.red = c.r;
444 as_shade.tintColor.green = c.g; 416 as_shade.tintColor.green = c.g;
445 as_shade.tintColor.blue = c.b; 417 as_shade.tintColor.blue = c.b;
446 418
447 background_tint = shading2tint32 (&as_shade); 419 background_tint = shading2tint32 (&as_shade);
448 } 420 }
449 421
450 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL) 422 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
451 { 423 {
452 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 424 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
453 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 425 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
454 100, ASIMAGE_QUALITY_DEFAULT); 426 100, ASIMAGE_QUALITY_DEFAULT);
455 if (tmp) 427 if (tmp)
456 { 428 {
457 destroy_asimage (&background); 429 destroy_asimage (&background);
460 } 432 }
461# endif 433# endif
462 434
463 ASImage *result = 0; 435 ASImage *result = 0;
464 436
465 int target_width = target->szHint.width; 437 int target_width = szHint.width;
466 int target_height = target->szHint.height; 438 int target_height = szHint.height;
467 int new_pmap_width = target_width; 439 int new_pmap_width = target_width;
468 int new_pmap_height = target_height; 440 int new_pmap_height = target_height;
469 441
470 int x = 0; 442 int x = 0;
471 int y = 0; 443 int y = 0;
474 446
475 if (original_asim) 447 if (original_asim)
476 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 448 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
477 449
478 if (!original_asim 450 if (!original_asim
479 || (!(flags & rootAlign) 451 || (!(bg_flags & BG_ROOT_ALIGN)
480 && (x >= target_width 452 && (x >= target_width
481 || y >= target_height 453 || y >= target_height
482 || (x + w <= 0) 454 || (x + w <= 0)
483 || (y + h <= 0)))) 455 || (y + h <= 0))))
484 { 456 {
488 new_pmap_height = background->height; 460 new_pmap_height = background->height;
489 result = background; 461 result = background;
490 462
491 if (background_tint != TINT_LEAVE_SAME) 463 if (background_tint != TINT_LEAVE_SAME)
492 { 464 {
493 ASImage *tmp = tile_asimage (target->asv, background, 0, 0, 465 ASImage *tmp = tile_asimage (asv, background, 0, 0,
494 target_width, target_height, background_tint, 466 target_width, target_height, background_tint,
495 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 467 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
496 if (tmp) 468 if (tmp)
497 result = tmp; 469 result = tmp;
498 } 470 }
505 result = original_asim; 477 result = original_asim;
506 478
507 if ((w != original_asim->width) 479 if ((w != original_asim->width)
508 || (h != original_asim->height)) 480 || (h != original_asim->height))
509 { 481 {
510 result = scale_asimage (target->asv, original_asim, 482 result = scale_asimage (asv, original_asim,
511 w, h, 483 w, h,
512 background ? ASA_ASImage : ASA_XImage, 484 background ? ASA_ASImage : ASA_XImage,
513 100, ASIMAGE_QUALITY_DEFAULT); 485 100, ASIMAGE_QUALITY_DEFAULT);
514 } 486 }
515 487
516 if (background == NULL) 488 if (background == NULL)
517 { 489 {
518 if (h_scale == 0 || v_scale == 0) 490 if (bg_flags & BG_TILE)
519 { 491 {
520 /* if tiling - pixmap has to be sized exactly as the image, 492 /* if tiling - pixmap has to be sized exactly as the image,
521 but there is no need to make it bigger than the window! */ 493 but there is no need to make it bigger than the window! */
522 new_pmap_width = min (result->width, target_width); 494 new_pmap_width = min (result->width, target_width);
523 new_pmap_height = min (result->height, target_height); 495 new_pmap_height = min (result->height, target_height);
524 496
525 /* we also need to tile our image in both directions */ 497 /* we also need to tile our image in both directions */
526 ASImage *tmp = tile_asimage (target->asv, result, 498 ASImage *tmp = tile_asimage (asv, result,
527 (int)result->width - x, 499 (int)result->width - x,
528 (int)result->height - y, 500 (int)result->height - y,
529 new_pmap_width, 501 new_pmap_width,
530 new_pmap_height, 502 new_pmap_height,
531 TINT_LEAVE_SAME, ASA_XImage, 503 TINT_LEAVE_SAME, ASA_XImage,
548 layers[0].clip_width = target_width; 520 layers[0].clip_width = target_width;
549 layers[0].clip_height = target_height; 521 layers[0].clip_height = target_height;
550 layers[0].tint = background_tint; 522 layers[0].tint = background_tint;
551 layers[1].im = result; 523 layers[1].im = result;
552 524
553 if (h_scale == 0 || v_scale == 0) 525 if (bg_flags & BG_TILE)
554 { 526 {
555 /* tile horizontally */ 527 /* tile horizontally */
556 while (x > 0) x -= (int)result->width; 528 while (x > 0) x -= (int)result->width;
557 layers[1].dst_x = x; 529 layers[1].dst_x = x;
558 layers[1].clip_width = result->width+target_width; 530 layers[1].clip_width = result->width+target_width;
562 /* clip horizontally */ 534 /* clip horizontally */
563 layers[1].dst_x = x; 535 layers[1].dst_x = x;
564 layers[1].clip_width = result->width; 536 layers[1].clip_width = result->width;
565 } 537 }
566 538
567 if (h_scale == 0 || v_scale == 0) 539 if (bg_flags & BG_TILE)
568 { 540 {
569 while (y > 0) y -= (int)result->height; 541 while (y > 0) y -= (int)result->height;
570 layers[1].dst_y = y; 542 layers[1].dst_y = y;
571 layers[1].clip_height = result->height + target_height; 543 layers[1].clip_height = result->height + target_height;
572 } 544 }
574 { 546 {
575 layers[1].dst_y = y; 547 layers[1].dst_y = y;
576 layers[1].clip_height = result->height; 548 layers[1].clip_height = result->height;
577 } 549 }
578 550
579 if (target->rs[Rs_blendtype]) 551 if (rs[Rs_blendtype])
580 { 552 {
581 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 553 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
582 if (layers[1].merge_scanlines == NULL) 554 if (layers[1].merge_scanlines == NULL)
583 layers[1].merge_scanlines = alphablend_scanlines; 555 layers[1].merge_scanlines = alphablend_scanlines;
584 } 556 }
585 557
586 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 558 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
587 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 559 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
588 560
589 if (tmp) 561 if (tmp)
590 { 562 {
591 if (result != original_asim) 563 if (result != original_asim)
604 { 576 {
605 XGCValues gcv; 577 XGCValues gcv;
606 GC gc; 578 GC gc;
607 579
608 /* create Pixmap */ 580 /* create Pixmap */
609 if (pixmap == None 581 if (bg_pixmap == None
610 || pmap_width != new_pmap_width 582 || bg_pmap_width != new_pmap_width
611 || pmap_height != new_pmap_height 583 || bg_pmap_height != new_pmap_height)
612 || pmap_depth != target->depth)
613 { 584 {
614 if (pixmap) 585 if (bg_pixmap)
615 XFreePixmap (target->dpy, pixmap); 586 XFreePixmap (dpy, bg_pixmap);
616 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 587 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
617 pmap_width = new_pmap_width; 588 bg_pmap_width = new_pmap_width;
618 pmap_height = new_pmap_height; 589 bg_pmap_height = new_pmap_height;
619 pmap_depth = target->depth;
620 } 590 }
621 /* fill with background color (if result's not completely overlapping it) */ 591 /* fill with background color (if result's not completely overlapping it) */
622 gcv.foreground = target->pix_colors[Color_bg]; 592 gcv.foreground = pix_colors[Color_bg];
623 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 593 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
624 594
625 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 595 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
626 int dst_width = result->width, dst_height = result->height; 596 int dst_width = result->width, dst_height = result->height;
627 if (background == NULL) 597 if (background == NULL)
628 { 598 {
629 if (!(h_scale == 0 || v_scale == 0)) 599 if (!(bg_flags & BG_TILE))
630 { 600 {
631 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 601 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
632 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 602 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
633 } 603 }
634 604
635 if (dst_x > 0 || dst_y > 0 605 if (dst_x > 0 || dst_y > 0
636 || dst_x + dst_width < new_pmap_width 606 || dst_x + dst_width < new_pmap_width
637 || dst_y + dst_height < new_pmap_height) 607 || dst_y + dst_height < new_pmap_height)
638 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 608 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
639 } 609 }
640 610
641 /* put result on pixmap */ 611 /* put result on pixmap */
642 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 612 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
643 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 613 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
644 614
645 if (result != background && result != original_asim) 615 if (result != background && result != original_asim)
646 destroy_asimage (&result); 616 destroy_asimage (&result);
647 617
648 XFreeGC (target->dpy, gc); 618 XFreeGC (dpy, gc);
649 619
650 ret = true; 620 ret = true;
651 } 621 }
652 622
653 if (background) 623 if (background)
657} 627}
658# endif /* HAVE_AFTERIMAGE */ 628# endif /* HAVE_AFTERIMAGE */
659 629
660# ifdef HAVE_PIXBUF 630# ifdef HAVE_PIXBUF
661bool 631bool
662bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 632rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
663 int src_x, int src_y, int dst_x, int dst_y, 633 int src_x, int src_y, int dst_x, int dst_y,
664 unsigned int width, unsigned int height) 634 unsigned int width, unsigned int height)
665{ 635{
666 XImage *ximage; 636 XImage *ximage;
667 char *data, *line; 637 char *data, *line;
668 int bytes_per_pixel; 638 int bytes_per_pixel;
669 int width_r, width_g, width_b; 639 int width_r, width_g, width_b;
670 int sh_r, sh_g, sh_b; 640 int sh_r, sh_g, sh_b;
671 int rowstride; 641 int rowstride;
672 int channels; 642 int channels;
673 unsigned char *row; 643 unsigned char *row;
674 Visual *visual = target->visual;
675 int depth = target->depth;
676 644
677 if (visual->c_class != TrueColor) 645 if (visual->c_class != TrueColor)
678 return false; 646 return false;
679 647
680 if (depth == 24 || depth == 32) 648 if (depth == 24 || depth == 32)
682 else if (depth == 15 || depth == 16) 650 else if (depth == 15 || depth == 16)
683 bytes_per_pixel = 2; 651 bytes_per_pixel = 2;
684 else 652 else
685 return false; 653 return false;
686 654
687 width_r = rxvt_popcount (visual->red_mask); 655 width_r = ecb_popcount32 (visual->red_mask);
688 width_g = rxvt_popcount (visual->green_mask); 656 width_g = ecb_popcount32 (visual->green_mask);
689 width_b = rxvt_popcount (visual->blue_mask); 657 width_b = ecb_popcount32 (visual->blue_mask);
690 658
691 if (width_r > 8 || width_g > 8 || width_b > 8) 659 if (width_r > 8 || width_g > 8 || width_b > 8)
692 return false; 660 return false;
693 661
694 sh_r = rxvt_ctz (visual->red_mask); 662 sh_r = ecb_ctz32 (visual->red_mask);
695 sh_g = rxvt_ctz (visual->green_mask); 663 sh_g = ecb_ctz32 (visual->green_mask);
696 sh_b = rxvt_ctz (visual->blue_mask); 664 sh_b = ecb_ctz32 (visual->blue_mask);
697 665
698 if (width > INT_MAX / height / bytes_per_pixel) 666 if (width > INT_MAX / height / bytes_per_pixel)
699 return false; 667 return false;
700 668
701 data = (char *)malloc (width * height * bytes_per_pixel); 669 data = (char *)malloc (width * height * bytes_per_pixel);
702 if (!data) 670 if (!data)
703 return false; 671 return false;
704 672
705 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data, 673 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
706 width, height, bytes_per_pixel * 8, 0); 674 width, height, bytes_per_pixel * 8, 0);
707 if (!ximage) 675 if (!ximage)
708 { 676 {
709 free (data); 677 free (data);
710 return false; 678 return false;
711 } 679 }
712 680
713 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 681 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
714 682
715 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 683 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
716 channels = gdk_pixbuf_get_n_channels (pixbuf); 684 channels = gdk_pixbuf_get_n_channels (pixbuf);
717 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 685 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
718 line = data; 686 line = data;
736 704
737 row += rowstride; 705 row += rowstride;
738 line += ximage->bytes_per_line; 706 line += ximage->bytes_per_line;
739 } 707 }
740 708
741 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height); 709 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
742 XDestroyImage (ximage); 710 XDestroyImage (ximage);
743 return true; 711 return true;
744} 712}
745 713
746bool 714bool
747bgPixmap_t::render_image (unsigned long background_flags) 715rxvt_term::render_image (unsigned long tr_flags)
748{ 716{
749 if (target == NULL)
750 return false;
751
752 if (!pixbuf) 717 if (!pixbuf)
753 return false; 718 return false;
754 719
755 if (background_flags 720 if (tr_flags
756 && !(flags & HAS_RENDER)) 721 && !(bg_flags & BG_HAS_RENDER))
757 return false; 722 return false;
758 723
759 GdkPixbuf *result; 724 GdkPixbuf *result;
760 725
761 int image_width = gdk_pixbuf_get_width (pixbuf); 726 int image_width = gdk_pixbuf_get_width (pixbuf);
762 int image_height = gdk_pixbuf_get_height (pixbuf); 727 int image_height = gdk_pixbuf_get_height (pixbuf);
763 728
764 int target_width = target->szHint.width; 729 int target_width = szHint.width;
765 int target_height = target->szHint.height; 730 int target_height = szHint.height;
766 int new_pmap_width = target_width; 731 int new_pmap_width = target_width;
767 int new_pmap_height = target_height; 732 int new_pmap_height = target_height;
768 733
769 int x = 0; 734 int x = 0;
770 int y = 0; 735 int y = 0;
771 int w = 0; 736 int w = 0;
772 int h = 0; 737 int h = 0;
773 738
774 get_image_geometry (image_width, image_height, w, h, x, y); 739 get_image_geometry (image_width, image_height, w, h, x, y);
775 740
776 if (!(flags & rootAlign) 741 if (!(bg_flags & BG_ROOT_ALIGN)
777 && (x >= target_width 742 && (x >= target_width
778 || y >= target_height 743 || y >= target_height
779 || (x + w <= 0) 744 || (x + w <= 0)
780 || (y + h <= 0))) 745 || (y + h <= 0)))
781 return false; 746 return false;
788 result = gdk_pixbuf_scale_simple (pixbuf, 753 result = gdk_pixbuf_scale_simple (pixbuf,
789 w, h, 754 w, h,
790 GDK_INTERP_BILINEAR); 755 GDK_INTERP_BILINEAR);
791 } 756 }
792 757
758 if (!result)
759 return false;
760
793 bool ret = false; 761 bool ret = false;
794 762
795 if (result)
796 {
797 XGCValues gcv; 763 XGCValues gcv;
798 GC gc; 764 GC gc;
799 Pixmap root_pmap; 765 Pixmap root_pmap;
800 766
801 image_width = gdk_pixbuf_get_width (result); 767 image_width = gdk_pixbuf_get_width (result);
802 image_height = gdk_pixbuf_get_height (result); 768 image_height = gdk_pixbuf_get_height (result);
803 769
804 if (background_flags) 770 if (tr_flags)
805 { 771 {
806 root_pmap = pixmap; 772 root_pmap = bg_pixmap;
807 pixmap = None; 773 bg_pixmap = None;
774 }
775 else
776 {
777 if (bg_flags & BG_TILE)
808 } 778 {
809 else
810 {
811 if (h_scale == 0 || v_scale == 0)
812 {
813 new_pmap_width = min (image_width, target_width); 779 new_pmap_width = min (image_width, target_width);
814 new_pmap_height = min (image_height, target_height); 780 new_pmap_height = min (image_height, target_height);
815 } 781 }
816 } 782 }
817 783
818 if (pixmap == None 784 if (bg_pixmap == None
819 || pmap_width != new_pmap_width 785 || bg_pmap_width != new_pmap_width
820 || pmap_height != new_pmap_height 786 || bg_pmap_height != new_pmap_height)
821 || pmap_depth != target->depth) 787 {
822 {
823 if (pixmap) 788 if (bg_pixmap)
824 XFreePixmap (target->dpy, pixmap); 789 XFreePixmap (dpy, bg_pixmap);
825 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 790 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
826 pmap_width = new_pmap_width; 791 bg_pmap_width = new_pmap_width;
827 pmap_height = new_pmap_height; 792 bg_pmap_height = new_pmap_height;
828 pmap_depth = target->depth; 793 }
794
795 gcv.foreground = pix_colors[Color_bg];
796 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
797
798 if (gc)
799 {
800 if (bg_flags & BG_TILE)
829 } 801 {
830
831 gcv.foreground = target->pix_colors[Color_bg];
832 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
833
834 if (h_scale == 0 || v_scale == 0)
835 {
836 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 802 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
837 pixbuf_to_pixmap (result, tile, gc, 803 pixbuf_to_pixmap (result, tile, gc,
838 0, 0, 804 0, 0,
839 0, 0, 805 0, 0,
840 image_width, image_height); 806 image_width, image_height);
841 807
842 gcv.tile = tile; 808 gcv.tile = tile;
843 gcv.fill_style = FillTiled; 809 gcv.fill_style = FillTiled;
844 gcv.ts_x_origin = x; 810 gcv.ts_x_origin = x;
845 gcv.ts_y_origin = y; 811 gcv.ts_y_origin = y;
846 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 812 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
847 813
848 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 814 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
849 XFreePixmap (target->dpy, tile); 815 XFreePixmap (dpy, tile);
850 } 816 }
851 else 817 else
852 { 818 {
853 int src_x, src_y, dst_x, dst_y; 819 int src_x, src_y, dst_x, dst_y;
854 int dst_width, dst_height; 820 int dst_width, dst_height;
857 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 823 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
858 824
859 if (dst_x > 0 || dst_y > 0 825 if (dst_x > 0 || dst_y > 0
860 || dst_x + dst_width < new_pmap_width 826 || dst_x + dst_width < new_pmap_width
861 || dst_y + dst_height < new_pmap_height) 827 || dst_y + dst_height < new_pmap_height)
862 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 828 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
863 829
864 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 830 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
865 pixbuf_to_pixmap (result, pixmap, gc, 831 pixbuf_to_pixmap (result, bg_pixmap, gc,
866 src_x, src_y, 832 src_x, src_y,
867 dst_x, dst_y, 833 dst_x, dst_y,
868 dst_width, dst_height); 834 dst_width, dst_height);
869 } 835 }
870 836
871#if XRENDER 837#if XRENDER
872 if (background_flags) 838 if (tr_flags)
873 { 839 {
874 Display *dpy = target->dpy;
875 XRenderPictureAttributes pa; 840 XRenderPictureAttributes pa;
876 841
877 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual); 842 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual);
878 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 843 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
879 844
880 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 845 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
881 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 846 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);
882 847
883 pa.repeat = True; 848 pa.repeat = True;
884 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8); 849 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
885 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); 850 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
886 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); 851 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
887 XFreePixmap (dpy, mask_pmap); 852 XFreePixmap (dpy, mask_pmap);
888 853
889 if (src && dst && mask)
890 {
891 XRenderColor mask_c; 854 XRenderColor mask_c;
892 855
893 mask_c.alpha = 0x8000; 856 mask_c.alpha = 0x8000;
894 mask_c.red = 0; 857 mask_c.red = 0;
895 mask_c.green = 0; 858 mask_c.green = 0;
896 mask_c.blue = 0; 859 mask_c.blue = 0;
897 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 860 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
898 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 861 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
899 }
900 862
901 XRenderFreePicture (dpy, src); 863 XRenderFreePicture (dpy, src);
902 XRenderFreePicture (dpy, dst); 864 XRenderFreePicture (dpy, dst);
903 XRenderFreePicture (dpy, mask); 865 XRenderFreePicture (dpy, mask);
904
905 XFreePixmap (dpy, root_pmap);
906 } 866 }
907#endif 867#endif
908 868
909 if (result != pixbuf)
910 g_object_unref (result);
911
912 XFreeGC (target->dpy, gc); 869 XFreeGC (dpy, gc);
913 870
914 ret = true; 871 ret = true;
915 } 872 }
916 873
874 if (result != pixbuf)
875 g_object_unref (result);
876
877 if (tr_flags)
878 XFreePixmap (dpy, root_pmap);
879
917 return ret; 880 return ret;
918} 881}
919# endif /* HAVE_PIXBUF */ 882# endif /* HAVE_PIXBUF */
920 883
921bool 884bool
922bgPixmap_t::set_file (const char *file) 885rxvt_term::bg_set_file (const char *file)
923{ 886{
924 if (!file || !*file) 887 if (!file || !*file)
925 return false; 888 return false;
926 889
927 if (const char *p = strchr (file, ';')) 890 if (const char *p = strchr (file, ';'))
932 f[len] = '\0'; 895 f[len] = '\0';
933 file = f; 896 file = f;
934 } 897 }
935 898
936# ifdef HAVE_AFTERIMAGE 899# ifdef HAVE_AFTERIMAGE
937 if (!target->asimman) 900 if (!asimman)
938 target->asimman = create_generic_imageman (target->rs[Rs_path]); 901 asimman = create_generic_imageman (rs[Rs_path]);
939 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 902 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
940 if (image) 903 if (image)
941 { 904 {
942 if (original_asim) 905 if (original_asim)
943 safe_asimage_destroy (original_asim); 906 safe_asimage_destroy (original_asim);
944 original_asim = image; 907 original_asim = image;
945 have_image = true; 908 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
946 return true; 909 return true;
947 } 910 }
948# endif 911# endif
949 912
950# ifdef HAVE_PIXBUF 913# ifdef HAVE_PIXBUF
952 if (image) 915 if (image)
953 { 916 {
954 if (pixbuf) 917 if (pixbuf)
955 g_object_unref (pixbuf); 918 g_object_unref (pixbuf);
956 pixbuf = image; 919 pixbuf = image;
957 have_image = true; 920 bg_flags |= BG_IS_FROM_FILE;
958 return true; 921 return true;
959 } 922 }
960# endif 923# endif
961 924
962 return false; 925 return false;
964 927
965# endif /* BG_IMAGE_FROM_FILE */ 928# endif /* BG_IMAGE_FROM_FILE */
966 929
967# ifdef ENABLE_TRANSPARENCY 930# ifdef ENABLE_TRANSPARENCY
968bool 931bool
969bgPixmap_t::set_transparent () 932rxvt_term::bg_set_transparent ()
970{ 933{
971 if (!(flags & isTransparent)) 934 if (!(bg_flags & BG_IS_TRANSPARENT))
972 { 935 {
973 flags |= isTransparent; 936 bg_flags |= BG_IS_TRANSPARENT;
974 return true; 937 return true;
975 } 938 }
976 939
977 return false; 940 return false;
978} 941}
979 942
980bool 943bool
981bgPixmap_t::set_blur_radius (const char *geom) 944rxvt_term::bg_set_blur (const char *geom)
982{ 945{
983 bool changed = false; 946 bool changed = false;
984 unsigned int hr, vr; 947 unsigned int hr, vr;
985 int junk; 948 int junk;
986 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 949 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
1004 changed = true; 967 changed = true;
1005 v_blurRadius = vr; 968 v_blurRadius = vr;
1006 } 969 }
1007 970
1008 if (v_blurRadius == 0 && h_blurRadius == 0) 971 if (v_blurRadius == 0 && h_blurRadius == 0)
1009 flags &= ~blurNeeded; 972 bg_flags &= ~BG_NEEDS_BLUR;
1010 else 973 else
1011 flags |= blurNeeded; 974 bg_flags |= BG_NEEDS_BLUR;
1012 975
1013 return changed; 976 return changed;
1014} 977}
1015 978
1016static inline unsigned long 979void
1017compute_tint_shade_flags (rxvt_color *tint, int shade) 980rxvt_term::set_tint_shade_flags ()
1018{ 981{
1019 unsigned long flags = 0;
1020 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 982 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1021 bool has_shade = shade != 100; 983 bool has_shade = shade != 100;
1022 984
1023 if (tint) 985 bg_flags &= ~BG_TINT_FLAGS;
986
987 if (bg_flags & BG_TINT_SET)
1024 { 988 {
1025 tint->get (c); 989 tint.get (c);
1026# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
1027 if (!has_shade 990 if (!has_shade
1028 && IS_COMPONENT_WHOLESOME (c.r) 991 && (c.r <= 0x00ff || c.r >= 0xff00)
1029 && IS_COMPONENT_WHOLESOME (c.g) 992 && (c.g <= 0x00ff || c.g >= 0xff00)
1030 && IS_COMPONENT_WHOLESOME (c.b)) 993 && (c.b <= 0x00ff || c.b >= 0xff00))
1031 flags |= bgPixmap_t::tintWholesome; 994 bg_flags |= BG_TINT_BITAND;
1032# undef IS_COMPONENT_WHOLESOME
1033 } 995 }
1034 996
1035 if (has_shade || tint) 997 if (has_shade || (bg_flags & BG_TINT_SET))
1036 flags |= bgPixmap_t::tintNeeded; 998 bg_flags |= BG_NEEDS_TINT;
1037
1038 return flags;
1039} 999}
1040 1000
1041bool 1001bool
1042bgPixmap_t::set_tint (rxvt_color &new_tint) 1002rxvt_term::bg_set_tint (rxvt_color &new_tint)
1043{ 1003{
1044 if (!(flags & tintSet) || tint != new_tint) 1004 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
1045 { 1005 {
1046 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1047 tint = new_tint; 1006 tint = new_tint;
1048 flags = (flags & ~tintFlags) | new_flags | tintSet; 1007 bg_flags |= BG_TINT_SET;
1008 set_tint_shade_flags ();
1049 return true; 1009 return true;
1050 } 1010 }
1051 1011
1052 return false; 1012 return false;
1053} 1013}
1054 1014
1055bool 1015bool
1056bgPixmap_t::set_shade (const char *shade_str) 1016rxvt_term::bg_set_shade (const char *shade_str)
1057{ 1017{
1058 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1018 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1059 1019
1060 clamp_it (new_shade, -100, 200); 1020 clamp_it (new_shade, -100, 200);
1061 if (new_shade < 0) 1021 if (new_shade < 0)
1062 new_shade = 200 - (100 + new_shade); 1022 new_shade = 200 - (100 + new_shade);
1063 1023
1064 if (new_shade != shade) 1024 if (new_shade != shade)
1065 { 1025 {
1066 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1067 shade = new_shade; 1026 shade = new_shade;
1068 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1027 set_tint_shade_flags ();
1069 return true; 1028 return true;
1070 } 1029 }
1071 1030
1072 return false; 1031 return false;
1073} 1032}
1094 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1053 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1095} 1054}
1096#endif 1055#endif
1097 1056
1098bool 1057bool
1099bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1058rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1100{ 1059{
1101 bool ret = false; 1060 bool ret = false;
1102#if XRENDER 1061#if XRENDER
1103 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1062 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1104 double *kernel = (double *)malloc (size * sizeof (double)); 1063 double *kernel = (double *)malloc (size * sizeof (double));
1105 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1064 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1106 1065
1107 Display *dpy = target->dpy;
1108 XRenderPictureAttributes pa; 1066 XRenderPictureAttributes pa;
1109 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1067 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1110 1068
1111 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1069 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1112 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1070 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1113 1071
1114 if (kernel && params && src && dst) 1072 if (kernel && params)
1115 { 1073 {
1116 if (h_blurRadius) 1074 if (h_blurRadius)
1117 { 1075 {
1118 size = h_blurRadius * 2 + 1; 1076 size = h_blurRadius * 2 + 1;
1119 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1077 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1132 1090
1133 if (v_blurRadius) 1091 if (v_blurRadius)
1134 { 1092 {
1135 size = v_blurRadius * 2 + 1; 1093 size = v_blurRadius * 2 + 1;
1136 get_gaussian_kernel (v_blurRadius, size, kernel, params); 1094 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1137 swap (params[0], params[1]); 1095 ::swap (params[0], params[1]);
1138 1096
1139 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1097 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1140 XRenderComposite (dpy, 1098 XRenderComposite (dpy,
1141 PictOpSrc, 1099 PictOpSrc,
1142 src, 1100 src,
1158#endif 1116#endif
1159 return ret; 1117 return ret;
1160} 1118}
1161 1119
1162bool 1120bool
1163bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1121rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1164{ 1122{
1165 Display *dpy = target->dpy;
1166 bool ret = false; 1123 bool ret = false;
1167 1124
1168 if (flags & tintWholesome) 1125 if (bg_flags & BG_TINT_BITAND)
1169 { 1126 {
1170 XGCValues gcv; 1127 XGCValues gcv;
1171 GC gc; 1128 GC gc;
1172 1129
1173 /* In this case we can tint image server-side getting significant 1130 /* In this case we can tint image server-side getting significant
1185 } 1142 }
1186 } 1143 }
1187 else 1144 else
1188 { 1145 {
1189# if XRENDER 1146# if XRENDER
1190 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1147 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1191 1148
1192 if (flags & tintSet) 1149 if (bg_flags & BG_TINT_SET)
1193 tint.get (c); 1150 tint.get (c);
1194 1151
1195 if (shade <= 100) 1152 if (shade <= 100)
1196 { 1153 {
1197 c.r = (c.r * shade) / 100; 1154 c.r = c.r * shade / 100;
1198 c.g = (c.g * shade) / 100; 1155 c.g = c.g * shade / 100;
1199 c.b = (c.b * shade) / 100; 1156 c.b = c.b * shade / 100;
1200 } 1157 }
1201 else 1158 else
1202 { 1159 {
1203 c.r = (c.r * (200 - shade)) / 100; 1160 c.r = c.r * (200 - shade) / 100;
1204 c.g = (c.g * (200 - shade)) / 100; 1161 c.g = c.g * (200 - shade) / 100;
1205 c.b = (c.b * (200 - shade)) / 100; 1162 c.b = c.b * (200 - shade) / 100;
1206 } 1163 }
1207 1164
1208 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1165 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1209 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1166 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1210 XRenderPictureAttributes pa; 1167 XRenderPictureAttributes pa;
1217 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1174 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1218 XFreePixmap (dpy, overlay_pmap); 1175 XFreePixmap (dpy, overlay_pmap);
1219 1176
1220 pa.component_alpha = True; 1177 pa.component_alpha = True;
1221 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1178 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1222 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1179 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1223 XFreePixmap (dpy, mask_pmap); 1180 XFreePixmap (dpy, mask_pmap);
1224 1181
1225 if (mask_pic && overlay_pic && back_pic)
1226 {
1227 XRenderColor mask_c; 1182 XRenderColor mask_c;
1228 1183
1229 mask_c.red = mask_c.green = mask_c.blue = 0;
1230 mask_c.alpha = 0xffff; 1184 mask_c.alpha = 0xffff;
1185 mask_c.red =
1186 mask_c.green =
1187 mask_c.blue = 0;
1188 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1189
1190 mask_c.alpha = 0;
1191 mask_c.red = 0xffff - c.r;
1192 mask_c.green = 0xffff - c.g;
1193 mask_c.blue = 0xffff - c.b;
1194 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1195 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1196
1197 if (shade > 100)
1198 {
1199 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1200 mask_c.alpha = 0;
1231 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1201 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1232 1202
1233 mask_c.alpha = 0;
1234 mask_c.red = 0xffff - c.r;
1235 mask_c.green = 0xffff - c.g;
1236 mask_c.blue = 0xffff - c.b;
1237 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1238 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1239
1240 if (shade > 100)
1241 {
1242 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1243 mask_c.alpha = 0;
1244 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1245
1246 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1203 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1247 } 1204 }
1248 1205
1249 ret = true; 1206 ret = true;
1250 }
1251 1207
1252 XRenderFreePicture (dpy, mask_pic); 1208 XRenderFreePicture (dpy, mask_pic);
1253 XRenderFreePicture (dpy, overlay_pic); 1209 XRenderFreePicture (dpy, overlay_pic);
1254 XRenderFreePicture (dpy, back_pic); 1210 XRenderFreePicture (dpy, back_pic);
1255# endif 1211# endif
1256 } 1212 }
1257 1213
1258 return ret; 1214 return ret;
1259} 1215}
1260 1216
1261/* make_transparency_pixmap() 1217/*
1262 * Builds a pixmap of the same size as the terminal window that contains 1218 * Builds a pixmap of the same size as the terminal window that contains
1263 * the tiled portion of the root pixmap that is supposed to be covered by 1219 * the tiled portion of the root pixmap that is supposed to be covered by
1264 * our window. 1220 * our window.
1265 */ 1221 */
1266unsigned long 1222unsigned long
1267bgPixmap_t::make_transparency_pixmap () 1223rxvt_term::make_transparency_pixmap ()
1268{ 1224{
1269 unsigned long result = 0; 1225 unsigned long result = 0;
1270
1271 if (target == NULL)
1272 return 0;
1273 1226
1274 /* root dimensions may change from call to call - but Display structure should 1227 /* root dimensions may change from call to call - but Display structure should
1275 * be always up-to-date, so let's use it : 1228 * be always up-to-date, so let's use it :
1276 */ 1229 */
1277 int screen = target->display->screen; 1230 int screen = display->screen;
1278 Display *dpy = target->dpy;
1279 int root_depth = DefaultDepth (dpy, screen); 1231 int root_depth = DefaultDepth (dpy, screen);
1280 int root_width = DisplayWidth (dpy, screen); 1232 int root_width = DisplayWidth (dpy, screen);
1281 int root_height = DisplayHeight (dpy, screen); 1233 int root_height = DisplayHeight (dpy, screen);
1282 unsigned int root_pmap_width, root_pmap_height; 1234 unsigned int root_pmap_width, root_pmap_height;
1283 int window_width = target->szHint.width; 1235 int window_width = szHint.width;
1284 int window_height = target->szHint.height; 1236 int window_height = szHint.height;
1285 int sx, sy; 1237 int sx, sy;
1286 XGCValues gcv; 1238 XGCValues gcv;
1287 GC gc; 1239 GC gc;
1288 1240
1289 sx = target_x; 1241 sx = target_x;
1299 { 1251 {
1300 Window wdummy; 1252 Window wdummy;
1301 int idummy; 1253 int idummy;
1302 unsigned int udummy; 1254 unsigned int udummy;
1303 1255
1304 target->allowedxerror = -1; 1256 allowedxerror = -1;
1305 1257
1306 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy)) 1258 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1307 root_pixmap = None; 1259 root_pixmap = None;
1308 1260
1309 target->allowedxerror = 0; 1261 allowedxerror = 0;
1310 } 1262 }
1311 1263
1312 Pixmap recoded_root_pmap = root_pixmap; 1264 Pixmap recoded_root_pmap = root_pixmap;
1313 1265
1314 if (root_pixmap != None && root_depth != target->depth) 1266 if (root_pixmap != None && root_depth != depth)
1315 { 1267 {
1316#if XRENDER 1268#if XRENDER
1317 if (flags & HAS_RENDER) 1269 if (bg_flags & BG_HAS_RENDER)
1318 { 1270 {
1271 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1272
1319 XRenderPictureAttributes pa; 1273 XRenderPictureAttributes pa;
1320 1274
1321 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1275 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1322 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1276 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1323 1277
1324 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1325 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 1278 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1326 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1279 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1327 1280
1328 if (src && dst)
1329 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1281 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1330 else
1331 {
1332 XFreePixmap (dpy, recoded_root_pmap);
1333 root_pixmap = None;
1334 }
1335 1282
1336 XRenderFreePicture (dpy, src); 1283 XRenderFreePicture (dpy, src);
1337 XRenderFreePicture (dpy, dst); 1284 XRenderFreePicture (dpy, dst);
1338 } 1285 }
1339 else 1286 else
1340#endif 1287#endif
1341 root_pixmap = None; 1288 recoded_root_pmap = None;
1342 } 1289 }
1343 1290
1344 if (root_pixmap == None) 1291 if (recoded_root_pmap == None)
1345 return 0; 1292 return 0;
1346 1293
1294 if (bg_pixmap == None
1295 || bg_pmap_width != window_width
1296 || bg_pmap_height != window_height)
1297 {
1298 if (bg_pixmap)
1299 XFreePixmap (dpy, bg_pixmap);
1347 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth); 1300 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1348 1301 bg_pmap_width = window_width;
1349 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1302 bg_pmap_height = window_height;
1350 return 0; 1303 }
1351 1304
1352 /* straightforward pixmap copy */ 1305 /* straightforward pixmap copy */
1353 while (sx < 0) sx += (int)root_width; 1306 while (sx < 0) sx += root_width;
1354 while (sy < 0) sy += (int)root_height; 1307 while (sy < 0) sy += root_height;
1355 1308
1356 gcv.tile = recoded_root_pmap; 1309 gcv.tile = recoded_root_pmap;
1357 gcv.fill_style = FillTiled; 1310 gcv.fill_style = FillTiled;
1358 gcv.ts_x_origin = -sx; 1311 gcv.ts_x_origin = -sx;
1359 gcv.ts_y_origin = -sy; 1312 gcv.ts_y_origin = -sy;
1360 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1313 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1361 1314
1362 if (gc) 1315 if (gc)
1363 { 1316 {
1364 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1317 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1365 result |= transpPmapTiled; 1318 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1366 XFreeGC (dpy, gc); 1319 XFreeGC (dpy, gc);
1367 1320
1368 if (!need_client_side_rendering ()) 1321 if (!(bg_flags & BG_CLIENT_RENDER))
1369 { 1322 {
1370 if ((flags & blurNeeded) 1323 if ((bg_flags & BG_NEEDS_BLUR)
1371 && (flags & HAS_RENDER_CONV)) 1324 && (bg_flags & BG_HAS_RENDER_CONV))
1372 {
1373 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1374 result |= transpPmapBlurred;
1375 } 1325 {
1376 if ((flags & tintNeeded) 1326 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1377 && (flags & (tintWholesome | HAS_RENDER))) 1327 result &= ~BG_NEEDS_BLUR;
1378 { 1328 }
1329 if ((bg_flags & BG_NEEDS_TINT)
1330 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1331 {
1379 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1332 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1380 result |= transpPmapTinted; 1333 result &= ~BG_NEEDS_TINT;
1381 } 1334 }
1382 } /* server side rendering completed */ 1335 } /* server side rendering completed */
1383
1384 if (pixmap)
1385 XFreePixmap (dpy, pixmap);
1386
1387 pixmap = tiled_root_pmap;
1388 pmap_width = window_width;
1389 pmap_height = window_height;
1390 pmap_depth = target->depth;
1391 } 1336 }
1392 else
1393 XFreePixmap (dpy, tiled_root_pmap);
1394 1337
1395 if (recoded_root_pmap != root_pixmap) 1338 if (recoded_root_pmap != root_pixmap)
1396 XFreePixmap (dpy, recoded_root_pmap); 1339 XFreePixmap (dpy, recoded_root_pmap);
1397 1340
1398 return result; 1341 return result;
1399} 1342}
1400 1343
1401void 1344void
1402bgPixmap_t::set_root_pixmap () 1345rxvt_term::bg_set_root_pixmap ()
1403{ 1346{
1404 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]); 1347 Pixmap new_root_pixmap = get_pixmap_property (xa[XA_XROOTPMAP_ID]);
1405 if (new_root_pixmap == None) 1348 if (new_root_pixmap == None)
1406 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]); 1349 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1407 1350
1408 root_pixmap = new_root_pixmap; 1351 root_pixmap = new_root_pixmap;
1409} 1352}
1410# endif /* ENABLE_TRANSPARENCY */ 1353# endif /* ENABLE_TRANSPARENCY */
1411 1354
1412#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1355#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1413static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c); 1356static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1414# endif 1357# endif
1415 1358
1416bool 1359bool
1417bgPixmap_t::render () 1360rxvt_term::bg_render ()
1418{ 1361{
1419 unsigned long background_flags = 0; 1362 unsigned long tr_flags = 0;
1420 1363
1421 if (target == NULL)
1422 return false;
1423
1424 invalidate (); 1364 bg_invalidate ();
1425# ifdef ENABLE_TRANSPARENCY 1365# ifdef ENABLE_TRANSPARENCY
1426 if (flags & isTransparent) 1366 if (bg_flags & BG_IS_TRANSPARENT)
1427 { 1367 {
1428 /* we need to re-generate transparency pixmap in that case ! */ 1368 /* we need to re-generate transparency pixmap in that case ! */
1429 background_flags = make_transparency_pixmap (); 1369 tr_flags = make_transparency_pixmap ();
1430 if (background_flags == 0) 1370 if (tr_flags == 0)
1431 return false; 1371 return false;
1432 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1372 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1433 flags &= ~isInvalid; 1373 bg_flags |= BG_IS_VALID;
1434 } 1374 }
1435# endif 1375# endif
1436 1376
1437# ifdef BG_IMAGE_FROM_FILE 1377# ifdef BG_IMAGE_FROM_FILE
1438 if (have_image 1378 if ((bg_flags & BG_IS_FROM_FILE)
1439 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1379 || (tr_flags & BG_EFFECTS_FLAGS))
1440 { 1380 {
1441 if (render_image (background_flags)) 1381 if (render_image (tr_flags))
1442 flags &= ~isInvalid; 1382 bg_flags |= BG_IS_VALID;
1443 } 1383 }
1444# endif 1384# endif
1445 1385
1446# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1386# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1447 XImage *result = NULL; 1387 XImage *result = NULL;
1448 1388
1449 if (background_flags && (flags & isInvalid)) 1389 if (tr_flags && !(bg_flags & BG_IS_VALID))
1450 { 1390 {
1451 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1391 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1452 } 1392 }
1453 1393
1454 if (result) 1394 if (result)
1455 { 1395 {
1456 /* our own client-side tinting */ 1396 /* our own client-side tinting */
1457 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1397 if (tr_flags & BG_NEEDS_TINT)
1458 { 1398 {
1459 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1399 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1460 if (flags & tintSet) 1400 if (bg_flags & BG_TINT_SET)
1461 tint.get (c); 1401 tint.get (c);
1462 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1402 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1463 } 1403 }
1464 1404
1465 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1405 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1466 1406
1467 if (gc) 1407 if (gc)
1468 { 1408 {
1469 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1409 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1470 1410
1471 XFreeGC (target->dpy, gc); 1411 XFreeGC (dpy, gc);
1472 flags &= ~isInvalid; 1412 bg_flags |= BG_IS_VALID;
1473 } 1413 }
1474 1414
1475 XDestroyImage (result); 1415 XDestroyImage (result);
1476 } 1416 }
1477# endif 1417# endif
1478 1418
1479 if (flags & isInvalid) 1419 if (!(bg_flags & BG_IS_VALID))
1480 { 1420 {
1481 if (pixmap != None) 1421 if (bg_pixmap != None)
1482 { 1422 {
1483 XFreePixmap (target->dpy, pixmap); 1423 XFreePixmap (dpy, bg_pixmap);
1484 pixmap = None; 1424 bg_pixmap = None;
1485 } 1425 }
1486 } 1426 }
1487 1427
1488 apply (); 1428 scr_recolour (false);
1429 bg_flags |= BG_NEEDS_REFRESH;
1489 1430
1490 valid_since = ev::now (); 1431 bg_valid_since = ev::now ();
1491 1432
1492 return true; 1433 return true;
1493} 1434}
1494 1435
1495void 1436void
1496bgPixmap_t::set_target (rxvt_term *new_target) 1437rxvt_term::bg_init ()
1497{ 1438{
1498 target = new_target; 1439#ifdef ENABLE_TRANSPARENCY
1440 shade = 100;
1441#endif
1499 1442
1500 flags &= ~(HAS_RENDER | HAS_RENDER_CONV); 1443 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1501#if XRENDER 1444#if XRENDER
1502 int major, minor; 1445 int major, minor;
1503 if (XRenderQueryVersion (target->dpy, &major, &minor)) 1446 if (XRenderQueryVersion (dpy, &major, &minor))
1504 flags |= HAS_RENDER; 1447 bg_flags |= BG_HAS_RENDER;
1505 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt); 1448 XFilters *filters = XRenderQueryFilters (dpy, vt);
1506 if (filters) 1449 if (filters)
1507 { 1450 {
1508 for (int i = 0; i < filters->nfilter; i++) 1451 for (int i = 0; i < filters->nfilter; i++)
1509 if (!strcmp (filters->filter[i], FilterConvolution)) 1452 if (!strcmp (filters->filter[i], FilterConvolution))
1510 flags |= HAS_RENDER_CONV; 1453 bg_flags |= BG_HAS_RENDER_CONV;
1511 1454
1512 XFree (filters); 1455 XFree (filters);
1513 } 1456 }
1514#endif 1457#endif
1515}
1516
1517void
1518bgPixmap_t::apply ()
1519{
1520 if (target == NULL)
1521 return;
1522
1523 if (pixmap != None)
1524 {
1525 /* set target's background to pixmap */
1526# ifdef ENABLE_TRANSPARENCY
1527 if (flags & isTransparent)
1528 {
1529 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1530 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1531
1532 if (target->scrollBar.win)
1533 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1534 }
1535 else
1536# endif
1537 {
1538 /* force old pixmap dereference in case it was transparent before :*/
1539 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1540 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1541 /* do we also need to set scrollbar's background here ? */
1542
1543 if (target->scrollBar.win)
1544 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1545 }
1546 }
1547 else
1548 {
1549 /* set target background to a pixel */
1550 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1551 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1552 /* do we also need to set scrollbar's background here ? */
1553 if (target->scrollBar.win)
1554 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1555 }
1556
1557 /* don't want Expose on the parent or vt. It is better to use
1558 scr_touch or we get a great deal of flicker otherwise: */
1559 XClearWindow (target->dpy, target->parent[0]);
1560
1561 if (target->scrollBar.state && target->scrollBar.win)
1562 {
1563 target->scrollBar.state = STATE_IDLE;
1564 target->scrollBar.show (0);
1565 }
1566
1567 target->want_refresh = 1;
1568 flags |= hasChanged;
1569} 1458}
1570 1459
1571#endif /* HAVE_BG_PIXMAP */ 1460#endif /* HAVE_BG_PIXMAP */
1572 1461
1573#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1462#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1580 uint32_t mask_r, mask_g, mask_b; 1469 uint32_t mask_r, mask_g, mask_b;
1581 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1470 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1582 rgba low; 1471 rgba low;
1583 rgba high; 1472 rgba high;
1584 int i; 1473 int i;
1585 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1474 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1586 1475
1587 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1476 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1588 1477
1589 /* for convenience */ 1478 /* for convenience */
1590 mask_r = visual->red_mask; 1479 mask_r = visual->red_mask;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines