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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines