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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines