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

Diff Legend

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