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.7 by sasha, Fri Oct 26 17:10:48 2007 UTC vs.
Revision 1.16 by ayin, Mon Nov 26 11:20:13 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
… …
31 28
32#if DO_TIMING_TEST 29#if DO_TIMING_TEST
33#define TIMING_TEST_START(id) \ 30#define TIMING_TEST_START(id) \
34 struct timeval timing_test_##id##_stv;\ 31 struct timeval timing_test_##id##_stv;\
35 gettimeofday (&timing_test_##id##_stv, NULL); 32 gettimeofday (&timing_test_##id##_stv, NULL);
36 33
37#define TIMING_TEST_PRINT_RESULT(id) \ 34#define TIMING_TEST_PRINT_RESULT(id) \
38 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 35 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\
39 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 36 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\
40 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0) 37 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0)
41 38
… …
87 * scale Scale both up and down 84 * scale Scale both up and down
88 * auto Same as 100x100+50+50 85 * auto Same as 100x100+50+50
89 */ 86 */
90 87
91#ifdef HAVE_BG_PIXMAP 88#ifdef HAVE_BG_PIXMAP
92bgPixmap_t::bgPixmap_t() 89bgPixmap_t::bgPixmap_t ()
93{ 90{
94#ifdef HAVE_AFTERIMAGE 91#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 92 original_asim = NULL;
96#endif 93#endif
97#ifdef BG_IMAGE_FROM_FILE 94#ifdef BG_IMAGE_FROM_FILE
… …
100#endif 97#endif
101 flags = 0; 98 flags = 0;
102 pixmap = None; 99 pixmap = None;
103} 100}
104 101
102void
103bgPixmap_t::destroy ()
104{
105#ifdef HAVE_AFTERIMAGE
106 if (original_asim)
107 safe_asimage_destroy (original_asim);
108#endif
109
110 if (pixmap && target)
111 XFreePixmap (target->dpy, pixmap);
112}
105 113
106bool 114bool
107bgPixmap_t::window_size_sensitive () 115bgPixmap_t::window_size_sensitive ()
108{ 116{
117# ifdef ENABLE_TRANSPARENCY
118 if (flags & isTransparent)
119 return true;
120# endif
121
109# ifdef BG_IMAGE_FROM_FILE 122# ifdef BG_IMAGE_FROM_FILE
110# ifdef HAVE_AFTERIMAGE 123# ifdef HAVE_AFTERIMAGE
111 if (original_asim != NULL) 124 if (original_asim != NULL)
112# endif 125# endif
113 { 126 {
114 if (h_scale != 0 || v_scale != 0 127 if (h_scale != 0 || v_scale != 0
115 || h_align != 0 || v_align != 0) 128 || h_align != 0 || v_align != 0)
116 return true; 129 return true;
117 } 130 }
118# endif 131# endif
132
133 return false;
134}
135
136bool
137bgPixmap_t::window_position_sensitive ()
138{
119# ifdef ENABLE_TRANSPARENCY 139# ifdef ENABLE_TRANSPARENCY
120 if (flags & isTransparent) 140 if (flags & isTransparent)
121 return true; 141 return true;
122# endif 142# endif
143
144# ifdef BG_IMAGE_FROM_FILE
145# ifdef HAVE_AFTERIMAGE
146 if (original_asim != NULL)
147# endif
148 {
149 if (h_align == rootAlign || v_align == rootAlign)
150 return true;
151 }
152# endif
153
123 return false; 154 return false;
124} 155};
125 156
126bool bgPixmap_t::need_client_side_rendering () 157bool bgPixmap_t::need_client_side_rendering ()
127{ 158{
128# ifdef HAVE_AFTERIMAGE 159# ifdef HAVE_AFTERIMAGE
129 if (original_asim != NULL) 160 if (original_asim != NULL)
… …
132# ifdef ENABLE_TRANSPARENCY 163# ifdef ENABLE_TRANSPARENCY
133 if (flags & isTransparent) 164 if (flags & isTransparent)
134 { 165 {
135# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways 166# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
136 if ((flags & blurNeeded) && !(flags & blurServerSide)) 167 if ((flags & blurNeeded) && !(flags & blurServerSide))
137 return true; 168 return true;
138# endif 169# endif
139 if ((flags & tintNeeded) && !(flags & tintServerSide)) 170 if ((flags & tintNeeded) && !(flags & tintServerSide))
140 return true; 171 return true;
141 } 172 }
142# endif 173# endif
… …
163static inline bool 194static inline bool
164check_set_align_value (int geom_flags, int flag, int &align, int new_value) 195check_set_align_value (int geom_flags, int flag, int &align, int new_value)
165{ 196{
166 if (geom_flags & flag) 197 if (geom_flags & flag)
167 { 198 {
199 if (new_value != bgPixmap_t::rootAlign)
200 {
168 if (new_value < -100) 201 if (new_value < -100)
169 new_value = -100; 202 new_value = -100;
170 else if (new_value > 200) 203 else if (new_value > 200)
171 new_value = 200; 204 new_value = 200;
205 }
172 if (new_value != align) 206 if (new_value != align)
173 { 207 {
174 align = new_value; 208 align = new_value;
175 return true; 209 return true;
176 } 210 }
… …
314 else 348 else
315 w = h; 349 w = h;
316 } 350 }
317 } /* done parsing geometry string */ 351 } /* done parsing geometry string */
318 else if (!(flags & geometrySet)) 352 else if (!(flags & geometrySet))
353 {
319 { /* default geometry - scaled and centered */ 354 /* default geometry - scaled and centered */
320 x = y = defaultAlign; 355 x = y = defaultAlign;
321 w = h = defaultScale; 356 w = h = defaultScale;
322 } 357 }
323 358
324 if (!(flags & geometrySet)) 359 if (!(flags & geometrySet))
325 geom_flags |= WidthValue|HeightValue|XValue|YValue; 360 geom_flags |= WidthValue|HeightValue|XValue|YValue;
326 361
327 if (ops) 362 if (ops)
328 { 363 {
… …
330 { 365 {
331 while (*ops == ':' || isspace(*ops)) ++ops; 366 while (*ops == ':' || isspace(*ops)) ++ops;
332# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 367# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0)
333 if (CHECK_GEOM_OPS("tile")) 368 if (CHECK_GEOM_OPS("tile"))
334 { 369 {
335 w = h = 0; 370 w = h = noScale;
336 geom_flags |= WidthValue|HeightValue; 371 geom_flags |= WidthValue|HeightValue;
337 } 372 }
338 else if (CHECK_GEOM_OPS("propscale")) 373 else if (CHECK_GEOM_OPS("propscale"))
339 { 374 {
340 if (w == 0 && h == 0) 375 if (w == 0 && h == 0)
341 { 376 {
342 w = 100; 377 w = windowScale;
343 geom_flags |= WidthValue; 378 geom_flags |= WidthValue;
344 } 379 }
345 new_flags |= propScale; 380 new_flags |= propScale;
346 } 381 }
347 else if (CHECK_GEOM_OPS("hscale")) 382 else if (CHECK_GEOM_OPS("hscale"))
348 { 383 {
349 if (w == 0) 384 if (w == 0)
350 w = 100; 385 w = windowScale;
351 h = 0; 386 h = noScale;
352 geom_flags |= WidthValue|HeightValue; 387 geom_flags |= WidthValue|HeightValue;
353 } 388 }
354 else if (CHECK_GEOM_OPS("vscale")) 389 else if (CHECK_GEOM_OPS("vscale"))
355 { 390 {
356 if (h == 0) 391 if (h == 0)
357 h = 100; 392 h = windowScale;
358 w = 0; 393 w = noScale;
359 geom_flags |= WidthValue|HeightValue; 394 geom_flags |= WidthValue|HeightValue;
360 } 395 }
361 else if (CHECK_GEOM_OPS("scale")) 396 else if (CHECK_GEOM_OPS("scale"))
362 { 397 {
363 if (h == 0) 398 if (h == 0)
364 h = 100; 399 h = windowScale;
365 if (w == 0) 400 if (w == 0)
366 w = 100; 401 w = windowScale;
367 geom_flags |= WidthValue|HeightValue; 402 geom_flags |= WidthValue|HeightValue;
368 } 403 }
369 else if (CHECK_GEOM_OPS("auto")) 404 else if (CHECK_GEOM_OPS("auto"))
370 { 405 {
406 w = h = windowScale;
407 x = y = centerAlign;
408 geom_flags |= WidthValue|HeightValue|XValue|YValue;
409 }
410 else if (CHECK_GEOM_OPS("root"))
411 {
371 w = h = 100; 412 w = h = noScale;
372 x = y = 50; 413 x = y = rootAlign;
373 geom_flags |= WidthValue|HeightValue|XValue|YValue; 414 geom_flags |= WidthValue|HeightValue|XValue|YValue;
374 } 415 }
375# undef CHECK_GEOM_OPS 416# undef CHECK_GEOM_OPS
376 while (*ops != ':' && *ops != '\0') ++ops; 417 while (*ops != ':' && *ops != '\0') ++ops;
377 } /* done parsing ops */ 418 } /* done parsing ops */
… …
416 457
417 TIMING_TEST_START (asim); 458 TIMING_TEST_START (asim);
418 459
419 if (original_asim) 460 if (original_asim)
420 { 461 {
462 if (h_align == rootAlign || v_align == rootAlign)
463 {
464 target->get_window_origin(x, y);
465 x = -x;
466 y = -y;
467 }
468 if (h_align != rootAlign)
421 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); 469 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
470 if (v_align != rootAlign)
422 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); 471 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
423 } 472 }
424 473
425 if (original_asim == NULL 474 if (original_asim == NULL
426 || x >= target_width 475 || x >= target_width
427 || y >= target_height 476 || y >= target_height
… …
449 { 498 {
450 result = original_asim; 499 result = original_asim;
451 if ((w > 0 && w != original_asim->width) 500 if ((w > 0 && w != original_asim->width)
452 || (h > 0 && h != original_asim->height)) 501 || (h > 0 && h != original_asim->height))
453 { 502 {
454 result = scale_asimage (target->asv, original_asim, 503 result = scale_asimage (target->asv, original_asim,
455 w > 0 ? w : original_asim->width, 504 w > 0 ? w : original_asim->width,
456 h > 0 ? h : original_asim->height, 505 h > 0 ? h : original_asim->height,
457 background ? ASA_ASImage : ASA_XImage, 506 background ? ASA_ASImage : ASA_XImage,
458 100, ASIMAGE_QUALITY_DEFAULT); 507 100, ASIMAGE_QUALITY_DEFAULT);
459 } 508 }
460 if (background == NULL) 509 if (background == NULL)
461 {/* if tiling - pixmap has to be sized exactly as the image */ 510 {/* if tiling - pixmap has to be sized exactly as the image,
511 but there is no need to make it bigger then the window! */
462 if (h_scale == 0) 512 if (h_scale == 0)
463 new_pmap_width = result->width; 513 new_pmap_width = min (result->width, target_width);
464 if (v_scale == 0) 514 if (v_scale == 0)
465 new_pmap_height = result->height; 515 new_pmap_height = min (result->height, target_height);
466 /* we also need to tile our image in one or both directions */ 516 /* we also need to tile our image in one or both directions */
467 if (h_scale == 0 || v_scale == 0) 517 if (h_scale == 0 || v_scale == 0)
468 { 518 {
469 ASImage *tmp = tile_asimage (target->asv, result, 519 ASImage *tmp = tile_asimage (target->asv, result,
470 (h_scale > 0) ? 0 : (int)result->width - x, 520 (h_scale > 0) ? 0 : (int)result->width - x,
471 (v_scale > 0) ? 0 : (int)result->height - y, 521 (v_scale > 0) ? 0 : (int)result->height - y,
522 new_pmap_width,
472 result->width, result->height, 523 new_pmap_height,
473 TINT_LEAVE_SAME, ASA_XImage, 524 TINT_LEAVE_SAME, ASA_XImage,
474 100, ASIMAGE_QUALITY_DEFAULT); 525 100, ASIMAGE_QUALITY_DEFAULT);
475 if (tmp) 526 if (tmp)
476 { 527 {
477 if (result != original_asim) 528 if (result != original_asim)
… …
578 } 629 }
579 630
580 /* put result on pixmap */ 631 /* put result on pixmap */
581 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 632 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
582 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 633 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
583 634
584 if (result != background && result != original_asim) 635 if (result != background && result != original_asim)
585 destroy_asimage (&result); 636 destroy_asimage (&result);
586 637
587 XFreeGC (target->dpy, gc); 638 XFreeGC (target->dpy, gc);
588 TIMING_TEST_PRINT_RESULT (asim); 639 TIMING_TEST_PRINT_RESULT (asim);
… …
614 f[len] = '\0'; 665 f[len] = '\0';
615 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 666 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
616 free (f); 667 free (f);
617 } 668 }
618 return (original_asim != NULL); 669 return (original_asim != NULL);
619# endif 670# endif
620 } 671 }
621 return false; 672 return false;
622} 673}
623 674
624# endif /* BG_IMAGE_FROM_FILE */ 675# endif /* BG_IMAGE_FROM_FILE */
625 676
626# ifdef ENABLE_TRANSPARENCY 677# ifdef ENABLE_TRANSPARENCY
627bool 678bool
628bgPixmap_t::set_transparent () 679bgPixmap_t::set_transparent ()
629{ 680{
630 if (!(flags & isTransparent)) 681 if (!(flags & isTransparent))
631 { 682 {
632 flags |= isTransparent; 683 flags |= isTransparent;
… …
657 if (v_blurRadius != vr) 708 if (v_blurRadius != vr)
658 { 709 {
659 ++changed; 710 ++changed;
660 v_blurRadius = vr; 711 v_blurRadius = vr;
661 } 712 }
662 713
663 if (v_blurRadius == 0 && h_blurRadius == 0) 714 if (v_blurRadius == 0 && h_blurRadius == 0)
664 flags &= ~blurNeeded; 715 flags &= ~blurNeeded;
665 else 716 else
666 flags |= blurNeeded; 717 flags |= blurNeeded;
667 718
… …
694 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 745 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
695 { 746 {
696 flags |= bgPixmap_t::tintNeeded; 747 flags |= bgPixmap_t::tintNeeded;
697 } 748 }
698 } 749 }
699 750
700 if (flags & bgPixmap_t::tintNeeded) 751 if (flags & bgPixmap_t::tintNeeded)
701 { 752 {
702 if (flags & bgPixmap_t::tintWholesome) 753 if (flags & bgPixmap_t::tintWholesome)
703 flags |= bgPixmap_t::tintServerSide; 754 flags |= bgPixmap_t::tintServerSide;
704 else 755 else
… …
741bool 792bool
742bgPixmap_t::set_shade (const char *shade_str) 793bgPixmap_t::set_shade (const char *shade_str)
743{ 794{
744 int new_shade = (shade_str) ? atoi (shade_str) : 0; 795 int new_shade = (shade_str) ? atoi (shade_str) : 0;
745 796
797 if (new_shade < 0 && new_shade > -100)
798 new_shade = 200 - (100 + new_shade);
746 if (new_shade == 100) 799 else if (new_shade == 100)
747 new_shade = 0; 800 new_shade = 0;
748 801
749 if (new_shade != shade) 802 if (new_shade != shade)
750 { 803 {
751 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 804 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
… …
754 return true; 807 return true;
755 } 808 }
756 return false; 809 return false;
757} 810}
758 811
759/* make_transparency_pixmap() 812/* make_transparency_pixmap()
760 * Builds a pixmap sized the same as terminal window, with depth same as the root window 813 * Builds a pixmap sized the same as terminal window, with depth same as the root window
761 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 814 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
762 * our window. 815 * our window.
763 */ 816 */
764unsigned long 817unsigned long
765bgPixmap_t::make_transparency_pixmap () 818bgPixmap_t::make_transparency_pixmap ()
766{ 819{
… …
809 862
810 if (tiled_root_pmap == None) /* something really bad happened - abort */ 863 if (tiled_root_pmap == None) /* something really bad happened - abort */
811 return 0; 864 return 0;
812 865
813 if (root_pixmap == None) 866 if (root_pixmap == None)
867 {
814 { /* use tricks to obtain the root background image :*/ 868 /* use tricks to obtain the root background image :*/
815 /* we want to create Overrideredirect window overlapping out window 869 /* we want to create Overrideredirect window overlapping out window
816 with background type of Parent Relative and then grab it */ 870 with background type of Parent Relative and then grab it */
817 XSetWindowAttributes attr; 871 XSetWindowAttributes attr;
818 Window src; 872 Window src;
819 bool success = false; 873 bool success = false;
… …
839 * but to be on the safe side - let's check for the actuall event to arrive : */ 893 * but to be on the safe side - let's check for the actuall event to arrive : */
840 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 894 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
841 ++ev_count; 895 ++ev_count;
842 896
843 if (ev_count > 0); 897 if (ev_count > 0);
898 {
844 { /* hooray! - we can grab the image! */ 899 /* hooray! - we can grab the image! */
845 gc = XCreateGC (dpy, root, 0, NULL); 900 gc = XCreateGC (dpy, root, 0, NULL);
846 if (gc) 901 if (gc)
847 { 902 {
848 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 903 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
849 success = true; 904 success = true;
… …
882 } 937 }
883 TIMING_TEST_PRINT_RESULT (tp); 938 TIMING_TEST_PRINT_RESULT (tp);
884 939
885 if (tiled_root_pmap != None) 940 if (tiled_root_pmap != None)
886 { 941 {
887 if (!need_client_side_rendering ()) 942 if (!need_client_side_rendering ())
888 { 943 {
889 if ((flags & tintNeeded)) 944 if ((flags & tintNeeded))
890 { 945 {
891 if (flags & tintWholesome) 946 if (flags & tintWholesome)
892 { 947 {
893 /* In this case we can tint image server-side getting significant 948 /* In this case we can tint image server-side getting significant
894 * performance improvements, as we eliminate XImage transfer 949 * performance improvements, as we eliminate XImage transfer
… …
935 pf.direct.greenMask = 0xff; 990 pf.direct.greenMask = 0xff;
936 pf.direct.blueMask = 0xff; 991 pf.direct.blueMask = 0xff;
937 pf.direct.alphaMask = 0xff; 992 pf.direct.alphaMask = 0xff;
938 993
939 XRenderPictFormat *solid_format = XRenderFindFormat (dpy, 994 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
940 (PictFormatType| 995 (PictFormatType|
941 PictFormatDepth| 996 PictFormatDepth|
942 PictFormatRedMask| 997 PictFormatRedMask|
943 PictFormatGreenMask| 998 PictFormatGreenMask|
944 PictFormatBlueMask| 999 PictFormatBlueMask|
945 PictFormatAlphaMask), 1000 PictFormatAlphaMask),
946 &pf, 1001 &pf,
947 0); 1002 0);
948 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); 1003 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
949 XRenderPictureAttributes pa ; 1004 XRenderPictureAttributes pa ;
950 1005
951 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa); 1006 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
952 1007
… …
954 1009
955 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1010 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
956 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1011 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
957 XFreePixmap (dpy, overlay_pmap); 1012 XFreePixmap (dpy, overlay_pmap);
958 1013
959 pa.component_alpha = True; 1014 pa.component_alpha = True;
960 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1015 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
961 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1016 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
962 XFreePixmap (dpy, mask_pmap); 1017 XFreePixmap (dpy, mask_pmap);
963 1018
964 if (mask_pic && overlay_pic && back_pic) 1019 if (mask_pic && overlay_pic && back_pic)
… …
980 XRenderFreePicture (dpy, mask_pic); 1035 XRenderFreePicture (dpy, mask_pic);
981 XRenderFreePicture (dpy, overlay_pic); 1036 XRenderFreePicture (dpy, overlay_pic);
982 XRenderFreePicture (dpy, back_pic); 1037 XRenderFreePicture (dpy, back_pic);
983# if DO_TIMING_TEST 1038# if DO_TIMING_TEST
984 XSync (dpy, False); 1039 XSync (dpy, False);
985# endif 1040# endif
986# endif 1041# endif
987 } 1042 }
988 } 1043 }
989 } /* server side rendering completed */ 1044 } /* server side rendering completed */
990 1045
… …
994 pixmap = tiled_root_pmap; 1049 pixmap = tiled_root_pmap;
995 pmap_width = window_width; 1050 pmap_width = window_width;
996 pmap_height = window_height; 1051 pmap_height = window_height;
997 pmap_depth = root_depth; 1052 pmap_depth = root_depth;
998 } 1053 }
999 1054
1000 if (gc) 1055 if (gc)
1001 XFreeGC (dpy, gc); 1056 XFreeGC (dpy, gc);
1002 1057
1003 TIMING_TEST_PRINT_RESULT (tp); 1058 TIMING_TEST_PRINT_RESULT (tp);
1004 1059
1005 return result; 1060 return result;
1006} 1061}
1007 1062
1008bool 1063bool
1009bgPixmap_t::set_root_pixmap () 1064bgPixmap_t::set_root_pixmap ()
1010{ 1065{
1011 Pixmap new_root_pixmap = None; 1066 Pixmap new_root_pixmap = None;
1012 1067
1013 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1068 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1014 if (new_root_pixmap == None) 1069 if (new_root_pixmap == None)
1015 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1070 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1016 1071
1017 if (new_root_pixmap != root_pixmap) 1072 if (new_root_pixmap != root_pixmap)
… …
1100 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1155 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1101 } 1156 }
1102 1157
1103# elif !XFT /* our own client-side tinting */ 1158# elif !XFT /* our own client-side tinting */
1104 1159
1105 /* ATTENTION: We ASSUME that XFT will let us do all the tinint neccessary server-side. 1160 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1106 This may need to be changed in need_client_seide_rendering() logic is altered !!! */ 1161 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1107 1162
1108 if (background_flags && (flags & isInvalid)) 1163 if (background_flags && (flags & isInvalid))
1109 { 1164 {
1110 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1165 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1111 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1166 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
… …
1134 pmap_width = result->width; 1189 pmap_width = result->width;
1135 pmap_height = result->height; 1190 pmap_height = result->height;
1136 pmap_depth = target->depth; 1191 pmap_depth = target->depth;
1137 } 1192 }
1138 if (pmap_depth != result->depth) 1193 if (pmap_depth != result->depth)
1194 {
1139 { /* Bad Match error will ensue ! stupid X !!!! */ 1195 /* Bad Match error will ensue ! stupid X !!!! */
1140 if( result->depth == 24 && pmap_depth == 32) 1196 if( result->depth == 24 && pmap_depth == 32)
1141 result->depth = 32; 1197 result->depth = 32;
1142 else if( result->depth == 32 && pmap_depth == 24) 1198 else if( result->depth == 32 && pmap_depth == 24)
1143 result->depth = 24; 1199 result->depth = 24;
1144 else 1200 else
… …
1165 1221
1166 apply (); 1222 apply ();
1167 1223
1168 TIMING_TEST_PRINT_RESULT (tp); 1224 TIMING_TEST_PRINT_RESULT (tp);
1169 1225
1170 return true; 1226 return true;
1171} 1227}
1172 1228
1173bool 1229bool
1174bgPixmap_t::set_target (rxvt_term *new_target) 1230bgPixmap_t::set_target (rxvt_term *new_target)
1175{ 1231{
1176 if (new_target) 1232 if (new_target)
1177 if (target != new_target) 1233 if (target != new_target)
1178 { 1234 {
… …
1190{ 1246{
1191 if (target) 1247 if (target)
1192 { 1248 {
1193 flags &= ~isVtOrigin; 1249 flags &= ~isVtOrigin;
1194 if (pixmap != None) 1250 if (pixmap != None)
1251 {
1195 { /* set target's background to pixmap */ 1252 /* set target's background to pixmap */
1196# ifdef ENABLE_TRANSPARENCY 1253# ifdef ENABLE_TRANSPARENCY
1197 if (flags & isTransparent) 1254 if (flags & isTransparent)
1198 { 1255 {
1199 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1256 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1200 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1257 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
… …
1216 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1273 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1217# endif 1274# endif
1218 } 1275 }
1219 } 1276 }
1220 else 1277 else
1278 {
1221 { /* set target background to a pixel */ 1279 /* set target background to a pixel */
1222 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1280 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1223 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1281 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1224 /* do we also need to set scrollbar's background here ? */ 1282 /* do we also need to set scrollbar's background here ? */
1225# if HAVE_SCROLLBARS 1283# if HAVE_SCROLLBARS
1226 if (target->scrollBar.win) 1284 if (target->scrollBar.win)
1227 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1285 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1228# endif 1286# endif
1229 } 1287 }
1230 /* don't want Expose on the parent or vt. It is better to use 1288 /* don't want Expose on the parent or vt. It is better to use
1231 scr_touch or we get a great deal of flicker otherwise: */ 1289 scr_touch or we get a great deal of flicker otherwise: */
1232 XClearWindow (target->dpy, target->parent[0]); 1290 XClearWindow (target->dpy, target->parent[0]);
1233 1291
1234# if HAVE_SCROLLBARS 1292# if HAVE_SCROLLBARS
1235 if (target->scrollBar.win) 1293 if (target->scrollBar.win)
… …
1242 target->want_refresh = 1; 1300 target->want_refresh = 1;
1243 flags |= hasChanged; 1301 flags |= hasChanged;
1244 } 1302 }
1245} 1303}
1246 1304
1247#endif /* HAVE_BG_PIXMAP */ 1305#endif /* HAVE_BG_PIXMAP */
1248 1306
1249#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1307#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1250/* taken from aterm-0.4.2 */ 1308/* taken from aterm-0.4.2 */
1251 1309
1252typedef uint32_t RUINT32T; 1310typedef uint32_t RUINT32T;

Diff Legend

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