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.21 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.31 by root, Thu Feb 2 18:04:46 2006 UTC

… …
22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
24 24
25#include "../config.h" /* NECESSARY */ 25#include "../config.h" /* NECESSARY */
26#include "rxvt.h" /* NECESSARY */ 26#include "rxvt.h" /* NECESSARY */
27#include "xpm.intpro" /* PROTOS for internal routines */
28 27
29#ifdef XPM_BACKGROUND 28#ifdef XPM_BACKGROUND
29
30static void rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight);
30 31
31/* 32/*
32 * These GEOM strings indicate absolute size/position: 33 * These GEOM strings indicate absolute size/position:
33 * @ `WxH+X+Y' 34 * @ `WxH+X+Y'
34 * @ `WxH+X' -> Y = X 35 * @ `WxH+X' -> Y = X
… …
49 * @ `?' 50 * @ `?'
50 */ 51 */
51int 52int
52rxvt_term::scale_pixmap (const char *geom) 53rxvt_term::scale_pixmap (const char *geom)
53{ 54{
54 int flags, changed = 0; 55 int flags, changed = 0;
55 int x = 0, y = 0; 56 int x = 0, y = 0;
56 unsigned int w = 0, h = 0; 57 unsigned int w = 0, h = 0;
57 unsigned int n; 58 unsigned int n;
58 char *p, *str; 59 char *p;
59 bgPixmap_t *bgpixmap = & (bgPixmap); 60 bgPixmap_t *bgpixmap = & (bgPixmap);
60 61
61#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]") 62#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
62 63
63 if (geom == NULL) 64 if (geom == NULL)
64 return 0; 65 return 0;
65 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1); 66
67 char str[MAXLEN_GEOM];
68
66 if (!strcmp (geom, "?")) 69 if (!strcmp (geom, "?"))
67 { 70 {
68 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 71 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
69 min (bgpixmap->w, 9999), min (bgpixmap->h, 9999), 72 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767),
70 min (bgpixmap->x, 9999), min (bgpixmap->y, 9999)); 73 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767));
71 process_xterm_seq (XTerm_title, str, CHAR_ST); 74 process_xterm_seq (XTerm_title, str, CHAR_ST);
72 free (str);
73 return 0; 75 return 0;
74 } 76 }
75 77
76 if ((p = strchr (geom, ';')) == NULL) 78 if ((p = strchr (geom, ';')) == NULL)
77 p = strchr (geom, '\0'); 79 p = strchr (geom, '\0');
80
78 n = (p - geom); 81 n = (p - geom);
79 if (n <= MAXLEN_GEOM) 82 if (n <= MAXLEN_GEOM)
80 { 83 {
81 strncpy (str, geom, n); 84 strncpy (str, geom, n);
82 str[n] = '\0'; 85 str[n] = '\0';
83 86
84 flags = XParseGeometry (str, &x, &y, &w, &h); 87 flags = XParseGeometry (str, &x, &y, &w, &h);
88
85 if (!flags) 89 if (!flags)
86 { 90 {
87 flags |= WidthValue; 91 flags |= WidthValue;
88 w = 0; 92 w = 0;
89 } /* default is tile */ 93 } /* default is tile */
94
90 if (flags & WidthValue) 95 if (flags & WidthValue)
91 { 96 {
92 if (! (flags & XValue)) 97 if (!(flags & XValue))
93 x = 50; 98 x = 50;
99
94 if (! (flags & HeightValue)) 100 if (!(flags & HeightValue))
95 h = w; 101 h = w;
102
96 if (w && !h) 103 if (w && !h)
97 { 104 {
98 w = (bgpixmap->w * w) / 100; 105 w = (bgpixmap->w * w) / 100;
99 h = bgpixmap->h; 106 h = bgpixmap->h;
100 } 107 }
101 else if (h && !w) 108 else if (h && !w)
102 { 109 {
103 w = bgpixmap->w; 110 w = bgpixmap->w;
104 h = (bgpixmap->h * h) / 100; 111 h = (bgpixmap->h * h) / 100;
105 } 112 }
106 if (w > 1000) 113
107 w = 1000; 114 min_it (w, 32767);
108 if (h > 1000) 115 min_it (h, 32767);
109 h = 1000; 116
110 if (bgpixmap->w != (short)w) 117 if (bgpixmap->w != (short)w)
111 { 118 {
112 bgpixmap->w = (short)w; 119 bgpixmap->w = (short)w;
113 changed++; 120 changed++;
114 } 121 }
122
115 if (bgpixmap->h != (short)h) 123 if (bgpixmap->h != (short)h)
116 { 124 {
117 bgpixmap->h = (short)h; 125 bgpixmap->h = (short)h;
118 changed++; 126 changed++;
119 } 127 }
120 } 128 }
129
121 if (! (flags & YValue)) 130 if (!(flags & YValue))
122 { 131 {
123 if (flags & XNegative) 132 if (flags & XNegative)
124 flags |= YNegative; 133 flags |= YNegative;
134
125 y = x; 135 y = x;
126 } 136 }
127 137
128 if (! (flags & WidthValue) && geom[0] != '=') 138 if (!(flags & WidthValue) && geom[0] != '=')
129 { 139 {
130 x += bgpixmap->x; 140 x += bgpixmap->x;
131 y += bgpixmap->y; 141 y += bgpixmap->y;
132 } 142 }
133 else 143
134 { 144 if (xpmAttr.width && xpmAttr.height)
135 if (flags & XNegative)
136 x += 100;
137 if (flags & YNegative)
138 y += 100;
139 } 145 {
140 MIN_IT (x, 100); 146 x = MOD(x, xpmAttr.width);
141 MIN_IT (y, 100); 147 y = MOD(y, xpmAttr.height);
142 MAX_IT (x, 0); 148 }
143 MAX_IT (y, 0); 149
144 if (bgpixmap->x != x) 150 if (bgpixmap->x != x)
145 { 151 {
146 bgpixmap->x = x; 152 bgpixmap->x = x;
147 changed++; 153 changed++;
148 } 154 }
155
149 if (bgpixmap->y != y) 156 if (bgpixmap->y != y)
150 { 157 {
151 bgpixmap->y = y; 158 bgpixmap->y = y;
152 changed++; 159 changed++;
153 } 160 }
154 } 161 }
155 free (str); 162
156 return changed; 163 return changed;
157} 164}
158 165
159void 166void
160rxvt_term::resize_pixmap () 167rxvt_term::resize_pixmap ()
161{ 168{
162 XGCValues gcvalue; 169 XGCValues gcvalue;
163 GC gc; 170 GC gc;
164 unsigned int width = TermWin_TotalWidth ();
165 unsigned int height = TermWin_TotalHeight ();
166 dDisp;
167 171
168 if (TermWin.pixmap != None) 172 if (pixmap != None)
169 XFreePixmap (disp, TermWin.pixmap); 173 XFreePixmap (dpy, pixmap);
170 174
171 if (bgPixmap.pixmap == None) 175 if (bgPixmap.pixmap == None)
172 { /* So be it: I'm not using pixmaps */ 176 { /* So be it: I'm not using pixmaps */
173 TermWin.pixmap = None; 177 pixmap = None;
174 178
175 if (!(options & Opt_transparent) || !am_transparent) 179 if (!OPTION (Opt_transparent) || !am_transparent)
176 XSetWindowBackground (disp, TermWin.vt, 180 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
177 pix_colors[Color_bg]);
178 181
179 return; 182 return;
180 } 183 }
181 184
182 gcvalue.foreground = pix_colors[Color_bg]; 185 gcvalue.foreground = pix_colors[Color_bg];
183 gc = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 186 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
184 187
185 if (bgPixmap.pixmap != None) 188 if (bgPixmap.pixmap != None)
186 { /* we have a specified pixmap */ 189 { /* we have a specified pixmap */
187 unsigned int w = bgPixmap.w, h = bgPixmap.h, 190 unsigned int w = bgPixmap.w, h = bgPixmap.h,
188 x = bgPixmap.x, y = bgPixmap.y; 191 x = bgPixmap.x, y = bgPixmap.y;
189 unsigned int xpmh = xpmAttr.height, 192 unsigned int xpmh = xpmAttr.height,
190 xpmw = xpmAttr.width; 193 xpmw = xpmAttr.width;
191 194
192 /* 195 /*
193 * don't zoom pixmap too much nor expand really small pixmaps 196 * don't zoom pixmap too much nor expand really small pixmaps
194 */ 197 */
195 if (w > 1000 || h > 1000) 198 if (w > 32767 || h > 32767)
196 w = 1; 199 w = 1;
197 else if (width > (10 * xpmw) 200 else if (width > (10 * xpmw)
198 || height > (10 * xpmh)) 201 || height > (10 * xpmh))
199 w = 0; /* tile */ 202 w = 0; /* tile */
200 203
201 if (w == 0) 204 if (!w)
202 { 205 {
203 /* basic X tiling - let the X server do it */ 206 /* basic X tiling - let the X server do it */
204 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 207 pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth);
205 xpmw, xpmh, 208
206 (unsigned int)display->depth); 209 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0);
207 XCopyArea (disp, bgPixmap.pixmap, TermWin.pixmap, gc, 210 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y);
208 0, 0, xpmw, xpmh, 0, 0); 211 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0);
212 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y);
209 } 213 }
210 else 214 else
211 { 215 {
212 float incr, p; 216 float incr, p;
213 Pixmap tmp; 217 Pixmap tmp;
214 218
215 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 219 pixmap = XCreatePixmap (dpy, vt, width, height, depth);
216 width, height,
217 (unsigned int)display->depth);
218 /* 220 /*
219 * horizontal scaling 221 * horizontal scaling
220 */ 222 */
221 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw); 223 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
222 224
223 tmp = XCreatePixmap (disp, TermWin.vt, 225 tmp = XCreatePixmap (dpy, vt, width, xpmh, depth);
224 width, xpmh, (unsigned int)display->depth);
225 XFillRectangle (disp, tmp, gc, 0, 0, width, 226 XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh);
226 xpmh);
227 227
228 for ( /*nil */ ; x < w; x++, p += incr) 228 for ( /*nil */ ; x < w; x++, p += incr)
229 { 229 {
230 if (p >= xpmw) 230 if (p >= xpmw)
231 p = 0; 231 p = 0;
232
232 /* copy one column from the original pixmap to the tmp pixmap */ 233 /* copy one column from the original pixmap to the tmp pixmap */
233 XCopyArea (disp, bgPixmap.pixmap, tmp, gc, 234 XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0);
234 (int)p, 0, 1, xpmh, (int)x, 0);
235 } 235 }
236 236
237 /* 237 /*
238 * vertical scaling 238 * vertical scaling
239 */ 239 */
240 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh); 240 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
241 241
242 if (y > 0) 242 if (y > 0)
243 XFillRectangle (disp, TermWin.pixmap, gc, 0, 0, width, y); 243 XFillRectangle (dpy, pixmap, gc, 0, 0, width, y);
244 244
245 if (h < height) 245 if (h < height)
246 XFillRectangle (disp, TermWin.pixmap, gc, 0, (int)h, width, height - h + 1); 246 XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1);
247 247
248 for ( /*nil */ ; y < h; y++, p += incr) 248 for ( /*nil */ ; y < h; y++, p += incr)
249 { 249 {
250 if (p >= xpmh) 250 if (p >= xpmh)
251 p = 0; 251 p = 0;
252 252
253 /* copy one row from the tmp pixmap to the main pixmap */ 253 /* copy one row from the tmp pixmap to the main pixmap */
254 XCopyArea (disp, tmp, TermWin.pixmap, gc, 254 XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y);
255 0, (int)p, width, 1, 0, (int)y);
256 } 255 }
257 256
258 XFreePixmap (disp, tmp); 257 XFreePixmap (dpy, tmp);
259 } 258 }
260 } 259 }
261 260
262 XSetWindowBackgroundPixmap (disp, TermWin.vt, TermWin.pixmap); 261 XSetWindowBackgroundPixmap (dpy, vt, pixmap);
262
263 if (pixmap != None)
264 {
265 XFreePixmap (dpy, pixmap);
266 pixmap = None;
267 }
268
263 XFreeGC (disp, gc); 269 XFreeGC (dpy, gc);
264 am_transparent = 0; 270 am_transparent = 0;
265} 271}
266 272
267/* 273/*
268 * Calculate tiling sizes and increments 274 * Calculate tiling sizes and increments
269 * At start, p == 0, incr == xpmwidthheight 275 * At start, p == 0, incr == xpmwidthheight
270 */ 276 */
271/* INTPROTO */
272static void 277static void
273rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight) 278rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
274{ 279{
275 unsigned int cwh, cxy; 280 unsigned int cwh, cxy;
276 float cincr, cp; 281 float cincr, cp;
… …
348 353
349 assert (file != NULL); 354 assert (file != NULL);
350 355
351 if (bgPixmap.pixmap != None) 356 if (bgPixmap.pixmap != None)
352 { 357 {
353 XFreePixmap (display->display, bgPixmap.pixmap); 358 XFreePixmap (dpy, bgPixmap.pixmap);
354 bgPixmap.pixmap = None; 359 bgPixmap.pixmap = None;
355 } 360 }
356 361
357 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 362 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
358 363
359 if (*file != '\0') 364 if (*file != '\0')
360 { 365 {
361 /* XWindowAttributes attr; */ 366 /* XWindowAttributes attr; */
362 367
363 /* 368 /*
364 * we already have the required attributes 369 * we already have the required attributes
365 */ 370 */
366 /* XGetWindowAttributes (display->display, TermWin.vt, &attr); */ 371 /* XGetWindowAttributes (dpy, vt, &attr); */
367 372
368 xpmAttr.closeness = 30000; 373 xpmAttr.closeness = 30000;
369 xpmAttr.colormap = display->cmap; 374 xpmAttr.colormap = cmap;
370 xpmAttr.visual = display->visual; 375 xpmAttr.visual = visual;
371 xpmAttr.depth = display->depth; 376 xpmAttr.depth = depth;
372 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual | 377 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
373 XpmDepth | XpmSize | XpmReturnPixels); 378 | XpmDepth | XpmSize | XpmReturnPixels);
374 379
375 /* search environment variables here too */ 380 /* search environment variables here too */
376 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]); 381 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
377 if (f == NULL 382 if (f == NULL
378 || XpmReadFileToPixmap (display->display, display->root, f, 383 || XpmReadFileToPixmap (dpy, display->root, f,
379 &bgPixmap.pixmap, NULL, 384 &bgPixmap.pixmap, NULL,
380 &xpmAttr)) 385 &xpmAttr))
381 { 386 {
382 char *p; 387 char *p;
383 388
384 /* semi-colon delimited */ 389 /* semi-colon delimited */
385 if ((p = strchr (file, ';')) == NULL) 390 if ((p = strchr (file, ';')) == NULL)

Diff Legend

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