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.40 by ayin, Wed Jun 20 13:46:25 2007 UTC vs.
Revision 1.46 by sasha, Thu Jul 12 22:33:16 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
… …
191 339
192 if (bgPixmap.pixmap == None) 340 if (bgPixmap.pixmap == None)
193 { /* So be it: I'm not using pixmaps */ 341 { /* So be it: I'm not using pixmaps */
194 pixmap = None; 342 pixmap = None;
195 343
196#ifdef TRANSPARENT 344#ifdef ENABLE_TRANSPARENCY
197 if (!option (Opt_transparent) || !am_transparent) 345 if (!option (Opt_transparent) || !am_transparent)
198#endif 346#endif
199 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 347 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
200 348
201 return; 349 return;
… …
235 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0); 383 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0);
236 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y); 384 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y);
237 } 385 }
238 else 386 else
239#ifdef HAVE_AFTERIMAGE 387#ifdef HAVE_AFTERIMAGE
240#ifdef TRANSPARENT 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 = AFTERIMAGE_DPY_OP(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 {
… …
298 } 446 }
299 447
300 XSetWindowBackgroundPixmap (dpy, vt, pixmap); 448 XSetWindowBackgroundPixmap (dpy, vt, pixmap);
301 449
302 XFreeGC (dpy, gc); 450 XFreeGC (dpy, gc);
303#ifdef TRANSPARENT 451#ifdef ENABLE_TRANSPARENCY
304 am_transparent = 0; 452 am_transparent = 0;
305#endif 453#endif
306}
307
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} 454}
383 455
384Pixmap 456Pixmap
385rxvt_term::set_bgPixmap (const char *file) 457rxvt_term::set_bgPixmap (const char *file)
386{ 458{
… …
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 = AFTERIMAGE_DPY_OP(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;
… …
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 {
… …
453 return bgPixmap.pixmap; 528 return bgPixmap.pixmap;
454} 529}
455 530
456#endif /* XPM_BACKGROUND */ 531#endif /* XPM_BACKGROUND */
457 532
458#ifdef TRANSPARENT 533#ifdef ENABLE_TRANSPARENCY
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;
… …
825 }}while(0) 901 }}while(0)
826 902
827 MAKE_ROOTPMAP_GEOM(x,w,width); 903 MAKE_ROOTPMAP_GEOM(x,w,width);
828 MAKE_ROOTPMAP_GEOM(y,h,height); 904 MAKE_ROOTPMAP_GEOM(y,h,height);
829 905
830 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100); 906 layers[0].im = AFTERIMAGE_DPY_OP(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; 907 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
832 layers[0].clip_y = (back_h == pmap_h)?root_y:0; 908 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
833 layers[0].clip_width = szHint.width; 909 layers[0].clip_width = szHint.width;
834 layers[0].clip_height = szHint.height; 910 layers[0].clip_height = szHint.height;
835 layers[0].tint = tint; 911 layers[0].tint = tint;
836 if (rs[Rs_blurradius] && layers[0].im) 912 if (rs[Rs_blurradius] && layers[0].im)
837 { 913 {
838 double r = atof(rs[Rs_blurradius]); 914 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 ); 915 ASImage* tmp = blur_asimage_gauss(asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
840 if( tmp ) 916 if( tmp )
841 { 917 {
842 destroy_asimage( &layers[0].im ); 918 destroy_asimage( &layers[0].im );
843 layers[0].im = tmp; 919 layers[0].im = tmp;
844 } 920 }
… …
858 fore_h = bgPixmap.h; 934 fore_h = bgPixmap.h;
859 } 935 }
860 if (fore_w != original_asim->width 936 if (fore_w != original_asim->width
861 || fore_h != original_asim->height) 937 || fore_h != original_asim->height)
862 { 938 {
863 layers[1].im = scale_asimage( display->asv, 939 layers[1].im = scale_asimage( asv,
864 original_asim, 940 original_asim,
865 fore_w, fore_h, 941 fore_w, fore_h,
866 ASA_ASImage, 100, 942 ASA_ASImage, 100,
867 ASIMAGE_QUALITY_DEFAULT ); 943 ASIMAGE_QUALITY_DEFAULT );
868 } 944 }
… …
875 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]); 951 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
876 if( layers[1].merge_scanlines == NULL ) 952 if( layers[1].merge_scanlines == NULL )
877 layers[1].merge_scanlines = alphablend_scanlines; 953 layers[1].merge_scanlines = alphablend_scanlines;
878 } 954 }
879 } 955 }
880 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1, 956 merged_im = merge_layers( asv, layers, layers[1].im?2:1,
881 szHint.width, szHint.height, 957 szHint.width, szHint.height,
882 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 958 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
883 if (layers[1].im != original_asim) 959 if (layers[1].im != original_asim)
884 destroy_asimage( &(layers[1].im) ); 960 destroy_asimage( &(layers[1].im) );
885 destroy_asimage( &(layers[0].im) ); 961 destroy_asimage( &(layers[0].im) );
886 if (merged_im != NULL) 962 if (merged_im != NULL)
887 { 963 {
888 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True ); 964 tmp_pmap = AFTERIMAGE_DPY_OP(asimage2pixmap( asv, DefaultRootWindow(dpy), merged_im, gc, True ));
889 destroy_asimage( &merged_im ); 965 destroy_asimage( &merged_im );
890 } 966 }
891 free( layers ); 967 free( layers );
892 } 968 }
893 } 969 }

Diff Legend

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