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.41 by root, Tue Jun 26 00:40:19 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 f = strndup( file, f - file ); 487 size_t len = f - file;
488 f = (char *)malloc (len + 1);
489 strncpy (f, file, len);
490 f[len] = '\0';
416 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 491 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
417 free( f ); 492 free( f );
418 } 493 }
419 if (original_asim) 494 if (original_asim)
420 { 495 {
421 bgPixmap.pixmap = asimage2pixmap( display->asv, display->root, original_asim, NULL, True ); 496 bgPixmap.pixmap = asimage2pixmap (asv, display->root, original_asim, NULL, True);
422 xpmAttr.width = original_asim->width ; 497 xpmAttr.width = original_asim->width ;
423 xpmAttr.height = original_asim->height ; 498 xpmAttr.height = original_asim->height ;
424 } 499 }
425#else /* HAVE_AFTERIMAGE */ 500#else /* HAVE_AFTERIMAGE */
426 xpmAttr.closeness = 30000; 501 xpmAttr.closeness = 30000;
427 xpmAttr.colormap = cmap; 502 xpmAttr.colormap = cmap;
428 xpmAttr.visual = visual; 503 xpmAttr.visual = visual;
429 xpmAttr.depth = depth; 504 xpmAttr.depth = depth;
430 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual 505 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
431 | XpmDepth | XpmSize | XpmReturnPixels); 506 | XpmDepth | XpmSize | XpmReturnPixels);
432 507
433 /* search environment variables here too */ 508 /* search environment variables here too */
434 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]); 509 f = rxvt_File_search_path (rs[Rs_path], file, ".xpm");
435 if (f == NULL 510 if (f == NULL
436 || XpmReadFileToPixmap (dpy, display->root, f, 511 || XpmReadFileToPixmap (dpy, display->root, f,
437 &bgPixmap.pixmap, NULL, 512 &bgPixmap.pixmap, NULL,
438 &xpmAttr)) 513 &xpmAttr))
439 { 514 {
… …
459#if TINTING && !defined(HAVE_AFTERIMAGE) 534#if TINTING && !defined(HAVE_AFTERIMAGE)
460/* taken from aterm-0.4.2 */ 535/* taken from aterm-0.4.2 */
461 536
462typedef uint32_t RUINT32T; 537typedef uint32_t RUINT32T;
463 538
539static void
464void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 540ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
465{ 541{
466 int sh_r, sh_g, sh_b; 542 int sh_r, sh_g, sh_b;
467 RUINT32T mask_r, mask_g, mask_b; 543 RUINT32T mask_r, mask_g, mask_b;
468 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 544 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
469 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 545 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
… …
739 815
740 XTranslateCoordinates (dpy, parent[0], display->root, 816 XTranslateCoordinates (dpy, parent[0], display->root,
741 0, 0, &sx, &sy, &cr); 817 0, 0, &sx, &sy, &cr);
742 818
743 /* 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 : */
744 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0 820 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
745 || sx >= wrootattr.width || sy >= wrootattr.height ) 821 || sx >= wrootattr.width || sy >= wrootattr.height )
746 return /* 0 */ ; 822 return /* 0 */ ;
747 /* 823 /*
748 * Make the frame window set by the window manager have 824 * Make the frame window set by the window manager have
749 * the root background. Some window managers put multiple nested frame 825 * the root background. Some window managers put multiple nested frame
750 * 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.
… …
777 XFree (prop); 853 XFree (prop);
778 } 854 }
779 855
780 if (have_pixmap) 856 if (have_pixmap)
781 { 857 {
782 Bool success = False ; 858 Bool success = False;
783 GC gc = NULL; 859 GC gc = NULL;
784 XGCValues gcvalue; 860 XGCValues gcvalue;
861 unsigned int pmap_w = 0, pmap_h = 0;
862
785#ifdef HAVE_AFTERIMAGE 863#ifdef HAVE_AFTERIMAGE
786 { 864 {
787 Pixmap tmp_pmap = None ; 865 Pixmap tmp_pmap = None;
788 ShadingInfo shade; 866 ShadingInfo shade;
789 ARGB32 tint ; 867 ARGB32 tint;
790 unsigned int pmap_w = 0, pmap_h = 0;
791 868
792 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h )) 869 if (get_dpy_drawable_size (dpy, rootpixmap, &pmap_w, &pmap_h))
793 { 870 {
794 int root_x = 0, root_y = 0; 871 int root_x = 0, root_y = 0;
795 872
796 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 873 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
797 if (ISSET_PIXCOLOR (Color_tint)) 874 if (ISSET_PIXCOLOR (Color_tint))
798 { 875 {
799 rgba c; 876 rgba c;
800 pix_colors_focused [Color_tint].get (c); 877 pix_colors_focused [Color_tint].get (c);
801 shade.tintColor.red = c.r; 878 shade.tintColor.red = c.r;
802 shade.tintColor.green = c.g; 879 shade.tintColor.green = c.g;
803 shade.tintColor.blue = c.b; 880 shade.tintColor.blue = c.b;
804 } 881 }
805 else 882 else
806 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF; 883 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
807 tint = shading2tint32( &shade ); 884 tint = shading2tint32 (&shade);
808 gc = XCreateGC (dpy, vt, 0UL, &gcvalue); 885 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
809 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))
810 { 887 {
811 ASImageLayer *layers = create_image_layers( 2 ); 888 ASImageLayer *layers = create_image_layers (2);
812 ASImage *merged_im = NULL; 889 ASImage *merged_im = NULL;
813 int back_x, back_y, back_w, back_h; 890 int back_x, back_y, back_w, back_h;
814 /* merge_layers does good job at tiling background appropriately, 891 /* merge_layers does good job at tiling background appropriately,
815 so all we need is to cut out smallest possible piece : */ 892 so all we need is to cut out smallest possible piece : */
816#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \ 893#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
817 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \ 894 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
818 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 : */ \
819 if( pmap_##wh >= back_##xy + szHint.widthheight ) \ 896 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
… …
821 else \ 898 else \
822 { /* small background - need the whole of it for successfull tiling :*/ \ 899 { /* small background - need the whole of it for successfull tiling :*/ \
823 back_##xy = 0; \ 900 back_##xy = 0; \
824 back_##wh = pmap_##wh; \ 901 back_##wh = pmap_##wh; \
825 }}while(0) 902 }}while(0)
826 903
827 MAKE_ROOTPMAP_GEOM(x,w,width); 904 MAKE_ROOTPMAP_GEOM(x,w,width);
828 MAKE_ROOTPMAP_GEOM(y,h,height); 905 MAKE_ROOTPMAP_GEOM(y,h,height);
829 906
830 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);
831 layers[0].clip_x = (back_w == pmap_w)?root_x:0; 908 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
832 layers[0].clip_y = (back_h == pmap_h)?root_y:0; 909 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
833 layers[0].clip_width = szHint.width; 910 layers[0].clip_width = szHint.width;
834 layers[0].clip_height = szHint.height; 911 layers[0].clip_height = szHint.height;
835 layers[0].tint = tint; 912 layers[0].tint = tint;
836 if (rs[Rs_blurradius] && layers[0].im) 913 if (rs[Rs_blurradius] && layers[0].im)
837 { 914 {
838 double r = atof(rs[Rs_blurradius]); 915 double r = atof(rs[Rs_blurradius]);
839 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);
840 if( tmp ) 917 if (tmp)
841 { 918 {
842 destroy_asimage( &layers[0].im ); 919 destroy_asimage (&layers[0].im);
843 layers[0].im = tmp; 920 layers[0].im = tmp;
844 } 921 }
845 } 922 }
846 if (original_asim != NULL) 923 if (original_asim != NULL)
847 { 924 {
848 int fore_w, fore_h; 925 int fore_w, fore_h;
849 layers[1].im = original_asim; 926 layers[1].im = original_asim;
850 if( bgPixmap.auto_resize ) 927 if (bgPixmap.auto_resize)
851 { 928 {
852 fore_w = szHint.width; 929 fore_w = szHint.width;
853 fore_h = szHint.height; 930 fore_h = szHint.height;
854 } 931 }
855 else 932 else
… …
858 fore_h = bgPixmap.h; 935 fore_h = bgPixmap.h;
859 } 936 }
860 if (fore_w != original_asim->width 937 if (fore_w != original_asim->width
861 || fore_h != original_asim->height) 938 || fore_h != original_asim->height)
862 { 939 {
863 layers[1].im = scale_asimage( display->asv, 940 layers[1].im = scale_asimage (asv,
864 original_asim, 941 original_asim,
865 fore_w, fore_h, 942 fore_w, fore_h,
866 ASA_ASImage, 100, 943 ASA_ASImage, 100,
867 ASIMAGE_QUALITY_DEFAULT ); 944 ASIMAGE_QUALITY_DEFAULT);
868 } 945 }
869 946
870 layers[1].clip_width = szHint.width; 947 layers[1].clip_width = szHint.width;
871 layers[1].clip_height = szHint.height; 948 layers[1].clip_height = szHint.height;
872 949
873 if (rs[Rs_blendtype]) 950 if (rs[Rs_blendtype])
874 { 951 {
875 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]); 952 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
876 if( layers[1].merge_scanlines == NULL ) 953 if (layers[1].merge_scanlines == NULL)
877 layers[1].merge_scanlines = alphablend_scanlines; 954 layers[1].merge_scanlines = alphablend_scanlines;
878 } 955 }
879 } 956 }
880 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1, 957 merged_im = merge_layers (asv, layers, layers[1].im?2:1,
881 szHint.width, szHint.height, 958 szHint.width, szHint.height,
882 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 959 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
883 if (layers[1].im != original_asim) 960 if (layers[1].im != original_asim)
884 destroy_asimage( &(layers[1].im) ); 961 destroy_asimage (&(layers[1].im));
885 destroy_asimage( &(layers[0].im) ); 962 destroy_asimage (&(layers[0].im));
886 if (merged_im != NULL) 963 if (merged_im != NULL)
887 { 964 {
888 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True ); 965 tmp_pmap = asimage2pixmap (asv, DefaultRootWindow(dpy), merged_im, gc, True);
889 destroy_asimage( &merged_im ); 966 destroy_asimage (&merged_im);
890 } 967 }
891 free( layers ); 968 free (layers);
892 } 969 }
893 } 970 }
894 if (tmp_pmap != None) 971 if (tmp_pmap != None)
895 { 972 {
896 success = True; 973 success = True;
… …
902#else /* HAVE_AFTERIMAGE */ 979#else /* HAVE_AFTERIMAGE */
903 { 980 {
904 /* 981 /*
905 * Copy display->root pixmap transparency 982 * Copy display->root pixmap transparency
906 */ 983 */
984 Window wjunk;
907 int nx, ny; 985 int junk;
908 unsigned int nw, nh; 986 unsigned int ujunk;
909 XImage *image; 987 /* root pixmap may be bad - allow a error */
910 988 allowedxerror = -1;
911 nw = (unsigned int)szHint.width; 989 if (XGetGeometry (dpy, rootpixmap, &wjunk, &junk, &junk, &pmap_w, &pmap_h, &ujunk, &ujunk))
912 nh = (unsigned int)szHint.height;
913 nx = ny = 0;
914
915 if (sx < 0)
916 { 990 {
917 nw += sx; 991 XImage *image = NULL;
918 nx = -sx;
919 sx = 0; 992 int shade = 100;
920 } 993 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
994 Bool whole_tint = False;
921 995
922 if (sy < 0) 996 while (sx < 0) sx += (int)wrootattr.width;
923 { 997 while (sy < 0) sy += (int)wrootattr.height;
924 nh += sy;
925 ny = -sy;
926 sy = 0;
927 }
928 998
929 min_it (nw, (unsigned int) (wrootattr.width - sx));
930 min_it (nh, (unsigned int) (wrootattr.height - sy));
931
932 XSync (dpy, False);
933 allowedxerror = -1;
934 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
935
936 /* XXX: handle BadMatch - usually because we're outside the pixmap */
937 /* XXX: may need a delay here? */
938 allowedxerror = 0;
939 if (image != NULL)
940 {
941 if (pixmap != None) 999 if (pixmap != None)
942 XFreePixmap (dpy, pixmap); 1000 XFreePixmap (dpy, pixmap);
1001 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
943 1002
944#if TINTING 1003#if TINTING
1004 if (rs[Rs_shade])
1005 shade = atoi (rs[Rs_shade]);
945 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 */
946 { 1019 {
947 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 1020 gcvalue.tile = rootpixmap;
948 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)
949 rgba c; 1028 {
950 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)
951 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;
952 } 1057 }
953#endif 1058#endif
954
955 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
956 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
957 XPutImage (dpy, pixmap, gc, image, 0, 0,
958 nx, ny, image->width, image->height);
959 XDestroyImage (image);
960 success = True ;
961 } 1059 }
1060 allowedxerror = 0;
962 } 1061 }
963#endif /* HAVE_AFTERIMAGE */ 1062#endif /* HAVE_AFTERIMAGE */
964 if (gc != NULL) 1063 if (gc != NULL)
965 XFreeGC (dpy, gc); 1064 XFreeGC (dpy, gc);
966 1065
967 if (!success) 1066 if (!success)
968 { 1067 {
969 if (am_transparent && am_pixmap_trans) 1068 if (am_transparent && am_pixmap_trans)

Diff Legend

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