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.47 by root, Tue Jul 24 14:31:45 2007 UTC vs.
Revision 1.54 by ayin, Thu Aug 2 00:09:54 2007 UTC

… …
25 25
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
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
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
180 30
181/* 31/*
182 * These GEOM strings indicate absolute size/position: 32 * These GEOM strings indicate absolute size/position:
183 * @ `WxH+X+Y' 33 * @ `WxH+X+Y'
184 * @ `WxH+X' -> Y = X 34 * @ `WxH+X' -> Y = X
… …
231 if (n < MAXLEN_GEOM) 81 if (n < MAXLEN_GEOM)
232 { 82 {
233 strncpy (str, geom, n); 83 strncpy (str, geom, n);
234 str[n] = '\0'; 84 str[n] = '\0';
235 85
236 if (strcmp(str, "auto") == 0) 86 if (strcmp(str, "auto") == 0)
237 { 87 {
238 if (!bgpixmap->auto_resize) 88 if (!bgpixmap->auto_resize)
239 changed++; 89 changed++;
240 bgpixmap->auto_resize = True ; 90 bgpixmap->auto_resize = True ;
241 w = szHint.width ; 91 w = szHint.width ;
242 h = szHint.height ; 92 h = szHint.height ;
243 flags = WidthValue|HeightValue ; 93 flags = WidthValue|HeightValue ;
244 } 94 }
245 else 95 else
246 { 96 {
247 bgpixmap->auto_resize = False ; 97 bgpixmap->auto_resize = False ;
248 flags = XParseGeometry (str, &x, &y, &w, &h); 98 flags = XParseGeometry (str, &x, &y, &w, &h);
249 } 99 }
250 100
251 if (!flags) 101 if (!flags)
252 { 102 {
… …
357 unsigned int w = bgPixmap.w, h = bgPixmap.h, 207 unsigned int w = bgPixmap.w, h = bgPixmap.h,
358 x = bgPixmap.x, y = bgPixmap.y; 208 x = bgPixmap.x, y = bgPixmap.y;
359 unsigned int xpmh = xpmAttr.height, 209 unsigned int xpmh = xpmAttr.height,
360 xpmw = xpmAttr.width; 210 xpmw = xpmAttr.width;
361 211
362 if (bgPixmap.auto_resize) 212 if (bgPixmap.auto_resize)
363 { 213 {
364 w = szHint.width ; 214 w = szHint.width ;
365 h = szHint.height ; 215 h = szHint.height ;
366 } 216 }
367 /* 217 /*
368 * don't zoom pixmap too much nor expand really small pixmaps 218 * don't zoom pixmap too much nor expand really small pixmaps
369 */ 219 */
370 if (w > 32767 || h > 32767) 220 if (w > 32767 || h > 32767)
371 w = 1; 221 w = 1;
… …
382 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y); 232 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y);
383 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0); 233 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0);
384 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y); 234 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y);
385 } 235 }
386 else 236 else
387#ifdef HAVE_AFTERIMAGE
388#ifdef ENABLE_TRANSPARENCY 237#ifdef ENABLE_TRANSPARENCY
389 if (!option(Opt_transparent) || !am_transparent) 238 if (!option(Opt_transparent) || !am_transparent)
390 /* will do that in check_our_parents otherwise */ 239 /* will do that in check_our_parents otherwise */
391#endif 240#endif
392 { 241 {
393 ASImage *scaled_im = scale_asimage (asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 242 ASImage *scaled_im = scale_asimage (asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
394 if (scaled_im) 243 if (scaled_im)
395 { 244 {
396 pixmap = AFTERIMAGE_DPY_OP (asimage2pixmap(asv, display->root, scaled_im, gc, True)); 245 pixmap = asimage2pixmap(asv, display->root, scaled_im, gc, True);
397 destroy_asimage (&scaled_im); 246 destroy_asimage (&scaled_im);
398 } 247 }
399 } 248 }
400#else /* HAVE_AFTERIMAGE */
401 {
402 float incr, p;
403 Pixmap tmp;
404
405 pixmap = XCreatePixmap (dpy, vt, width, height, depth);
406 /*
407 * horizontal scaling
408 */
409 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
410
411 tmp = XCreatePixmap (dpy, vt, width, xpmh, depth);
412 XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh);
413
414 for ( /*nil */ ; x < w; x++, p += incr)
415 {
416 if (p >= xpmw)
417 p = 0;
418
419 /* copy one column from the original pixmap to the tmp pixmap */
420 XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0);
421 }
422
423 /*
424 * vertical scaling
425 */
426 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
427
428 if (y > 0)
429 XFillRectangle (dpy, pixmap, gc, 0, 0, width, y);
430
431 if (h < height)
432 XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1);
433
434 for ( /*nil */ ; y < h; y++, p += incr)
435 {
436 if (p >= xpmh)
437 p = 0;
438
439 /* copy one row from the tmp pixmap to the main pixmap */
440 XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y);
441 }
442
443 XFreePixmap (dpy, tmp);
444 }
445#endif /* HAVE_AFTERIMAGE */
446 } 249 }
447 250
448 XSetWindowBackgroundPixmap (dpy, vt, pixmap); 251 XSetWindowBackgroundPixmap (dpy, vt, pixmap);
449 252
450 XFreeGC (dpy, gc); 253 XFreeGC (dpy, gc);
… …
475 /* 278 /*
476 * we already have the required attributes 279 * we already have the required attributes
477 */ 280 */
478 /* XGetWindowAttributes (dpy, vt, &attr); */ 281 /* XGetWindowAttributes (dpy, vt, &attr); */
479 282
480#ifdef HAVE_AFTERIMAGE
481 if (asimman == NULL) 283 if (asimman == NULL)
482 asimman = create_generic_imageman(rs[Rs_path]); 284 asimman = create_generic_imageman(rs[Rs_path]);
483 if ((f = strchr (file, ';')) == NULL) 285 if ((f = strchr (file, ';')) == NULL)
484 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 286 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );
485 else 287 else
486 { 288 {
487 size_t len = f - file; 289 size_t len = f - file;
488 f = (char *)malloc (len + 1); 290 f = (char *)malloc (len + 1);
489 strncpy (f, file, len); 291 strncpy (f, file, len);
490 f[len] = '\0'; 292 f[len] = '\0';
491 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 293 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );
492 free( f ); 294 free( f );
493 } 295 }
494 if (original_asim) 296 if (original_asim)
495 { 297 {
496 bgPixmap.pixmap = AFTERIMAGE_DPY_OP (asimage2pixmap (asv, display->root, original_asim, NULL, True)); 298 bgPixmap.pixmap = asimage2pixmap (asv, display->root, original_asim, NULL, True);
497 xpmAttr.width = original_asim->width ; 299 xpmAttr.width = original_asim->width ;
498 xpmAttr.height = original_asim->height ; 300 xpmAttr.height = original_asim->height ;
499 }
500#else /* HAVE_AFTERIMAGE */
501 xpmAttr.closeness = 30000;
502 xpmAttr.colormap = cmap;
503 xpmAttr.visual = visual;
504 xpmAttr.depth = depth;
505 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
506 | XpmDepth | XpmSize | XpmReturnPixels);
507
508 /* search environment variables here too */
509 f = rxvt_File_search_path (rs[Rs_path], file, ".xpm");
510 if (f == NULL
511 || XpmReadFileToPixmap (dpy, display->root, f,
512 &bgPixmap.pixmap, NULL,
513 &xpmAttr))
514 { 301 }
515 char *p;
516
517 /* semi-colon delimited */
518 if ((p = strchr (file, ';')) == NULL)
519 p = strchr (file, '\0');
520
521 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.\n", (p - file), file);
522 }
523 free (f);
524#endif /* HAVE_AFTERIMAGE */
525 } 302 }
526 303
527 resize_pixmap (); 304 resize_pixmap ();
528 return bgPixmap.pixmap; 305 return bgPixmap.pixmap;
529} 306}
… …
776} 553}
777 554
778void 555void
779rxvt_term::check_our_parents_cb (time_watcher &w) 556rxvt_term::check_our_parents_cb (time_watcher &w)
780{ 557{
781 int i, pchanged, aformat, have_pixmap, rootdepth; 558 int i, pchanged, aformat, rootdepth;
782 unsigned long nitems, bytes_after; 559 unsigned long nitems, bytes_after;
783 Atom atype; 560 Atom atype;
784 unsigned char *prop = NULL; 561 unsigned char *prop = NULL;
785 Window root, oldp, *list; 562 Window root, oldp, *list;
786 Pixmap rootpixmap = None; 563 Pixmap rootpixmap = None;
787 XWindowAttributes wattr, wrootattr; 564 XWindowAttributes wattr, wrootattr;
788 int sx, sy; 565 int sx, sy;
789 Window cr; 566 Window cr;
567 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
790 568
791 pchanged = 0; 569 pchanged = 0;
792 570
793 if (!option (Opt_transparent)) 571 if (!option (Opt_transparent))
794 return /*pchanged*/; /* Don't try any more */ 572 return /*pchanged*/; /* Don't try any more */
573
574#if 0
575 struct timeval stv;
576 gettimeofday (&stv,NULL);
577#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\
578 fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\
579 tv.tv_sec*1000000+tv.tv_usec-stv.tv_usec );}while(0)
580#else
581#define PRINT_BACKGROUND_OP_TIME do{}while(0)
582#endif
583
795 584
796 XGetWindowAttributes (dpy, display->root, &wrootattr); 585 XGetWindowAttributes (dpy, display->root, &wrootattr);
797 rootdepth = wrootattr.depth; 586 rootdepth = wrootattr.depth;
798 587
799 XGetWindowAttributes (dpy, parent[0], &wattr); 588 XGetWindowAttributes (dpy, parent[0], &wattr);
… …
813 /* Get all X ops out of the queue so that our information is up-to-date. */ 602 /* Get all X ops out of the queue so that our information is up-to-date. */
814 XSync (dpy, False); 603 XSync (dpy, False);
815 604
816 XTranslateCoordinates (dpy, parent[0], display->root, 605 XTranslateCoordinates (dpy, parent[0], display->root,
817 0, 0, &sx, &sy, &cr); 606 0, 0, &sx, &sy, &cr);
818
819 /* check if we are outside of the visible part of the virtual screen : */ 607 /* check if we are outside of the visible part of the virtual screen : */
820 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0 608 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
821 || sx >= wrootattr.width || sy >= wrootattr.height ) 609 || sx >= wrootattr.width || sy >= wrootattr.height )
822 return /* 0 */ ; 610 return /* 0 */ ;
823 /* 611 /*
824 * Make the frame window set by the window manager have 612 * Make the frame window set by the window manager have
825 * the root background. Some window managers put multiple nested frame 613 * the root background. Some window managers put multiple nested frame
826 * windows for each client, so we have to take care about that. 614 * windows for each client, so we have to take care about that.
… …
834 i = (xa[XA_ESETROOT_PMAP_ID] 622 i = (xa[XA_ESETROOT_PMAP_ID]
835 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID], 623 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
836 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 624 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
837 &nitems, &bytes_after, &prop) == Success); 625 &nitems, &bytes_after, &prop) == Success);
838 626
627 /* TODO: the below logic needs to be cleaned up */
839 if (!i || prop == NULL 628 if (!i || prop == NULL
840#if TINTING 629#if TINTING
841 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL 630 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
842#ifdef HAVE_AFTERIMAGE 631#ifdef HAVE_AFTERIMAGE
843 && original_asim == NULL && rs[Rs_blurradius] == NULL 632 && original_asim == NULL && rs[Rs_blurradius] == NULL
844#endif 633#endif
845 ) 634 )
846#endif 635#endif
847 ) 636 )
848 have_pixmap = 0; 637 rootpixmap = None;
849 else 638 else
850 { 639 {
851 have_pixmap = 1; 640 int junk;
641 unsigned int ujunk;
642 /* root pixmap may be bad - allow a error */
643 allowedxerror = -1;
852 rootpixmap = *(Pixmap *)prop; 644 if ((rootpixmap = *(Pixmap *)prop) != None)
645 if (!XGetGeometry (dpy, rootpixmap, &root, &junk, &junk, &rootpixmap_w, &rootpixmap_h, &ujunk, &ujunk))
646 rootpixmap = None;
647 allowedxerror = 0;
648 }
649
650 if (prop != NULL)
853 XFree (prop); 651 XFree (prop);
652
653 if (rootpixmap != None)
854 } 654 {
855
856 if (have_pixmap)
857 {
858 Bool success = False ; 655 Bool success = False;
859 GC gc = NULL; 656 GC gc = NULL;
860 XGCValues gcvalue; 657 XGCValues gcvalue;
658 int shade = 100;
659 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
660 Bool whole_tint = False, no_tint = True;
661
662 while (sx < 0) sx += (int)wrootattr.width;
663 while (sy < 0) sy += (int)wrootattr.height;
664
665#if TINTING
666 if (rs[Rs_shade])
667 shade = atoi (rs[Rs_shade]);
668 if (ISSET_PIXCOLOR (Color_tint))
669 pix_colors_focused [Color_tint].get (c);
670#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700)
671 if (shade >= 100)
672 whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
673 && IS_COMPONENT_WHOLESOME(c.g)
674 && IS_COMPONENT_WHOLESOME(c.b));
675 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
676#undef IS_COMPONENT_WHOLESOME
677#endif /* TINTING */
678 /* theer are no performance advantages to reusing same pixmap */
679 if (pixmap != None)
680 XFreePixmap (dpy, pixmap);
681 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
682
683#if 0 /* TODO : identify cases where this will be detrimental to performance : */
684 /* we want to tile root pixmap into our own pixmap in this cases :
685 * 1) rootpixmap does not cover our window entirely
686 * 2) whole_tint - we can use server-side tinting or tinting disabled
687 */
688 if ( whole_tint || no_tint || pmap_w < sx + szHint.width || pmap_h < sy + szHint.height)
689 {
690 }
691#endif
692 gcvalue.tile = rootpixmap;
693 gcvalue.fill_style = FillTiled;
694 gcvalue.ts_x_origin = -sx;
695 gcvalue.ts_y_origin = -sy;
696 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue);
697 XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height);
698
699#if TINTING
700 if (whole_tint && !no_tint)
701 {
702 /* In this case we can tint image server-side getting significant
703 * performance improvements, as we eliminate XImage transfer
704 */
705 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
706 gcvalue.function = GXand;
707 gcvalue.fill_style = FillSolid;
708 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue);
709 XFillRectangle (dpy, pixmap, gc, 0, 0, szHint.width, szHint.height);
710 }
711#endif
712 success = True;
861#ifdef HAVE_AFTERIMAGE 713#ifdef HAVE_AFTERIMAGE
714 if (rs[Rs_blurradius] || original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
862 { 715 {
863 Pixmap tmp_pmap = None ; 716 ARGB32 tint = TINT_LEAVE_SAME;
864 ShadingInfo shade; 717 ASImage *back_im = NULL;
865 ARGB32 tint ;
866 unsigned int pmap_w = 0, pmap_h = 0;
867 718
868 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h )) 719 back_im = pixmap2ximage (asv, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100);
720 if (back_im != NULL)
869 { 721 {
870 int root_x = 0, root_y = 0; 722 if (!whole_tint && (!no_tint || shade !=100))
871
872 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
873 if (ISSET_PIXCOLOR (Color_tint))
874 { 723 {
875 rgba c; 724 ShadingInfo as_shade;
876 pix_colors_focused [Color_tint].get (c); 725 as_shade.shading = shade;
877 shade.tintColor.red = c.r; 726 as_shade.tintColor.red = c.r;
878 shade.tintColor.green = c.g; 727 as_shade.tintColor.green = c.g;
879 shade.tintColor.blue = c.b; 728 as_shade.tintColor.blue = c.b;
729 tint = shading2tint32 (&as_shade);
880 } 730 }
881 else 731
882 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF; 732 if (rs[Rs_blurradius] && back_im)
883 tint = shading2tint32( &shade );
884 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
885 if (GetWinPosition (parent[0], &root_x, &root_y) )
886 { 733 {
734 ASImage* tmp;
735 int junk;
736 unsigned int hr = 1, vr = 1;
737 int flags = XParseGeometry (rs[Rs_blurradius], &junk, &junk, &hr, &vr);
738 if (!(flags&WidthValue))
739 hr = 1;
740 if (!(flags&HeightValue))
741 vr = hr;
742 tmp = blur_asimage_gauss (asv, back_im, hr, vr, 0xFFFFFFFF,
743 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
744 100, ASIMAGE_QUALITY_DEFAULT);
745 if (tmp)
746 {
747 destroy_asimage (&back_im);
748 back_im = tmp;
749 }
750 }
751
752 if (original_asim != NULL)
753 {
887 ASImageLayer *layers = create_image_layers( 2 ); 754 ASImageLayer *layers = create_image_layers (2);
888 ASImage *merged_im = NULL; 755 ASImage *merged_im = NULL;
889 int back_x, back_y, back_w, back_h; 756 int fore_w, fore_h;
890 /* merge_layers does good job at tiling background appropriately,
891 so all we need is to cut out smallest possible piece : */
892#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
893 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
894 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
895 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
896 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
897 else \
898 { /* small background - need the whole of it for successfull tiling :*/ \
899 back_##xy = 0; \
900 back_##wh = pmap_##wh; \
901 }}while(0)
902
903 MAKE_ROOTPMAP_GEOM(x,w,width);
904 MAKE_ROOTPMAP_GEOM(y,h,height);
905 757
906 layers[0].im = AFTERIMAGE_DPY_OP (pixmap2asimage (asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100)); 758 layers[0].im = back_im;
907 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
908 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
909 layers[0].clip_width = szHint.width; 759 layers[0].clip_width = szHint.width;
910 layers[0].clip_height = szHint.height; 760 layers[0].clip_height = szHint.height;
911 layers[0].tint = tint; 761 layers[0].tint = tint;
912 if (rs[Rs_blurradius] && layers[0].im)
913 {
914 double r = atof(rs[Rs_blurradius]);
915 ASImage* tmp = blur_asimage_gauss(asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
916 if( tmp )
917 {
918 destroy_asimage( &layers[0].im );
919 layers[0].im = tmp;
920 }
921 }
922 if (original_asim != NULL)
923 {
924 int fore_w, fore_h;
925 layers[1].im = original_asim; 762 layers[1].im = original_asim;
926 if( bgPixmap.auto_resize ) 763 if (bgPixmap.auto_resize)
927 { 764 {
928 fore_w = szHint.width; 765 fore_w = szHint.width;
929 fore_h = szHint.height; 766 fore_h = szHint.height;
930 } 767 }
931 else 768 else
932 { 769 {
933 fore_w = bgPixmap.w; 770 fore_w = bgPixmap.w;
934 fore_h = bgPixmap.h; 771 fore_h = bgPixmap.h;
935 } 772 }
936 if (fore_w != original_asim->width 773 if (fore_w != original_asim->width
937 || fore_h != original_asim->height) 774 || fore_h != original_asim->height)
938 { 775 {
939 layers[1].im = scale_asimage( asv, 776 layers[1].im = scale_asimage (asv,
940 original_asim, 777 original_asim,
941 fore_w, fore_h, 778 fore_w, fore_h,
942 ASA_ASImage, 100, 779 ASA_ASImage, 100,
943 ASIMAGE_QUALITY_DEFAULT ); 780 ASIMAGE_QUALITY_DEFAULT);
944 } 781 }
945
946 layers[1].clip_width = szHint.width; 782 layers[1].clip_width = szHint.width;
947 layers[1].clip_height = szHint.height; 783 layers[1].clip_height = szHint.height;
948 784
949 if (rs[Rs_blendtype]) 785 if (rs[Rs_blendtype])
950 { 786 {
951 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]); 787 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
952 if( layers[1].merge_scanlines == NULL ) 788 if (layers[1].merge_scanlines == NULL)
953 layers[1].merge_scanlines = alphablend_scanlines; 789 layers[1].merge_scanlines = alphablend_scanlines;
954 } 790 }
955 } 791 PRINT_BACKGROUND_OP_TIME;
956 merged_im = merge_layers( asv, layers, layers[1].im?2:1, 792 merged_im = merge_layers (asv, layers, 2, szHint.width, szHint.height,
957 szHint.width, szHint.height,
958 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 793 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
959 if (layers[1].im != original_asim) 794 if (layers[1].im != original_asim)
960 destroy_asimage( &(layers[1].im) ); 795 destroy_asimage (&(layers[1].im));
961 destroy_asimage( &(layers[0].im) ); 796 free (layers);
797
962 if (merged_im != NULL) 798 if (merged_im != NULL)
963 { 799 {
964 tmp_pmap = AFTERIMAGE_DPY_OP (asimage2pixmap (asv, DefaultRootWindow(dpy), merged_im, gc, True));
965 destroy_asimage( &merged_im ); 800 destroy_asimage (&back_im);
801 back_im = merged_im;
966 } 802 }
967 free( layers ); 803 PRINT_BACKGROUND_OP_TIME;
968 } 804 }
805 else if (tint != TINT_LEAVE_SAME)
806 {
807 ASImage* tmp = tile_asimage (asv, back_im, 0, 0, szHint.width, szHint.height, tint, ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
808 if (tmp)
809 {
810 destroy_asimage (&back_im);
811 back_im = tmp;
812 }
813 PRINT_BACKGROUND_OP_TIME;
814 }
815 asimage2drawable (asv, pixmap, back_im, gc, 0, 0, 0, 0, szHint.width, szHint.height, True);
816 destroy_asimage (&back_im);
817 } /* back_im != NULL */
818 else
819 success = False;
969 } 820 }
970 if (tmp_pmap != None)
971 {
972 success = True;
973 if (pixmap != None)
974 XFreePixmap (dpy, pixmap);
975 pixmap = tmp_pmap;
976 }
977 }
978#else /* HAVE_AFTERIMAGE */ 821#else /* HAVE_AFTERIMAGE */
979 {
980 /*
981 * Copy display->root pixmap transparency
982 */
983 int nx, ny;
984 unsigned int nw, nh;
985 XImage *image;
986
987 nw = (unsigned int)szHint.width;
988 nh = (unsigned int)szHint.height;
989 nx = ny = 0;
990
991 if (sx < 0)
992 {
993 nw += sx;
994 nx = -sx;
995 sx = 0;
996 }
997
998 if (sy < 0)
999 {
1000 nh += sy;
1001 ny = -sy;
1002 sy = 0;
1003 }
1004
1005 min_it (nw, (unsigned int) (wrootattr.width - sx));
1006 min_it (nh, (unsigned int) (wrootattr.height - sy));
1007
1008 XSync (dpy, False);
1009 allowedxerror = -1;
1010 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1011
1012 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1013 /* XXX: may need a delay here? */
1014 allowedxerror = 0;
1015 if (image != NULL)
1016 {
1017 if (pixmap != None)
1018 XFreePixmap (dpy, pixmap);
1019
1020#if TINTING 822#if TINTING
1021 if (ISSET_PIXCOLOR (Color_tint)) 823 if (!whole_tint && (!no_tint || shade !=100))
824 {
825 XImage *image = XGetImage (dpy, pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
826 success = False;
827 if (image != NULL)
1022 { 828 {
1023 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 829 PRINT_BACKGROUND_OP_TIME;
1024 830 if (gc == NULL)
1025 rgba c; 831 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1026 pix_colors_focused [Color_tint].get (c); 832 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
1027 ShadeXImage (this, image, shade, c.r, c.g, c.b); 833 ShadeXImage (this, image, shade, c.r, c.g, c.b);
1028 } 834 XPutImage (dpy, pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
1029#endif
1030
1031 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
1032 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1033 XPutImage (dpy, pixmap, gc, image, 0, 0,
1034 nx, ny, image->width, image->height);
1035 XDestroyImage (image); 835 XDestroyImage (image);
1036 success = True ; 836 success = True;
1037 } 837 }
1038 } 838 }
839#endif
1039#endif /* HAVE_AFTERIMAGE */ 840#endif /* HAVE_AFTERIMAGE */
841 PRINT_BACKGROUND_OP_TIME;
842
1040 if (gc != NULL) 843 if (gc != NULL)
1041 XFreeGC (dpy, gc); 844 XFreeGC (dpy, gc);
1042 845
1043 if (!success) 846 if (!success)
1044 { 847 {
1045 if (am_transparent && am_pixmap_trans) 848 if (am_transparent && am_pixmap_trans)
… …
1062 if (!am_transparent || !am_pixmap_trans) 865 if (!am_transparent || !am_pixmap_trans)
1063 pchanged = 1; 866 pchanged = 1;
1064 867
1065 am_transparent = am_pixmap_trans = 1; 868 am_transparent = am_pixmap_trans = 1;
1066 } 869 }
1067 } 870 } /* rootpixmap != None */
1068 871
1069 if (am_pixmap_trans) 872 if (am_pixmap_trans)
1070 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 873 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
1071 else 874 else
1072 { 875 {

Diff Legend

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