ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xpm.C
(Generate patch)

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.44 by ayin, Sat Jun 30 23:34:57 2007 UTC vs.
Revision 1.52 by sasha, Fri Jul 27 22:52:08 2007 UTC

… …
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#ifdef XPM_BACKGROUND 29#ifdef XPM_BACKGROUND
30 30
31#ifndef HAVE_AFTERIMAGE
32/*
33 * search for FILE in the current working directory, and within the
34 * colon-delimited PATHLIST, adding the file extension EXT if required.
35 *
36 * FILE is either semi-colon or zero terminated
37 */
38static char *
39rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
40{
41 int maxpath, len;
42 const char *p, *path;
43 char name[256];
44
45 if (!access (file, R_OK)) /* found (plain name) in current directory */
46 return strdup (file);
47
48 /* semi-colon delimited */
49 if ((p = strchr (file, ';')))
50 len = (p - file);
51 else
52 len = strlen (file);
53
54 /* leave room for an extra '/' and trailing '\0' */
55 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
56 if (maxpath <= 0)
57 return NULL;
58
59 /* check if we can find it now */
60 strncpy (name, file, len);
61 name[len] = '\0';
62
63 if (!access (name, R_OK))
64 return strdup (name);
65 if (ext)
66 {
67 strcat (name, ext);
68 if (!access (name, R_OK))
69 return strdup (name);
70 }
71 for (path = pathlist; path != NULL && *path != '\0'; path = p)
72 {
73 int n;
74
75 /* colon delimited */
76 if ((p = strchr (path, ':')) == NULL)
77 p = strchr (path, '\0');
78
79 n = (p - path);
80 if (*p != '\0')
81 p++;
82
83 if (n > 0 && n <= maxpath)
84 {
85 strncpy (name, path, n);
86 if (name[n - 1] != '/')
87 name[n++] = '/';
88 name[n] = '\0';
89 strncat (name, file, len);
90
91 if (!access (name, R_OK))
92 return strdup (name);
93 if (ext)
94 {
95 strcat (name, ext);
96 if (!access (name, R_OK))
97 return strdup (name);
98 }
99 }
100 }
101 return NULL;
102}
103
31/* 104/*
32 * Calculate tiling sizes and increments 105 * Calculate tiling sizes and increments
33 * At start, p == 0, incr == xpmwidthheight 106 * At start, p == 0, incr == xpmwidthheight
34 */ 107 */
35static void 108static void
… …
101 *wh = cwh; 174 *wh = cwh;
102 *xy = cxy; 175 *xy = cxy;
103 *incr = cincr; 176 *incr = cincr;
104 *p = cp; 177 *p = cp;
105} 178}
179#endif
106 180
107/* 181/*
108 * These GEOM strings indicate absolute size/position: 182 * These GEOM strings indicate absolute size/position:
109 * @ `WxH+X+Y' 183 * @ `WxH+X+Y'
110 * @ `WxH+X' -> Y = X 184 * @ `WxH+X' -> Y = X
… …
157 if (n < MAXLEN_GEOM) 231 if (n < MAXLEN_GEOM)
158 { 232 {
159 strncpy (str, geom, n); 233 strncpy (str, geom, n);
160 str[n] = '\0'; 234 str[n] = '\0';
161 235
162 if (strcmp(str, "auto") == 0) 236 if (strcmp(str, "auto") == 0)
163 { 237 {
164 if (!bgpixmap->auto_resize) 238 if (!bgpixmap->auto_resize)
165 changed++; 239 changed++;
166 bgpixmap->auto_resize = True ; 240 bgpixmap->auto_resize = True ;
167 w = szHint.width ; 241 w = szHint.width ;
168 h = szHint.height ; 242 h = szHint.height ;
169 flags = WidthValue|HeightValue ; 243 flags = WidthValue|HeightValue ;
170 } 244 }
171 else 245 else
172 { 246 {
173 bgpixmap->auto_resize = False ; 247 bgpixmap->auto_resize = False ;
174 flags = XParseGeometry (str, &x, &y, &w, &h); 248 flags = XParseGeometry (str, &x, &y, &w, &h);
175 } 249 }
176 250
177 if (!flags) 251 if (!flags)
178 { 252 {
… …
283 unsigned int w = bgPixmap.w, h = bgPixmap.h, 357 unsigned int w = bgPixmap.w, h = bgPixmap.h,
284 x = bgPixmap.x, y = bgPixmap.y; 358 x = bgPixmap.x, y = bgPixmap.y;
285 unsigned int xpmh = xpmAttr.height, 359 unsigned int xpmh = xpmAttr.height,
286 xpmw = xpmAttr.width; 360 xpmw = xpmAttr.width;
287 361
288 if (bgPixmap.auto_resize) 362 if (bgPixmap.auto_resize)
289 { 363 {
290 w = szHint.width ; 364 w = szHint.width ;
291 h = szHint.height ; 365 h = szHint.height ;
292 } 366 }
293 /* 367 /*
294 * don't zoom pixmap too much nor expand really small pixmaps 368 * don't zoom pixmap too much nor expand really small pixmaps
295 */ 369 */
296 if (w > 32767 || h > 32767) 370 if (w > 32767 || h > 32767)
297 w = 1; 371 w = 1;
… …
314#ifdef ENABLE_TRANSPARENCY 388#ifdef ENABLE_TRANSPARENCY
315 if (!option(Opt_transparent) || !am_transparent) 389 if (!option(Opt_transparent) || !am_transparent)
316 /* will do that in check_our_parents otherwise */ 390 /* will do that in check_our_parents otherwise */
317#endif 391#endif
318 { 392 {
319 ASImage *scaled_im = scale_asimage( display->asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 393 ASImage *scaled_im = scale_asimage (asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
320 if (scaled_im) 394 if (scaled_im)
321 { 395 {
322 pixmap = asimage2pixmap( display->asv, display->root, scaled_im, gc, True ); 396 pixmap = asimage2pixmap(asv, display->root, scaled_im, gc, True);
323 destroy_asimage( &scaled_im ); 397 destroy_asimage (&scaled_im);
324 } 398 }
325 } 399 }
326#else /* HAVE_AFTERIMAGE */ 400#else /* HAVE_AFTERIMAGE */
327 { 401 {
328 float incr, p; 402 float incr, p;
… …
402 * we already have the required attributes 476 * we already have the required attributes
403 */ 477 */
404 /* XGetWindowAttributes (dpy, vt, &attr); */ 478 /* XGetWindowAttributes (dpy, vt, &attr); */
405 479
406#ifdef HAVE_AFTERIMAGE 480#ifdef HAVE_AFTERIMAGE
407 if (asimman == NULL) 481 if (asimman == NULL)
408 asimman = create_generic_imageman(rs[Rs_path]); 482 asimman = create_generic_imageman(rs[Rs_path]);
409 if ((f = strchr (file, ';')) == NULL) 483 if ((f = strchr (file, ';')) == NULL)
410 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 484 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
411 else 485 else
412 { 486 {
413 size_t len = f - file; 487 size_t len = f - file;
414 f = (char *)malloc (len + 1); 488 f = (char *)malloc (len + 1);
415 strncpy (f, file, len); 489 strncpy (f, file, len);
416 f[len] = '\0'; 490 f[len] = '\0';
417 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 491 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
418 free( f ); 492 free( f );
419 } 493 }
420 if (original_asim) 494 if (original_asim)
421 { 495 {
422 bgPixmap.pixmap = asimage2pixmap( display->asv, display->root, original_asim, NULL, True ); 496 bgPixmap.pixmap = asimage2pixmap (asv, display->root, original_asim, NULL, True);
423 xpmAttr.width = original_asim->width ; 497 xpmAttr.width = original_asim->width ;
424 xpmAttr.height = original_asim->height ; 498 xpmAttr.height = original_asim->height ;
425 } 499 }
426#else /* HAVE_AFTERIMAGE */ 500#else /* HAVE_AFTERIMAGE */
427 xpmAttr.closeness = 30000; 501 xpmAttr.closeness = 30000;
428 xpmAttr.colormap = cmap; 502 xpmAttr.colormap = cmap;
429 xpmAttr.visual = visual; 503 xpmAttr.visual = visual;
430 xpmAttr.depth = depth; 504 xpmAttr.depth = depth;
431 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual 505 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
432 | XpmDepth | XpmSize | XpmReturnPixels); 506 | XpmDepth | XpmSize | XpmReturnPixels);
433 507
434 /* search environment variables here too */ 508 /* search environment variables here too */
435 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]); 509 f = rxvt_File_search_path (rs[Rs_path], file, ".xpm");
436 if (f == NULL 510 if (f == NULL
437 || XpmReadFileToPixmap (dpy, display->root, f, 511 || XpmReadFileToPixmap (dpy, display->root, f,
438 &bgPixmap.pixmap, NULL, 512 &bgPixmap.pixmap, NULL,
439 &xpmAttr)) 513 &xpmAttr))
440 { 514 {
… …
702} 776}
703 777
704void 778void
705rxvt_term::check_our_parents_cb (time_watcher &w) 779rxvt_term::check_our_parents_cb (time_watcher &w)
706{ 780{
707 int i, pchanged, aformat, have_pixmap, rootdepth; 781 int i, pchanged, aformat, rootdepth;
708 unsigned long nitems, bytes_after; 782 unsigned long nitems, bytes_after;
709 Atom atype; 783 Atom atype;
710 unsigned char *prop = NULL; 784 unsigned char *prop = NULL;
711 Window root, oldp, *list; 785 Window root, oldp, *list;
712 Pixmap rootpixmap = None; 786 Pixmap rootpixmap = None;
713 XWindowAttributes wattr, wrootattr; 787 XWindowAttributes wattr, wrootattr;
714 int sx, sy; 788 int sx, sy;
715 Window cr; 789 Window cr;
790 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
716 791
717 pchanged = 0; 792 pchanged = 0;
718 793
719 if (!option (Opt_transparent)) 794 if (!option (Opt_transparent))
720 return /*pchanged*/; /* Don't try any more */ 795 return /*pchanged*/; /* Don't try any more */
796
797#if 0
798 struct timeval stv;
799 gettimeofday (&stv,NULL);
800#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\
801 fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\
802 tv.tv_sec*1000000+tv.tv_usec-stv.tv_usec );}while(0)
803#else
804#define PRINT_BACKGROUND_OP_TIME do{}while(0)
805#endif
806
721 807
722 XGetWindowAttributes (dpy, display->root, &wrootattr); 808 XGetWindowAttributes (dpy, display->root, &wrootattr);
723 rootdepth = wrootattr.depth; 809 rootdepth = wrootattr.depth;
724 810
725 XGetWindowAttributes (dpy, parent[0], &wattr); 811 XGetWindowAttributes (dpy, parent[0], &wattr);
… …
739 /* Get all X ops out of the queue so that our information is up-to-date. */ 825 /* Get all X ops out of the queue so that our information is up-to-date. */
740 XSync (dpy, False); 826 XSync (dpy, False);
741 827
742 XTranslateCoordinates (dpy, parent[0], display->root, 828 XTranslateCoordinates (dpy, parent[0], display->root,
743 0, 0, &sx, &sy, &cr); 829 0, 0, &sx, &sy, &cr);
744
745 /* check if we are outside of the visible part of the virtual screen : */ 830 /* check if we are outside of the visible part of the virtual screen : */
746 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0 831 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
747 || sx >= wrootattr.width || sy >= wrootattr.height ) 832 || sx >= wrootattr.width || sy >= wrootattr.height )
748 return /* 0 */ ; 833 return /* 0 */ ;
749 /* 834 /*
750 * Make the frame window set by the window manager have 835 * Make the frame window set by the window manager have
751 * the root background. Some window managers put multiple nested frame 836 * the root background. Some window managers put multiple nested frame
752 * windows for each client, so we have to take care about that. 837 * windows for each client, so we have to take care about that.
… …
760 i = (xa[XA_ESETROOT_PMAP_ID] 845 i = (xa[XA_ESETROOT_PMAP_ID]
761 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID], 846 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
762 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 847 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
763 &nitems, &bytes_after, &prop) == Success); 848 &nitems, &bytes_after, &prop) == Success);
764 849
850 /* TODO: the below logic needs to be cleaned up */
765 if (!i || prop == NULL 851 if (!i || prop == NULL
766#if TINTING 852#if TINTING
767 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL 853 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
768#ifdef HAVE_AFTERIMAGE 854#ifdef HAVE_AFTERIMAGE
769 && original_asim == NULL && rs[Rs_blurradius] == NULL 855 && original_asim == NULL && rs[Rs_blurradius] == NULL
770#endif 856#endif
771 ) 857 )
772#endif 858#endif
773 ) 859 )
774 have_pixmap = 0; 860 rootpixmap = None;
775 else 861 else
776 { 862 {
777 have_pixmap = 1; 863 int junk;
864 unsigned int ujunk;
865 /* root pixmap may be bad - allow a error */
866 allowedxerror = -1;
778 rootpixmap = *(Pixmap *)prop; 867 if ((rootpixmap = *(Pixmap *)prop) != None)
868 if (!XGetGeometry (dpy, rootpixmap, &root, &junk, &junk, &rootpixmap_w, &rootpixmap_h, &ujunk, &ujunk))
869 rootpixmap = None;
870 allowedxerror = 0;
871 }
872
873 if (prop != NULL)
779 XFree (prop); 874 XFree (prop);
875
876 if (rootpixmap != None)
780 } 877 {
781
782 if (have_pixmap)
783 {
784 Bool success = False ; 878 Bool success = False;
785 GC gc = NULL; 879 GC gc = NULL;
786 XGCValues gcvalue; 880 XGCValues gcvalue;
881 int shade = 100;
882 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
883 Bool whole_tint = False, no_tint = True;
884
885 while (sx < 0) sx += (int)wrootattr.width;
886 while (sy < 0) sy += (int)wrootattr.height;
887
888#if TINTING
889 if (rs[Rs_shade])
890 shade = atoi (rs[Rs_shade]);
891 if (ISSET_PIXCOLOR (Color_tint))
892 pix_colors_focused [Color_tint].get (c);
893#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700)
894 if (shade >= 100)
895 whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
896 && IS_COMPONENT_WHOLESOME(c.g)
897 && IS_COMPONENT_WHOLESOME(c.b));
898 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
899#undef IS_COMPONENT_WHOLESOME
900#endif /* TINTING */
901 /* theer are no performance advantages to reusing same pixmap */
902 if (pixmap != None)
903 XFreePixmap (dpy, pixmap);
904 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
905
906#if 0 /* TODO : identify cases where this will be detrimental to performance : */
907 /* we want to tile root pixmap into our own pixmap in this cases :
908 * 1) rootpixmap does not cover our window entirely
909 * 2) whole_tint - we can use server-side tinting or tinting disabled
910 */
911 if ( whole_tint || no_tint || pmap_w < sx + szHint.width || pmap_h < sy + szHint.height)
912 {
913 }
914#endif
915 gcvalue.tile = rootpixmap;
916 gcvalue.fill_style = FillTiled;
917 gcvalue.ts_x_origin = -sx;
918 gcvalue.ts_y_origin = -sy;
919 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue);
920 XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height);
921
922#if TINTING
923 if (whole_tint && !no_tint)
924 {
925 /* In this case we can tint image server-side getting significant
926 * performance improvements, as we eliminate XImage transfer
927 */
928 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
929 gcvalue.function = GXand;
930 gcvalue.fill_style = FillSolid;
931 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue);
932 XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height);
933 }
934#endif
935 success = True;
787#ifdef HAVE_AFTERIMAGE 936#ifdef HAVE_AFTERIMAGE
937 if (rs[Rs_blurradius] || original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
788 { 938 {
789 Pixmap tmp_pmap = None ; 939 ARGB32 tint = TINT_LEAVE_SAME;
790 ShadingInfo shade; 940 ASImage *back_im = NULL;
791 ARGB32 tint ;
792 unsigned int pmap_w = 0, pmap_h = 0;
793 941
794 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h )) 942 back_im = pixmap2ximage (asv, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100);
943 if (back_im != NULL)
795 { 944 {
796 int root_x = 0, root_y = 0; 945 if (!whole_tint && (!no_tint || shade !=100))
797
798 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
799 if (ISSET_PIXCOLOR (Color_tint))
800 { 946 {
801 rgba c; 947 ShadingInfo as_shade;
802 pix_colors_focused [Color_tint].get (c); 948 as_shade.shading = shade;
803 shade.tintColor.red = c.r; 949 as_shade.tintColor.red = c.r;
804 shade.tintColor.green = c.g; 950 as_shade.tintColor.green = c.g;
805 shade.tintColor.blue = c.b; 951 as_shade.tintColor.blue = c.b;
952 tint = shading2tint32 (&as_shade);
806 } 953 }
807 else 954
808 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF; 955 if (rs[Rs_blurradius] && back_im)
809 tint = shading2tint32( &shade );
810 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
811 if (GetWinPosition (parent[0], &root_x, &root_y) )
812 { 956 {
957 double r = atof(rs[Rs_blurradius]);
958 ASImage* tmp = blur_asimage_gauss (asv, back_im, r, r, 0xFFFFFFFF,
959 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
960 100, ASIMAGE_QUALITY_DEFAULT);
961 if (tmp)
962 {
963 destroy_asimage (&back_im);
964 back_im = tmp;
965 }
966 }
967
968 if (original_asim != NULL)
969 {
813 ASImageLayer *layers = create_image_layers( 2 ); 970 ASImageLayer *layers = create_image_layers (2);
814 ASImage *merged_im = NULL; 971 ASImage *merged_im = NULL;
815 int back_x, back_y, back_w, back_h; 972 int fore_w, fore_h;
816 /* merge_layers does good job at tiling background appropriately,
817 so all we need is to cut out smallest possible piece : */
818#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
819 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
820 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
821 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
822 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
823 else \
824 { /* small background - need the whole of it for successfull tiling :*/ \
825 back_##xy = 0; \
826 back_##wh = pmap_##wh; \
827 }}while(0)
828
829 MAKE_ROOTPMAP_GEOM(x,w,width);
830 MAKE_ROOTPMAP_GEOM(y,h,height);
831 973
832 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100); 974 layers[0].im = back_im;
833 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
834 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
835 layers[0].clip_width = szHint.width; 975 layers[0].clip_width = szHint.width;
836 layers[0].clip_height = szHint.height; 976 layers[0].clip_height = szHint.height;
837 layers[0].tint = tint; 977 layers[0].tint = tint;
838 if (rs[Rs_blurradius] && layers[0].im)
839 {
840 double r = atof(rs[Rs_blurradius]);
841 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
842 if( tmp )
843 {
844 destroy_asimage( &layers[0].im );
845 layers[0].im = tmp;
846 }
847 }
848 if (original_asim != NULL)
849 {
850 int fore_w, fore_h;
851 layers[1].im = original_asim; 978 layers[1].im = original_asim;
852 if( bgPixmap.auto_resize ) 979 if (bgPixmap.auto_resize)
853 { 980 {
854 fore_w = szHint.width; 981 fore_w = szHint.width;
855 fore_h = szHint.height; 982 fore_h = szHint.height;
856 } 983 }
857 else 984 else
858 { 985 {
859 fore_w = bgPixmap.w; 986 fore_w = bgPixmap.w;
860 fore_h = bgPixmap.h; 987 fore_h = bgPixmap.h;
861 } 988 }
862 if (fore_w != original_asim->width 989 if (fore_w != original_asim->width
863 || fore_h != original_asim->height) 990 || fore_h != original_asim->height)
864 { 991 {
865 layers[1].im = scale_asimage( display->asv, 992 layers[1].im = scale_asimage (asv,
866 original_asim, 993 original_asim,
867 fore_w, fore_h, 994 fore_w, fore_h,
868 ASA_ASImage, 100, 995 ASA_ASImage, 100,
869 ASIMAGE_QUALITY_DEFAULT ); 996 ASIMAGE_QUALITY_DEFAULT);
870 } 997 }
871
872 layers[1].clip_width = szHint.width; 998 layers[1].clip_width = szHint.width;
873 layers[1].clip_height = szHint.height; 999 layers[1].clip_height = szHint.height;
874 1000
875 if (rs[Rs_blendtype]) 1001 if (rs[Rs_blendtype])
876 { 1002 {
877 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]); 1003 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
878 if( layers[1].merge_scanlines == NULL ) 1004 if (layers[1].merge_scanlines == NULL)
879 layers[1].merge_scanlines = alphablend_scanlines; 1005 layers[1].merge_scanlines = alphablend_scanlines;
880 } 1006 }
881 } 1007 PRINT_BACKGROUND_OP_TIME;
882 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1, 1008 merged_im = merge_layers (asv, layers, 2, szHint.width, szHint.height,
883 szHint.width, szHint.height,
884 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 1009 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
885 if (layers[1].im != original_asim) 1010 if (layers[1].im != original_asim)
886 destroy_asimage( &(layers[1].im) ); 1011 destroy_asimage (&(layers[1].im));
887 destroy_asimage( &(layers[0].im) ); 1012 free (layers);
1013
888 if (merged_im != NULL) 1014 if (merged_im != NULL)
889 { 1015 {
890 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
891 destroy_asimage( &merged_im ); 1016 destroy_asimage (&back_im);
1017 back_im = merged_im;
892 } 1018 }
893 free( layers ); 1019 PRINT_BACKGROUND_OP_TIME;
894 } 1020 }
1021 else if (tint != TINT_LEAVE_SAME)
1022 {
1023 ASImage* tmp = tile_asimage (asv, back_im, 0, 0, szHint.width, szHint.height, tint, ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
1024 if (tmp)
1025 {
1026 destroy_asimage (&back_im);
1027 back_im = tmp;
1028 }
1029 PRINT_BACKGROUND_OP_TIME;
1030 }
1031 asimage2drawable (asv, pixmap, back_im, gc, 0, 0, 0, 0, szHint.width, szHint.height, True);
1032 destroy_asimage (&back_im);
1033 } /* back_im != NULL */
1034 else
1035 success = False;
895 } 1036 }
896 if (tmp_pmap != None)
897 {
898 success = True;
899 if (pixmap != None)
900 XFreePixmap (dpy, pixmap);
901 pixmap = tmp_pmap;
902 }
903 }
904#else /* HAVE_AFTERIMAGE */ 1037#else /* HAVE_AFTERIMAGE */
905 {
906 /*
907 * Copy display->root pixmap transparency
908 */
909 int nx, ny;
910 unsigned int nw, nh;
911 XImage *image;
912
913 nw = (unsigned int)szHint.width;
914 nh = (unsigned int)szHint.height;
915 nx = ny = 0;
916
917 if (sx < 0)
918 {
919 nw += sx;
920 nx = -sx;
921 sx = 0;
922 }
923
924 if (sy < 0)
925 {
926 nh += sy;
927 ny = -sy;
928 sy = 0;
929 }
930
931 min_it (nw, (unsigned int) (wrootattr.width - sx));
932 min_it (nh, (unsigned int) (wrootattr.height - sy));
933
934 XSync (dpy, False);
935 allowedxerror = -1;
936 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
937
938 /* XXX: handle BadMatch - usually because we're outside the pixmap */
939 /* XXX: may need a delay here? */
940 allowedxerror = 0;
941 if (image != NULL)
942 {
943 if (pixmap != None)
944 XFreePixmap (dpy, pixmap);
945
946#if TINTING 1038#if TINTING
947 if (ISSET_PIXCOLOR (Color_tint)) 1039 if (!whole_tint && (!no_tint || shade !=100))
1040 {
1041 XImage *image = XGetImage (dpy, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
1042 success = False;
1043 if (image != NULL)
948 { 1044 {
949 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 1045 PRINT_BACKGROUND_OP_TIME;
950 1046 if (gc == NULL)
951 rgba c; 1047 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
952 pix_colors_focused [Color_tint].get (c); 1048 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
953 ShadeXImage (this, image, shade, c.r, c.g, c.b); 1049 ShadeXImage (this, image, shade, c.r, c.g, c.b);
1050 XPutImage (dpy, pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
1051 XDestroyImage (image);
1052 success = True;
954 } 1053 }
1054 }
955#endif 1055#endif
956
957 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
958 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
959 XPutImage (dpy, pixmap, gc, image, 0, 0,
960 nx, ny, image->width, image->height);
961 XDestroyImage (image);
962 success = True ;
963 }
964 }
965#endif /* HAVE_AFTERIMAGE */ 1056#endif /* HAVE_AFTERIMAGE */
1057 PRINT_BACKGROUND_OP_TIME;
1058
966 if (gc != NULL) 1059 if (gc != NULL)
967 XFreeGC (dpy, gc); 1060 XFreeGC (dpy, gc);
968 1061
969 if (!success) 1062 if (!success)
970 { 1063 {
971 if (am_transparent && am_pixmap_trans) 1064 if (am_transparent && am_pixmap_trans)
… …
988 if (!am_transparent || !am_pixmap_trans) 1081 if (!am_transparent || !am_pixmap_trans)
989 pchanged = 1; 1082 pchanged = 1;
990 1083
991 am_transparent = am_pixmap_trans = 1; 1084 am_transparent = am_pixmap_trans = 1;
992 } 1085 }
993 } 1086 } /* rootpixmap != None */
994 1087
995 if (am_pixmap_trans) 1088 if (am_pixmap_trans)
996 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 1089 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
997 else 1090 else
998 { 1091 {

Diff Legend

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