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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines