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.134 by sf-exg, Tue Jan 11 11:04:39 2011 UTC vs.
Revision 1.162 by sf-exg, Thu Aug 11 12:27:26 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines