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.11 by sasha, Wed Nov 14 22:25:41 2007 UTC vs.
Revision 1.20 by root, Mon Dec 24 06:51:37 2007 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) 1997 Carsten Haitzler <raster@zip.com.au>
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
10 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
11 * 8 *
12 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
… …
28#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
29 26
30#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
31 28
32#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h>
33#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
34 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv;\
35 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
36 34
37#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
… …
87 * scale Scale both up and down 85 * scale Scale both up and down
88 * auto Same as 100x100+50+50 86 * auto Same as 100x100+50+50
89 */ 87 */
90 88
91#ifdef HAVE_BG_PIXMAP 89#ifdef HAVE_BG_PIXMAP
92bgPixmap_t::bgPixmap_t() 90bgPixmap_t::bgPixmap_t ()
93{ 91{
94#ifdef HAVE_AFTERIMAGE 92#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 93 original_asim = NULL;
96#endif 94#endif
97#ifdef BG_IMAGE_FROM_FILE 95#ifdef BG_IMAGE_FROM_FILE
… …
100#endif 98#endif
101 flags = 0; 99 flags = 0;
102 pixmap = None; 100 pixmap = None;
103} 101}
104 102
105bgPixmap_t::~bgPixmap_t() 103void
104bgPixmap_t::destroy ()
106{ 105{
107#ifdef HAVE_AFTERIMAGE 106#ifdef HAVE_AFTERIMAGE
108 if (original_asim) 107 if (original_asim)
109 safe_asimage_destroy (original_asim); 108 safe_asimage_destroy (original_asim);
110#endif 109#endif
110
111 if (pixmap && target) 111 if (pixmap && target)
112 XFreePixmap (target->dpy, pixmap); 112 XFreePixmap (target->dpy, pixmap);
113} 113}
114 114
115bool 115bool
116bgPixmap_t::window_size_sensitive () 116bgPixmap_t::window_size_sensitive ()
117{ 117{
118# ifdef ENABLE_TRANSPARENCY
119 if (flags & isTransparent)
120 return true;
121# endif
122
118# ifdef BG_IMAGE_FROM_FILE 123# ifdef BG_IMAGE_FROM_FILE
119# ifdef HAVE_AFTERIMAGE 124# ifdef HAVE_AFTERIMAGE
120 if (original_asim != NULL) 125 if (original_asim != NULL)
121# endif 126# endif
122 { 127 {
123 if (h_scale != 0 || v_scale != 0 128 if (h_scale != 0 || v_scale != 0
124 || h_align != 0 || v_align != 0) 129 || h_align != 0 || v_align != 0)
125 return true; 130 return true;
126 } 131 }
127# endif 132# endif
133
134 return false;
135}
136
137bool
138bgPixmap_t::window_position_sensitive ()
139{
128# ifdef ENABLE_TRANSPARENCY 140# ifdef ENABLE_TRANSPARENCY
129 if (flags & isTransparent) 141 if (flags & isTransparent)
130 return true; 142 return true;
131# endif 143# endif
144
145# ifdef BG_IMAGE_FROM_FILE
146# ifdef HAVE_AFTERIMAGE
147 if (original_asim != NULL)
148# endif
149 {
150 if (h_align == rootAlign || v_align == rootAlign)
151 return true;
152 }
153# endif
154
132 return false; 155 return false;
133} 156};
134 157
135bool bgPixmap_t::need_client_side_rendering () 158bool bgPixmap_t::need_client_side_rendering ()
136{ 159{
137# ifdef HAVE_AFTERIMAGE 160# ifdef HAVE_AFTERIMAGE
138 if (original_asim != NULL) 161 if (original_asim != NULL)
… …
172static inline bool 195static inline bool
173check_set_align_value (int geom_flags, int flag, int &align, int new_value) 196check_set_align_value (int geom_flags, int flag, int &align, int new_value)
174{ 197{
175 if (geom_flags & flag) 198 if (geom_flags & flag)
176 { 199 {
200 if (new_value != bgPixmap_t::rootAlign)
201 {
177 if (new_value < -100) 202 if (new_value < -100)
178 new_value = -100; 203 new_value = -100;
179 else if (new_value > 200) 204 else if (new_value > 200)
180 new_value = 200; 205 new_value = 200;
206 }
181 if (new_value != align) 207 if (new_value != align)
182 { 208 {
183 align = new_value; 209 align = new_value;
184 return true; 210 return true;
185 } 211 }
… …
277 y = x; 303 y = x;
278 geom_flags |= YValue; 304 geom_flags |= YValue;
279 } 305 }
280 306
281 if (flags & geometrySet) 307 if (flags & geometrySet)
308 {
282 {/* new geometry is an adjustment to the old one ! */ 309 /* new geometry is an adjustment to the old one ! */
283 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 310 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
284 { 311 {
285 if (w == 0 && h != 0) 312 if (w == 0 && h != 0)
286 { 313 {
287 w = h_scale; 314 w = h_scale;
… …
303 } 330 }
304 } 331 }
305 else /* setting up geometry from scratch */ 332 else /* setting up geometry from scratch */
306 { 333 {
307 if (!(geom_flags & XValue)) 334 if (!(geom_flags & XValue))
335 {
308 {/* use default geometry - centered */ 336 /* use default geometry - centered */
309 x = y = defaultAlign; 337 x = y = defaultAlign;
310 } 338 }
311 else if (!(geom_flags & YValue)) 339 else if (!(geom_flags & YValue))
312 y = x; 340 y = x;
313 341
314 if ((geom_flags & (WidthValue|HeightValue)) == 0) 342 if ((geom_flags & (WidthValue|HeightValue)) == 0)
343 {
315 {/* use default geometry - scaled */ 344 /* use default geometry - scaled */
316 w = h = defaultScale; 345 w = h = defaultScale;
317 } 346 }
318 else if (geom_flags & WidthValue) 347 else if (geom_flags & WidthValue)
319 { 348 {
320 if (!(geom_flags & HeightValue)) 349 if (!(geom_flags & HeightValue))
… …
323 else 352 else
324 w = h; 353 w = h;
325 } 354 }
326 } /* done parsing geometry string */ 355 } /* done parsing geometry string */
327 else if (!(flags & geometrySet)) 356 else if (!(flags & geometrySet))
357 {
328 { /* default geometry - scaled and centered */ 358 /* default geometry - scaled and centered */
329 x = y = defaultAlign; 359 x = y = defaultAlign;
330 w = h = defaultScale; 360 w = h = defaultScale;
331 } 361 }
332 362
333 if (!(flags & geometrySet)) 363 if (!(flags & geometrySet))
… …
339 { 369 {
340 while (*ops == ':' || isspace(*ops)) ++ops; 370 while (*ops == ':' || isspace(*ops)) ++ops;
341# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 371# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0)
342 if (CHECK_GEOM_OPS("tile")) 372 if (CHECK_GEOM_OPS("tile"))
343 { 373 {
344 w = h = 0; 374 w = h = noScale;
345 geom_flags |= WidthValue|HeightValue; 375 geom_flags |= WidthValue|HeightValue;
346 } 376 }
347 else if (CHECK_GEOM_OPS("propscale")) 377 else if (CHECK_GEOM_OPS("propscale"))
348 { 378 {
349 if (w == 0 && h == 0) 379 if (w == 0 && h == 0)
350 { 380 {
351 w = 100; 381 w = windowScale;
352 geom_flags |= WidthValue; 382 geom_flags |= WidthValue;
353 } 383 }
354 new_flags |= propScale; 384 new_flags |= propScale;
355 } 385 }
356 else if (CHECK_GEOM_OPS("hscale")) 386 else if (CHECK_GEOM_OPS("hscale"))
357 { 387 {
358 if (w == 0) 388 if (w == 0)
359 w = 100; 389 w = windowScale;
360 h = 0; 390 h = noScale;
361 geom_flags |= WidthValue|HeightValue; 391 geom_flags |= WidthValue|HeightValue;
362 } 392 }
363 else if (CHECK_GEOM_OPS("vscale")) 393 else if (CHECK_GEOM_OPS("vscale"))
364 { 394 {
365 if (h == 0) 395 if (h == 0)
366 h = 100; 396 h = windowScale;
367 w = 0; 397 w = noScale;
368 geom_flags |= WidthValue|HeightValue; 398 geom_flags |= WidthValue|HeightValue;
369 } 399 }
370 else if (CHECK_GEOM_OPS("scale")) 400 else if (CHECK_GEOM_OPS("scale"))
371 { 401 {
372 if (h == 0) 402 if (h == 0)
373 h = 100; 403 h = windowScale;
374 if (w == 0) 404 if (w == 0)
375 w = 100; 405 w = windowScale;
376 geom_flags |= WidthValue|HeightValue; 406 geom_flags |= WidthValue|HeightValue;
377 } 407 }
378 else if (CHECK_GEOM_OPS("auto")) 408 else if (CHECK_GEOM_OPS("auto"))
379 { 409 {
410 w = h = windowScale;
411 x = y = centerAlign;
412 geom_flags |= WidthValue|HeightValue|XValue|YValue;
413 }
414 else if (CHECK_GEOM_OPS("root"))
415 {
380 w = h = 100; 416 w = h = noScale;
381 x = y = 50; 417 x = y = rootAlign;
382 geom_flags |= WidthValue|HeightValue|XValue|YValue; 418 geom_flags |= WidthValue|HeightValue|XValue|YValue;
383 } 419 }
384# undef CHECK_GEOM_OPS 420# undef CHECK_GEOM_OPS
385 while (*ops != ':' && *ops != '\0') ++ops; 421 while (*ops != ':' && *ops != '\0') ++ops;
386 } /* done parsing ops */ 422 } /* done parsing ops */
… …
399 if (new_flags != flags) 435 if (new_flags != flags)
400 { 436 {
401 flags = new_flags; 437 flags = new_flags;
402 changed++; 438 changed++;
403 } 439 }
404//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 440//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
405// flags, h_scale, v_scale, h_align, v_align); 441// flags, h_scale, v_scale, h_align, v_align);
406 return (changed > 0); 442 return (changed > 0);
407} 443}
408 444
409# ifdef HAVE_AFTERIMAGE 445# ifdef HAVE_AFTERIMAGE
… …
425 461
426 TIMING_TEST_START (asim); 462 TIMING_TEST_START (asim);
427 463
428 if (original_asim) 464 if (original_asim)
429 { 465 {
466 if (h_align == rootAlign || v_align == rootAlign)
467 {
468 target->get_window_origin(x, y);
469 x = -x;
470 y = -y;
471 }
472 if (h_align != rootAlign)
430 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); 473 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
474 if (v_align != rootAlign)
431 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); 475 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
432 } 476 }
433 477
434 if (original_asim == NULL 478 if (original_asim == NULL
435 || x >= target_width 479 || x >= target_width
436 || y >= target_height 480 || y >= target_height
… …
465 h > 0 ? h : original_asim->height, 509 h > 0 ? h : original_asim->height,
466 background ? ASA_ASImage : ASA_XImage, 510 background ? ASA_ASImage : ASA_XImage,
467 100, ASIMAGE_QUALITY_DEFAULT); 511 100, ASIMAGE_QUALITY_DEFAULT);
468 } 512 }
469 if (background == NULL) 513 if (background == NULL)
514 {
470 {/* if tiling - pixmap has to be sized exactly as the image */ 515 /* if tiling - pixmap has to be sized exactly as the image,
516 but there is no need to make it bigger then the window! */
471 if (h_scale == 0) 517 if (h_scale == 0)
472 new_pmap_width = result->width; 518 new_pmap_width = min (result->width, target_width);
473 if (v_scale == 0) 519 if (v_scale == 0)
474 new_pmap_height = result->height; 520 new_pmap_height = min (result->height, target_height);
475 /* we also need to tile our image in one or both directions */ 521 /* we also need to tile our image in one or both directions */
476 if (h_scale == 0 || v_scale == 0) 522 if (h_scale == 0 || v_scale == 0)
477 { 523 {
478 ASImage *tmp = tile_asimage (target->asv, result, 524 ASImage *tmp = tile_asimage (target->asv, result,
479 (h_scale > 0) ? 0 : (int)result->width - x, 525 (h_scale > 0) ? 0 : (int)result->width - x,
480 (v_scale > 0) ? 0 : (int)result->height - y, 526 (v_scale > 0) ? 0 : (int)result->height - y,
527 new_pmap_width,
481 result->width, result->height, 528 new_pmap_height,
482 TINT_LEAVE_SAME, ASA_XImage, 529 TINT_LEAVE_SAME, ASA_XImage,
483 100, ASIMAGE_QUALITY_DEFAULT); 530 100, ASIMAGE_QUALITY_DEFAULT);
484 if (tmp) 531 if (tmp)
485 { 532 {
486 if (result != original_asim) 533 if (result != original_asim)
… …
488 result = tmp; 535 result = tmp;
489 } 536 }
490 } 537 }
491 } 538 }
492 else 539 else
540 {
493 {/* if blending background and image - pixmap has to be sized same as target window */ 541 /* if blending background and image - pixmap has to be sized same as target window */
494 ASImageLayer *layers = create_image_layers (2); 542 ASImageLayer *layers = create_image_layers (2);
495 ASImage *merged_im = NULL; 543 ASImage *merged_im = NULL;
496 544
497 layers[0].im = background; 545 layers[0].im = background;
498 layers[0].clip_width = target_width; 546 layers[0].clip_width = target_width;
499 layers[0].clip_height = target_height; 547 layers[0].clip_height = target_height;
500 layers[0].tint = background_tint; 548 layers[0].tint = background_tint;
501 layers[1].im = result; 549 layers[1].im = result;
502 if (w <= 0) 550 if (w <= 0)
551 {
503 {/* tile horizontally */ 552 /* tile horizontally */
504 while (x > 0) x -= (int)result->width; 553 while (x > 0) x -= (int)result->width;
505 layers[1].dst_x = x; 554 layers[1].dst_x = x;
506 layers[1].clip_width = result->width+target_width; 555 layers[1].clip_width = result->width+target_width;
507 } 556 }
508 else 557 else
558 {
509 {/* clip horizontally */ 559 /* clip horizontally */
510 layers[1].dst_x = x; 560 layers[1].dst_x = x;
511 layers[1].clip_width = result->width; 561 layers[1].clip_width = result->width;
512 } 562 }
513 if (h <= 0) 563 if (h <= 0)
514 { 564 {
… …
628# endif 678# endif
629 } 679 }
630 return false; 680 return false;
631} 681}
632 682
633# endif /* BG_IMAGE_FROM_FILE */ 683# endif /* BG_IMAGE_FROM_FILE */
634 684
635# ifdef ENABLE_TRANSPARENCY 685# ifdef ENABLE_TRANSPARENCY
636bool 686bool
637bgPixmap_t::set_transparent () 687bgPixmap_t::set_transparent ()
638{ 688{
… …
729 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 779 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
730 tint = new_tint; 780 tint = new_tint;
731 flags = (flags & ~tintFlags) | new_flags | tintSet; 781 flags = (flags & ~tintFlags) | new_flags | tintSet;
732 return true; 782 return true;
733 } 783 }
784
734 return false; 785 return false;
735} 786}
736 787
737bool 788bool
738bgPixmap_t::unset_tint () 789bgPixmap_t::unset_tint ()
… …
742 if (new_flags != (flags & tintFlags)) 793 if (new_flags != (flags & tintFlags))
743 { 794 {
744 flags = (flags&~tintFlags)|new_flags; 795 flags = (flags&~tintFlags)|new_flags;
745 return true; 796 return true;
746 } 797 }
798
747 return false; 799 return false;
748} 800}
749 801
750bool 802bool
751bgPixmap_t::set_shade (const char *shade_str) 803bgPixmap_t::set_shade (const char *shade_str)
752{ 804{
753 int new_shade = (shade_str) ? atoi (shade_str) : 0; 805 int new_shade = (shade_str) ? atoi (shade_str) : 0;
754 806
755 if (new_shade < 0 && new_shade > -100) 807 if (new_shade < 0 && new_shade > -100)
756 new_shade = 200 - (100 + new_shade); 808 new_shade = 200 - (100 + new_shade);
757 else if (new_shade == 100) 809 else if (new_shade == 100)
758 new_shade = 0; 810 new_shade = 0;
759 811
760 if (new_shade != shade) 812 if (new_shade != shade)
761 { 813 {
762 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 814 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
763 shade = new_shade; 815 shade = new_shade;
764 flags = (flags & (~tintFlags | tintSet)) | new_flags; 816 flags = (flags & (~tintFlags | tintSet)) | new_flags;
765 return true; 817 return true;
766 } 818 }
819
767 return false; 820 return false;
768} 821}
769 822
770/* make_transparency_pixmap() 823/* make_transparency_pixmap()
771 * Builds a pixmap sized the same as terminal window, with depth same as the root window 824 * Builds a pixmap sized the same as terminal window, with depth same as the root window
… …
801 if (sx + window_width <= 0 || sy + window_height <= 0 854 if (sx + window_width <= 0 || sy + window_height <= 0
802 || sx >= root_width || sy >= root_height) 855 || sx >= root_width || sy >= root_height)
803 return 0; 856 return 0;
804 857
805 if (root_pixmap != None) 858 if (root_pixmap != None)
859 {
806 {/* we want to validate the pixmap and get it's size at the same time : */ 860 /* we want to validate the pixmap and get it's size at the same time : */
807 int junk; 861 int junk;
808 unsigned int ujunk; 862 unsigned int ujunk;
809 /* root pixmap may be bad - allow a error */ 863 /* root pixmap may be bad - allow a error */
810 target->allowedxerror = -1; 864 target->allowedxerror = -1;
811 865
… …
820 874
821 if (tiled_root_pmap == None) /* something really bad happened - abort */ 875 if (tiled_root_pmap == None) /* something really bad happened - abort */
822 return 0; 876 return 0;
823 877
824 if (root_pixmap == None) 878 if (root_pixmap == None)
879 {
825 { /* use tricks to obtain the root background image :*/ 880 /* use tricks to obtain the root background image :*/
826 /* we want to create Overrideredirect window overlapping out window 881 /* we want to create Overrideredirect window overlapping out window
827 with background type of Parent Relative and then grab it */ 882 with background type of Parent Relative and then grab it */
828 XSetWindowAttributes attr; 883 XSetWindowAttributes attr;
829 Window src; 884 Window src;
830 bool success = false; 885 bool success = false;
… …
850 * but to be on the safe side - let's check for the actuall event to arrive : */ 905 * but to be on the safe side - let's check for the actuall event to arrive : */
851 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 906 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
852 ++ev_count; 907 ++ev_count;
853 908
854 if (ev_count > 0); 909 if (ev_count > 0);
910 {
855 { /* hooray! - we can grab the image! */ 911 /* hooray! - we can grab the image! */
856 gc = XCreateGC (dpy, root, 0, NULL); 912 gc = XCreateGC (dpy, root, 0, NULL);
857 if (gc) 913 if (gc)
858 { 914 {
859 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 915 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
860 success = true; 916 success = true;
861 } 917 }
862 } 918 }
919
863 XDestroyWindow (dpy, src); 920 XDestroyWindow (dpy, src);
864 XUngrabServer (dpy); 921 XUngrabServer (dpy);
865 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 922 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
866 } 923 }
867 924
… …
872 } 929 }
873 else 930 else
874 result |= transpPmapTiled; 931 result |= transpPmapTiled;
875 } 932 }
876 else 933 else
934 {
877 {/* strightforward pixmap copy */ 935 /* strightforward pixmap copy */
878 gcv.tile = root_pixmap; 936 gcv.tile = root_pixmap;
879 gcv.fill_style = FillTiled; 937 gcv.fill_style = FillTiled;
880 938
881 while (sx < 0) sx += (int)root_width; 939 while (sx < 0) sx += (int)root_width;
882 while (sy < 0) sy += (int)root_height; 940 while (sy < 0) sy += (int)root_height;
… …
930 { 988 {
931 c.r = (c.r * shade) / 100; 989 c.r = (c.r * shade) / 100;
932 c.g = (c.g * shade) / 100; 990 c.g = (c.g * shade) / 100;
933 c.b = (c.b * shade) / 100; 991 c.b = (c.b * shade) / 100;
934 } 992 }
935 else if( shade > 100 && shade < 200) 993 else if (shade > 100 && shade < 200)
936 { 994 {
937 c.r = (c.r * (200 - shade)) / 100; 995 c.r = (c.r * (200 - shade)) / 100;
938 c.g = (c.g * (200 - shade)) / 100; 996 c.g = (c.g * (200 - shade)) / 100;
939 c.b = (c.b * (200 - shade)) / 100; 997 c.b = (c.b * (200 - shade)) / 100;
940 } 998 }
… …
986 mask_c.blue = 0xffff - c.b; 1044 mask_c.blue = 0xffff - c.b;
987 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1045 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
988 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 1046 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
989 result |= transpPmapTinted; 1047 result |= transpPmapTinted;
990 } 1048 }
1049
991 XRenderFreePicture (dpy, mask_pic); 1050 XRenderFreePicture (dpy, mask_pic);
992 XRenderFreePicture (dpy, overlay_pic); 1051 XRenderFreePicture (dpy, overlay_pic);
993 XRenderFreePicture (dpy, back_pic); 1052 XRenderFreePicture (dpy, back_pic);
994# if DO_TIMING_TEST 1053# if DO_TIMING_TEST
995 XSync (dpy, False); 1054 XSync (dpy, False);
… …
1017} 1076}
1018 1077
1019bool 1078bool
1020bgPixmap_t::set_root_pixmap () 1079bgPixmap_t::set_root_pixmap ()
1021{ 1080{
1022 Pixmap new_root_pixmap = None;
1023
1024 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1081 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1025 if (new_root_pixmap == None) 1082 if (new_root_pixmap == None)
1026 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1083 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1027 1084
1028 if (new_root_pixmap != root_pixmap) 1085 if (new_root_pixmap != root_pixmap)
1029 { 1086 {
1030 root_pixmap = new_root_pixmap; 1087 root_pixmap = new_root_pixmap;
1031 return true; 1088 return true;
1032 } 1089 }
1090
1033 return false; 1091 return false;
1034} 1092}
1035# endif /* ENABLE_TRANSPARENCY */ 1093# endif /* ENABLE_TRANSPARENCY */
1036 1094
1037# ifndef HAVE_AFTERIMAGE 1095# ifndef HAVE_AFTERIMAGE
1038static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1096static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm);
1039# endif 1097# endif
1040
1041 1098
1042bool 1099bool
1043bgPixmap_t::render () 1100bgPixmap_t::render ()
1044{ 1101{
1045 unsigned long background_flags = 0; 1102 unsigned long background_flags = 0;
… …
1127 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1184 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1128 } 1185 }
1129 } 1186 }
1130# endif /* HAVE_AFTERIMAGE */ 1187# endif /* HAVE_AFTERIMAGE */
1131 1188
1132 if (result != NULL) 1189 if (result)
1133 { 1190 {
1134 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1191 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1192
1135 if (gc) 1193 if (gc)
1136 { 1194 {
1137 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1195 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1138 { 1196 {
1139 XFreePixmap (target->dpy, pixmap); 1197 XFreePixmap (target->dpy, pixmap);
1140 pixmap = None; 1198 pixmap = None;
1141 } 1199 }
1200
1142 if (pixmap == None) 1201 if (pixmap == None)
1143 { 1202 {
1144 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1203 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1145 pmap_width = result->width; 1204 pmap_width = result->width;
1146 pmap_height = result->height; 1205 pmap_height = result->height;
1147 pmap_depth = target->depth; 1206 pmap_depth = target->depth;
1148 } 1207 }
1208
1149 if (pmap_depth != result->depth) 1209 if (pmap_depth != result->depth)
1210 {
1150 { /* Bad Match error will ensue ! stupid X !!!! */ 1211 /* Bad Match error will ensue ! stupid X !!!! */
1151 if( result->depth == 24 && pmap_depth == 32) 1212 if (result->depth == 24 && pmap_depth == 32)
1152 result->depth = 32; 1213 result->depth = 32;
1153 else if( result->depth == 32 && pmap_depth == 24) 1214 else if (result->depth == 32 && pmap_depth == 24)
1154 result->depth = 24; 1215 result->depth = 24;
1155 else 1216 else
1156 { 1217 {
1157 /* TODO: implement image recoding */ 1218 /* TODO: implement image recoding */
1158 } 1219 }
1159 } 1220 }
1221
1160 if (pmap_depth == result->depth) 1222 if (pmap_depth == result->depth)
1161 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1223 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1224
1162 XFreeGC (target->dpy, gc); 1225 XFreeGC (target->dpy, gc);
1163 flags = flags & ~isInvalid; 1226 flags = flags & ~isInvalid;
1164 } 1227 }
1228
1165 XDestroyImage (result); 1229 XDestroyImage (result);
1166 } 1230 }
1167 1231
1168 if (flags & isInvalid) 1232 if (flags & isInvalid)
1169 { 1233 {
… …
1195 } 1259 }
1196 return false; 1260 return false;
1197} 1261}
1198 1262
1199void 1263void
1200bgPixmap_t::apply() 1264bgPixmap_t::apply ()
1201{ 1265{
1202 if (target) 1266 if (target)
1203 { 1267 {
1204 flags &= ~isVtOrigin; 1268 flags &= ~isVtOrigin;
1205 if (pixmap != None) 1269 if (pixmap != None)
1270 {
1206 { /* set target's background to pixmap */ 1271 /* set target's background to pixmap */
1207# ifdef ENABLE_TRANSPARENCY 1272# ifdef ENABLE_TRANSPARENCY
1208 if (flags & isTransparent) 1273 if (flags & isTransparent)
1209 { 1274 {
1210 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1275 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1211 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1276 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
… …
1227 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1292 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1228# endif 1293# endif
1229 } 1294 }
1230 } 1295 }
1231 else 1296 else
1297 {
1232 { /* set target background to a pixel */ 1298 /* set target background to a pixel */
1233 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1299 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1234 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1300 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1235 /* do we also need to set scrollbar's background here ? */ 1301 /* do we also need to set scrollbar's background here ? */
1236# if HAVE_SCROLLBARS 1302# if HAVE_SCROLLBARS
1237 if (target->scrollBar.win) 1303 if (target->scrollBar.win)
… …
1253 target->want_refresh = 1; 1319 target->want_refresh = 1;
1254 flags |= hasChanged; 1320 flags |= hasChanged;
1255 } 1321 }
1256} 1322}
1257 1323
1258#endif /* HAVE_BG_PIXMAP */ 1324#endif /* HAVE_BG_PIXMAP */
1259 1325
1260#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1326#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1261/* taken from aterm-0.4.2 */ 1327/* taken from aterm-0.4.2 */
1262 1328
1263typedef uint32_t RUINT32T; 1329typedef uint32_t RUINT32T;

Diff Legend

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