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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines