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.48 by sasha, Thu Jul 26 16:17:50 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
… …
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;
… …
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;
… …
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 {
… …
789 Pixmap tmp_pmap = None ; 863 Pixmap tmp_pmap = None ;
790 ShadingInfo shade; 864 ShadingInfo shade;
791 ARGB32 tint ; 865 ARGB32 tint ;
792 unsigned int pmap_w = 0, pmap_h = 0; 866 unsigned int pmap_w = 0, pmap_h = 0;
793 867
794 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h )) 868 if (get_dpy_drawable_size( dpy, rootpixmap, &pmap_w, &pmap_h ))
795 { 869 {
796 int root_x = 0, root_y = 0; 870 int root_x = 0, root_y = 0;
797 871
798 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 872 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
799 if (ISSET_PIXCOLOR (Color_tint)) 873 if (ISSET_PIXCOLOR (Color_tint))
… …
806 } 880 }
807 else 881 else
808 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF; 882 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
809 tint = shading2tint32( &shade ); 883 tint = shading2tint32( &shade );
810 gc = XCreateGC (dpy, vt, 0UL, &gcvalue); 884 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
811 if (GetWinPosition (parent[0], &root_x, &root_y) ) 885 if (get_dpy_window_position(dpy, display->root, parent[0], NULL, NULL, &root_x, &root_y))
812 { 886 {
813 ASImageLayer *layers = create_image_layers( 2 ); 887 ASImageLayer *layers = create_image_layers( 2 );
814 ASImage *merged_im = NULL; 888 ASImage *merged_im = NULL;
815 int back_x, back_y, back_w, back_h; 889 int back_x, back_y, back_w, back_h;
816 /* merge_layers does good job at tiling background appropriately, 890 /* merge_layers does good job at tiling background appropriately,
… …
827 }}while(0) 901 }}while(0)
828 902
829 MAKE_ROOTPMAP_GEOM(x,w,width); 903 MAKE_ROOTPMAP_GEOM(x,w,width);
830 MAKE_ROOTPMAP_GEOM(y,h,height); 904 MAKE_ROOTPMAP_GEOM(y,h,height);
831 905
832 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100); 906 layers[0].im = pixmap2asimage (asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
833 layers[0].clip_x = (back_w == pmap_w)?root_x:0; 907 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
834 layers[0].clip_y = (back_h == pmap_h)?root_y:0; 908 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
835 layers[0].clip_width = szHint.width; 909 layers[0].clip_width = szHint.width;
836 layers[0].clip_height = szHint.height; 910 layers[0].clip_height = szHint.height;
837 layers[0].tint = tint; 911 layers[0].tint = tint;
838 if (rs[Rs_blurradius] && layers[0].im) 912 if (rs[Rs_blurradius] && layers[0].im)
839 { 913 {
840 double r = atof(rs[Rs_blurradius]); 914 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 ); 915 ASImage* tmp = blur_asimage_gauss(asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
842 if( tmp ) 916 if( tmp )
843 { 917 {
844 destroy_asimage( &layers[0].im ); 918 destroy_asimage( &layers[0].im );
845 layers[0].im = tmp; 919 layers[0].im = tmp;
846 } 920 }
… …
860 fore_h = bgPixmap.h; 934 fore_h = bgPixmap.h;
861 } 935 }
862 if (fore_w != original_asim->width 936 if (fore_w != original_asim->width
863 || fore_h != original_asim->height) 937 || fore_h != original_asim->height)
864 { 938 {
865 layers[1].im = scale_asimage( display->asv, 939 layers[1].im = scale_asimage( asv,
866 original_asim, 940 original_asim,
867 fore_w, fore_h, 941 fore_w, fore_h,
868 ASA_ASImage, 100, 942 ASA_ASImage, 100,
869 ASIMAGE_QUALITY_DEFAULT ); 943 ASIMAGE_QUALITY_DEFAULT );
870 } 944 }
… …
877 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]); 951 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
878 if( layers[1].merge_scanlines == NULL ) 952 if( layers[1].merge_scanlines == NULL )
879 layers[1].merge_scanlines = alphablend_scanlines; 953 layers[1].merge_scanlines = alphablend_scanlines;
880 } 954 }
881 } 955 }
882 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1, 956 merged_im = merge_layers( asv, layers, layers[1].im?2:1,
883 szHint.width, szHint.height, 957 szHint.width, szHint.height,
884 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 958 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
885 if (layers[1].im != original_asim) 959 if (layers[1].im != original_asim)
886 destroy_asimage( &(layers[1].im) ); 960 destroy_asimage( &(layers[1].im) );
887 destroy_asimage( &(layers[0].im) ); 961 destroy_asimage( &(layers[0].im) );
888 if (merged_im != NULL) 962 if (merged_im != NULL)
889 { 963 {
890 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True ); 964 tmp_pmap = asimage2pixmap (asv, DefaultRootWindow(dpy), merged_im, gc, True);
891 destroy_asimage( &merged_im ); 965 destroy_asimage( &merged_im );
892 } 966 }
893 free( layers ); 967 free( layers );
894 } 968 }
895 } 969 }

Diff Legend

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