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.123 by sf-exg, Tue Nov 23 08:37:37 2010 UTC vs.
Revision 1.160 by sf-exg, Thu Aug 11 08:37:17 2011 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines