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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines