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.43 by ayin, Sat Jun 30 23:31:29 2007 UTC vs.
Revision 1.51 by ayin, Fri Jul 27 14:41:15 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
104/*
105 * Calculate tiling sizes and increments
106 * At start, p == 0, incr == xpmwidthheight
107 */
108static void
31static void rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight); 109rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
110{
111 unsigned int cwh, cxy;
112 float cincr, cp;
113
114 cp = 0;
115 cincr = (float)xpmwidthheight;
116 cxy = *xy;
117 cwh = *wh;
118 if (cwh == 1)
119 { /* display one image, no horizontal/vertical scaling */
120 cincr = (float)widthheight;
121 if (xpmwidthheight <= widthheight)
122 {
123 cwh = xpmwidthheight;
124 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */
125 cwh += cxy;
126 }
127 else
128 {
129 cxy = 0;
130 cwh = widthheight;
131 }
132 }
133 else if (cwh < 10)
134 { /* fit WH images across/down screen */
135 cincr *= cwh;
136 cxy = 0;
137 cwh = widthheight;
138 }
139 else
140 {
141 cincr *= 100.0 / cwh;
142 if (cwh < 100)
143 { /* contract */
144 float pos;
145
146 cwh = (cwh * widthheight) / 100;
147 pos = (float)cxy / 100 * widthheight - (cwh / 2);
148
149 cxy = (widthheight - cwh);
150 if (pos <= 0)
151 cxy = 0;
152 else if (pos < cxy)
153 cxy = (int) pos;
154 cwh += cxy;
155 }
156 else
157 { /* expand */
158 if (cxy > 0)
159 { /* position */
160 float pos;
161
162 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2);
163 cp = xpmwidthheight - cincr;
164 if (pos <= 0)
165 cp = 0;
166 else if (pos < cp)
167 cp = pos;
168 }
169 cxy = 0;
170 cwh = widthheight;
171 }
172 }
173 cincr /= widthheight;
174 *wh = cwh;
175 *xy = cxy;
176 *incr = cincr;
177 *p = cp;
178}
179#endif
32 180
33/* 181/*
34 * These GEOM strings indicate absolute size/position: 182 * These GEOM strings indicate absolute size/position:
35 * @ `WxH+X+Y' 183 * @ `WxH+X+Y'
36 * @ `WxH+X' -> Y = X 184 * @ `WxH+X' -> Y = X
… …
83 if (n < MAXLEN_GEOM) 231 if (n < MAXLEN_GEOM)
84 { 232 {
85 strncpy (str, geom, n); 233 strncpy (str, geom, n);
86 str[n] = '\0'; 234 str[n] = '\0';
87 235
88 if (strcmp(str, "auto") == 0) 236 if (strcmp(str, "auto") == 0)
89 { 237 {
90 if (!bgpixmap->auto_resize) 238 if (!bgpixmap->auto_resize)
91 changed++; 239 changed++;
92 bgpixmap->auto_resize = True ; 240 bgpixmap->auto_resize = True ;
93 w = szHint.width ; 241 w = szHint.width ;
94 h = szHint.height ; 242 h = szHint.height ;
95 flags = WidthValue|HeightValue ; 243 flags = WidthValue|HeightValue ;
96 } 244 }
97 else 245 else
98 { 246 {
99 bgpixmap->auto_resize = False ; 247 bgpixmap->auto_resize = False ;
100 flags = XParseGeometry (str, &x, &y, &w, &h); 248 flags = XParseGeometry (str, &x, &y, &w, &h);
101 } 249 }
102 250
103 if (!flags) 251 if (!flags)
104 { 252 {
… …
209 unsigned int w = bgPixmap.w, h = bgPixmap.h, 357 unsigned int w = bgPixmap.w, h = bgPixmap.h,
210 x = bgPixmap.x, y = bgPixmap.y; 358 x = bgPixmap.x, y = bgPixmap.y;
211 unsigned int xpmh = xpmAttr.height, 359 unsigned int xpmh = xpmAttr.height,
212 xpmw = xpmAttr.width; 360 xpmw = xpmAttr.width;
213 361
214 if (bgPixmap.auto_resize) 362 if (bgPixmap.auto_resize)
215 { 363 {
216 w = szHint.width ; 364 w = szHint.width ;
217 h = szHint.height ; 365 h = szHint.height ;
218 } 366 }
219 /* 367 /*
220 * don't zoom pixmap too much nor expand really small pixmaps 368 * don't zoom pixmap too much nor expand really small pixmaps
221 */ 369 */
222 if (w > 32767 || h > 32767) 370 if (w > 32767 || h > 32767)
223 w = 1; 371 w = 1;
… …
240#ifdef ENABLE_TRANSPARENCY 388#ifdef ENABLE_TRANSPARENCY
241 if (!option(Opt_transparent) || !am_transparent) 389 if (!option(Opt_transparent) || !am_transparent)
242 /* will do that in check_our_parents otherwise */ 390 /* will do that in check_our_parents otherwise */
243#endif 391#endif
244 { 392 {
245 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);
246 if (scaled_im) 394 if (scaled_im)
247 { 395 {
248 pixmap = asimage2pixmap( display->asv, display->root, scaled_im, gc, True ); 396 pixmap = asimage2pixmap(asv, display->root, scaled_im, gc, True);
249 destroy_asimage( &scaled_im ); 397 destroy_asimage (&scaled_im);
250 } 398 }
251 } 399 }
252#else /* HAVE_AFTERIMAGE */ 400#else /* HAVE_AFTERIMAGE */
253 { 401 {
254 float incr, p; 402 float incr, p;
… …
303#ifdef ENABLE_TRANSPARENCY 451#ifdef ENABLE_TRANSPARENCY
304 am_transparent = 0; 452 am_transparent = 0;
305#endif 453#endif
306} 454}
307 455
308/*
309 * Calculate tiling sizes and increments
310 * At start, p == 0, incr == xpmwidthheight
311 */
312static void
313rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
314{
315 unsigned int cwh, cxy;
316 float cincr, cp;
317
318 cp = 0;
319 cincr = (float)xpmwidthheight;
320 cxy = *xy;
321 cwh = *wh;
322 if (cwh == 1)
323 { /* display one image, no horizontal/vertical scaling */
324 cincr = (float)widthheight;
325 if (xpmwidthheight <= widthheight)
326 {
327 cwh = xpmwidthheight;
328 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */
329 cwh += cxy;
330 }
331 else
332 {
333 cxy = 0;
334 cwh = widthheight;
335 }
336 }
337 else if (cwh < 10)
338 { /* fit WH images across/down screen */
339 cincr *= cwh;
340 cxy = 0;
341 cwh = widthheight;
342 }
343 else
344 {
345 cincr *= 100.0 / cwh;
346 if (cwh < 100)
347 { /* contract */
348 float pos;
349
350 cwh = (cwh * widthheight) / 100;
351 pos = (float)cxy / 100 * widthheight - (cwh / 2);
352
353 cxy = (widthheight - cwh);
354 if (pos <= 0)
355 cxy = 0;
356 else if (pos < cxy)
357 cxy = (int) pos;
358 cwh += cxy;
359 }
360 else
361 { /* expand */
362 if (cxy > 0)
363 { /* position */
364 float pos;
365
366 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2);
367 cp = xpmwidthheight - cincr;
368 if (pos <= 0)
369 cp = 0;
370 else if (pos < cp)
371 cp = pos;
372 }
373 cxy = 0;
374 cwh = widthheight;
375 }
376 }
377 cincr /= widthheight;
378 *wh = cwh;
379 *xy = cxy;
380 *incr = cincr;
381 *p = cp;
382}
383
384Pixmap 456Pixmap
385rxvt_term::set_bgPixmap (const char *file) 457rxvt_term::set_bgPixmap (const char *file)
386{ 458{
387 char *f; 459 char *f;
388 460
… …
404 * we already have the required attributes 476 * we already have the required attributes
405 */ 477 */
406 /* XGetWindowAttributes (dpy, vt, &attr); */ 478 /* XGetWindowAttributes (dpy, vt, &attr); */
407 479
408#ifdef HAVE_AFTERIMAGE 480#ifdef HAVE_AFTERIMAGE
409 if (asimman == NULL) 481 if (asimman == NULL)
410 asimman = create_generic_imageman(rs[Rs_path]); 482 asimman = create_generic_imageman(rs[Rs_path]);
411 if ((f = strchr (file, ';')) == NULL) 483 if ((f = strchr (file, ';')) == NULL)
412 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 484 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
413 else 485 else
414 { 486 {
415 size_t len = f - file; 487 size_t len = f - file;
416 f = (char *)malloc (len + 1); 488 f = (char *)malloc (len + 1);
417 strncpy (f, file, len); 489 strncpy (f, file, len);
418 f[len] = '\0'; 490 f[len] = '\0';
419 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 491 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
420 free( f ); 492 free( f );
421 } 493 }
422 if (original_asim) 494 if (original_asim)
423 { 495 {
424 bgPixmap.pixmap = asimage2pixmap( display->asv, display->root, original_asim, NULL, True ); 496 bgPixmap.pixmap = asimage2pixmap (asv, display->root, original_asim, NULL, True);
425 xpmAttr.width = original_asim->width ; 497 xpmAttr.width = original_asim->width ;
426 xpmAttr.height = original_asim->height ; 498 xpmAttr.height = original_asim->height ;
427 } 499 }
428#else /* HAVE_AFTERIMAGE */ 500#else /* HAVE_AFTERIMAGE */
429 xpmAttr.closeness = 30000; 501 xpmAttr.closeness = 30000;
430 xpmAttr.colormap = cmap; 502 xpmAttr.colormap = cmap;
431 xpmAttr.visual = visual; 503 xpmAttr.visual = visual;
432 xpmAttr.depth = depth; 504 xpmAttr.depth = depth;
433 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual 505 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
434 | XpmDepth | XpmSize | XpmReturnPixels); 506 | XpmDepth | XpmSize | XpmReturnPixels);
435 507
436 /* search environment variables here too */ 508 /* search environment variables here too */
437 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]); 509 f = rxvt_File_search_path (rs[Rs_path], file, ".xpm");
438 if (f == NULL 510 if (f == NULL
439 || XpmReadFileToPixmap (dpy, display->root, f, 511 || XpmReadFileToPixmap (dpy, display->root, f,
440 &bgPixmap.pixmap, NULL, 512 &bgPixmap.pixmap, NULL,
441 &xpmAttr)) 513 &xpmAttr))
442 { 514 {
… …
743 815
744 XTranslateCoordinates (dpy, parent[0], display->root, 816 XTranslateCoordinates (dpy, parent[0], display->root,
745 0, 0, &sx, &sy, &cr); 817 0, 0, &sx, &sy, &cr);
746 818
747 /* check if we are outside of the visible part of the virtual screen : */ 819 /* check if we are outside of the visible part of the virtual screen : */
748 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0 820 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
749 || sx >= wrootattr.width || sy >= wrootattr.height ) 821 || sx >= wrootattr.width || sy >= wrootattr.height )
750 return /* 0 */ ; 822 return /* 0 */ ;
751 /* 823 /*
752 * Make the frame window set by the window manager have 824 * Make the frame window set by the window manager have
753 * the root background. Some window managers put multiple nested frame 825 * the root background. Some window managers put multiple nested frame
754 * windows for each client, so we have to take care about that. 826 * windows for each client, so we have to take care about that.
… …
781 XFree (prop); 853 XFree (prop);
782 } 854 }
783 855
784 if (have_pixmap) 856 if (have_pixmap)
785 { 857 {
786 Bool success = False ; 858 Bool success = False;
787 GC gc = NULL; 859 GC gc = NULL;
788 XGCValues gcvalue; 860 XGCValues gcvalue;
861 unsigned int pmap_w = 0, pmap_h = 0;
862
789#ifdef HAVE_AFTERIMAGE 863#ifdef HAVE_AFTERIMAGE
790 { 864 {
791 Pixmap tmp_pmap = None ; 865 Pixmap tmp_pmap = None;
792 ShadingInfo shade; 866 ShadingInfo shade;
793 ARGB32 tint ; 867 ARGB32 tint;
794 unsigned int pmap_w = 0, pmap_h = 0;
795 868
796 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h )) 869 if (get_dpy_drawable_size (dpy, rootpixmap, &pmap_w, &pmap_h))
797 { 870 {
798 int root_x = 0, root_y = 0; 871 int root_x = 0, root_y = 0;
799 872
800 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 873 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
801 if (ISSET_PIXCOLOR (Color_tint)) 874 if (ISSET_PIXCOLOR (Color_tint))
802 { 875 {
803 rgba c; 876 rgba c;
804 pix_colors_focused [Color_tint].get (c); 877 pix_colors_focused [Color_tint].get (c);
805 shade.tintColor.red = c.r; 878 shade.tintColor.red = c.r;
806 shade.tintColor.green = c.g; 879 shade.tintColor.green = c.g;
807 shade.tintColor.blue = c.b; 880 shade.tintColor.blue = c.b;
808 } 881 }
809 else 882 else
810 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF; 883 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
811 tint = shading2tint32( &shade ); 884 tint = shading2tint32 (&shade);
812 gc = XCreateGC (dpy, vt, 0UL, &gcvalue); 885 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
813 if (GetWinPosition (parent[0], &root_x, &root_y) ) 886 if (get_dpy_window_position (dpy, display->root, parent[0], NULL, NULL, &root_x, &root_y))
814 { 887 {
815 ASImageLayer *layers = create_image_layers( 2 ); 888 ASImageLayer *layers = create_image_layers (2);
816 ASImage *merged_im = NULL; 889 ASImage *merged_im = NULL;
817 int back_x, back_y, back_w, back_h; 890 int back_x, back_y, back_w, back_h;
818 /* merge_layers does good job at tiling background appropriately, 891 /* merge_layers does good job at tiling background appropriately,
819 so all we need is to cut out smallest possible piece : */ 892 so all we need is to cut out smallest possible piece : */
820#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \ 893#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
821 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \ 894 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
822 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \ 895 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
823 if( pmap_##wh >= back_##xy + szHint.widthheight ) \ 896 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
… …
825 else \ 898 else \
826 { /* small background - need the whole of it for successfull tiling :*/ \ 899 { /* small background - need the whole of it for successfull tiling :*/ \
827 back_##xy = 0; \ 900 back_##xy = 0; \
828 back_##wh = pmap_##wh; \ 901 back_##wh = pmap_##wh; \
829 }}while(0) 902 }}while(0)
830 903
831 MAKE_ROOTPMAP_GEOM(x,w,width); 904 MAKE_ROOTPMAP_GEOM(x,w,width);
832 MAKE_ROOTPMAP_GEOM(y,h,height); 905 MAKE_ROOTPMAP_GEOM(y,h,height);
833 906
834 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100); 907 layers[0].im = pixmap2asimage (asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
835 layers[0].clip_x = (back_w == pmap_w)?root_x:0; 908 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
836 layers[0].clip_y = (back_h == pmap_h)?root_y:0; 909 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
837 layers[0].clip_width = szHint.width; 910 layers[0].clip_width = szHint.width;
838 layers[0].clip_height = szHint.height; 911 layers[0].clip_height = szHint.height;
839 layers[0].tint = tint; 912 layers[0].tint = tint;
840 if (rs[Rs_blurradius] && layers[0].im) 913 if (rs[Rs_blurradius] && layers[0].im)
841 { 914 {
842 double r = atof(rs[Rs_blurradius]); 915 double r = atof(rs[Rs_blurradius]);
843 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT ); 916 ASImage* tmp = blur_asimage_gauss (asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT);
844 if( tmp ) 917 if (tmp)
845 { 918 {
846 destroy_asimage( &layers[0].im ); 919 destroy_asimage (&layers[0].im);
847 layers[0].im = tmp; 920 layers[0].im = tmp;
848 } 921 }
849 } 922 }
850 if (original_asim != NULL) 923 if (original_asim != NULL)
851 { 924 {
852 int fore_w, fore_h; 925 int fore_w, fore_h;
853 layers[1].im = original_asim; 926 layers[1].im = original_asim;
854 if( bgPixmap.auto_resize ) 927 if (bgPixmap.auto_resize)
855 { 928 {
856 fore_w = szHint.width; 929 fore_w = szHint.width;
857 fore_h = szHint.height; 930 fore_h = szHint.height;
858 } 931 }
859 else 932 else
… …
862 fore_h = bgPixmap.h; 935 fore_h = bgPixmap.h;
863 } 936 }
864 if (fore_w != original_asim->width 937 if (fore_w != original_asim->width
865 || fore_h != original_asim->height) 938 || fore_h != original_asim->height)
866 { 939 {
867 layers[1].im = scale_asimage( display->asv, 940 layers[1].im = scale_asimage (asv,
868 original_asim, 941 original_asim,
869 fore_w, fore_h, 942 fore_w, fore_h,
870 ASA_ASImage, 100, 943 ASA_ASImage, 100,
871 ASIMAGE_QUALITY_DEFAULT ); 944 ASIMAGE_QUALITY_DEFAULT);
872 } 945 }
873 946
874 layers[1].clip_width = szHint.width; 947 layers[1].clip_width = szHint.width;
875 layers[1].clip_height = szHint.height; 948 layers[1].clip_height = szHint.height;
876 949
877 if (rs[Rs_blendtype]) 950 if (rs[Rs_blendtype])
878 { 951 {
879 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]); 952 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
880 if( layers[1].merge_scanlines == NULL ) 953 if (layers[1].merge_scanlines == NULL)
881 layers[1].merge_scanlines = alphablend_scanlines; 954 layers[1].merge_scanlines = alphablend_scanlines;
882 } 955 }
883 } 956 }
884 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1, 957 merged_im = merge_layers (asv, layers, layers[1].im?2:1,
885 szHint.width, szHint.height, 958 szHint.width, szHint.height,
886 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 959 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
887 if (layers[1].im != original_asim) 960 if (layers[1].im != original_asim)
888 destroy_asimage( &(layers[1].im) ); 961 destroy_asimage (&(layers[1].im));
889 destroy_asimage( &(layers[0].im) ); 962 destroy_asimage (&(layers[0].im));
890 if (merged_im != NULL) 963 if (merged_im != NULL)
891 { 964 {
892 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True ); 965 tmp_pmap = asimage2pixmap (asv, DefaultRootWindow(dpy), merged_im, gc, True);
893 destroy_asimage( &merged_im ); 966 destroy_asimage (&merged_im);
894 } 967 }
895 free( layers ); 968 free (layers);
896 } 969 }
897 } 970 }
898 if (tmp_pmap != None) 971 if (tmp_pmap != None)
899 { 972 {
900 success = True; 973 success = True;
… …
906#else /* HAVE_AFTERIMAGE */ 979#else /* HAVE_AFTERIMAGE */
907 { 980 {
908 /* 981 /*
909 * Copy display->root pixmap transparency 982 * Copy display->root pixmap transparency
910 */ 983 */
984 Window wjunk;
911 int nx, ny; 985 int junk;
912 unsigned int nw, nh; 986 unsigned int ujunk;
913 XImage *image; 987 /* root pixmap may be bad - allow a error */
914 988 allowedxerror = -1;
915 nw = (unsigned int)szHint.width; 989 if (XGetGeometry (dpy, rootpixmap, &wjunk, &junk, &junk, &pmap_w, &pmap_h, &ujunk, &ujunk))
916 nh = (unsigned int)szHint.height;
917 nx = ny = 0;
918
919 if (sx < 0)
920 { 990 {
921 nw += sx; 991 XImage *image = NULL;
922 nx = -sx;
923 sx = 0; 992 int shade = 100;
924 } 993 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
994 Bool whole_tint = False;
925 995
926 if (sy < 0) 996 while (sx < 0) sx += (int)wrootattr.width;
927 { 997 while (sy < 0) sy += (int)wrootattr.height;
928 nh += sy;
929 ny = -sy;
930 sy = 0;
931 }
932 998
933 min_it (nw, (unsigned int) (wrootattr.width - sx));
934 min_it (nh, (unsigned int) (wrootattr.height - sy));
935
936 XSync (dpy, False);
937 allowedxerror = -1;
938 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
939
940 /* XXX: handle BadMatch - usually because we're outside the pixmap */
941 /* XXX: may need a delay here? */
942 allowedxerror = 0;
943 if (image != NULL)
944 {
945 if (pixmap != None) 999 if (pixmap != None)
946 XFreePixmap (dpy, pixmap); 1000 XFreePixmap (dpy, pixmap);
1001 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
947 1002
948#if TINTING 1003#if TINTING
1004 if (rs[Rs_shade])
1005 shade = atoi (rs[Rs_shade]);
949 if (ISSET_PIXCOLOR (Color_tint)) 1006 if (ISSET_PIXCOLOR (Color_tint))
1007 pix_colors_focused [Color_tint].get (c);
1008#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700)
1009 if (shade >= 100)
1010 whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
1011 && IS_COMPONENT_WHOLESOME(c.g)
1012 && IS_COMPONENT_WHOLESOME(c.b));
1013#undef IS_COMPONENT_WHOLESOME
1014
1015 /* If No tinting to be done - simply tile root pixmap on our pixmap -
1016 * no need in XImage at all, thus following if() only for case with tinting */
1017 if (whole_tint || pmap_w < sx + szHint.width || pmap_h < sy + szHint.height)
1018#endif /* TINTING */
950 { 1019 {
951 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 1020 gcvalue.tile = rootpixmap;
952 1021 gcvalue.fill_style = FillTiled;
1022 gcvalue.ts_x_origin = -sx;
1023 gcvalue.ts_y_origin = -sy;
1024 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue);
1025 XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height);
1026#if TINTING
1027 if (whole_tint)
953 rgba c; 1028 {
954 pix_colors_focused [Color_tint].get (c); 1029 /* In this case we can tint image server-side getting significant
1030 * performance improvements, as we eliminate XImage transfer
1031 */
1032 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
1033 gcvalue.function = GXand;
1034 gcvalue.fill_style = FillSolid;
1035 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue);
1036 XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height);
1037 success = True;
1038 }
1039 else
1040 image = XGetImage (dpy, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
1041#else
1042 success = True;
1043#endif /* TINTING */
1044 }
1045#if TINTING
1046 if (!success && image == NULL)
1047 image = XGetImage (dpy, rootpixmap, sx, sy, szHint.width, szHint.height, AllPlanes, ZPixmap);
1048 if (image != NULL)
1049 {
1050 if (gc == NULL)
1051 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1052 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
955 ShadeXImage (this, image, shade, c.r, c.g, c.b); 1053 ShadeXImage (this, image, shade, c.r, c.g, c.b);
1054 XPutImage (dpy, pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
1055 XDestroyImage (image);
1056 success = True;
956 } 1057 }
957#endif 1058#endif
958
959 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
960 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
961 XPutImage (dpy, pixmap, gc, image, 0, 0,
962 nx, ny, image->width, image->height);
963 XDestroyImage (image);
964 success = True ;
965 } 1059 }
1060 allowedxerror = 0;
966 } 1061 }
967#endif /* HAVE_AFTERIMAGE */ 1062#endif /* HAVE_AFTERIMAGE */
968 if (gc != NULL) 1063 if (gc != NULL)
969 XFreeGC (dpy, gc); 1064 XFreeGC (dpy, gc);
970 1065
971 if (!success) 1066 if (!success)
972 { 1067 {
973 if (am_transparent && am_pixmap_trans) 1068 if (am_transparent && am_pixmap_trans)

Diff Legend

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