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.6 by pcg, Sat Jan 31 02:15:02 2004 UTC vs.
Revision 1.14 by root, Mon Aug 2 04:20:48 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xpm.c 2 * File: xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xpm.C,v 1.6 2004/01/31 02:15:02 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au> 6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
8 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
9 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
… …
50 * @ `?' 49 * @ `?'
51 */ 50 */
52int 51int
53rxvt_term::scale_pixmap (const char *geom) 52rxvt_term::scale_pixmap (const char *geom)
54{ 53{
55 int flags, changed = 0; 54 int flags, changed = 0;
56 int x = 0, y = 0; 55 int x = 0, y = 0;
57 unsigned int w = 0, h = 0; 56 unsigned int w = 0, h = 0;
58 unsigned int n; 57 unsigned int n;
59 char *p, *str; 58 char *p, *str;
60 bgPixmap_t *bgpixmap = &(bgPixmap); 59 bgPixmap_t *bgpixmap = & (bgPixmap);
61 60
62#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]") 61#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]")
63 62
64 if (geom == NULL) 63 if (geom == NULL)
65 return 0; 64 return 0;
66 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1); 65 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1);
67 if (!STRCMP(geom, "?")) { 66 if (!STRCMP (geom, "?"))
67 {
68 sprintf(str, "[%dx%d+%d+%d]", /* can't presume snprintf() ! */ 68 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
69 min(bgpixmap->w, 9999), min(bgpixmap->h, 9999), 69 min (bgpixmap->w, 9999), min (bgpixmap->h, 9999),
70 min(bgpixmap->x, 9999), min(bgpixmap->y, 9999)); 70 min (bgpixmap->x, 9999), min (bgpixmap->y, 9999));
71 xterm_seq (XTerm_title, str, CHAR_ST); 71 process_xterm_seq (XTerm_title, str, CHAR_ST);
72 free(str); 72 free (str);
73 return 0; 73 return 0;
74 } 74 }
75 75
76 if ((p = STRCHR(geom, ';')) == NULL) 76 if ((p = STRCHR (geom, ';')) == NULL)
77 p = STRCHR(geom, '\0'); 77 p = STRCHR (geom, '\0');
78 n = (p - geom); 78 n = (p - geom);
79 if (n <= MAXLEN_GEOM) { 79 if (n <= MAXLEN_GEOM)
80 {
80 STRNCPY(str, geom, n); 81 STRNCPY (str, geom, n);
81 str[n] = '\0'; 82 str[n] = '\0';
82 83
83 flags = XParseGeometry(str, &x, &y, &w, &h); 84 flags = XParseGeometry (str, &x, &y, &w, &h);
84 if (!flags) { 85 if (!flags)
86 {
85 flags |= WidthValue; 87 flags |= WidthValue;
86 w = 0; 88 w = 0;
87 } /* default is tile */ 89 } /* default is tile */
88 if (flags & WidthValue) { 90 if (flags & WidthValue)
91 {
92 if (! (flags & XValue))
93 x = 50;
94 if (! (flags & HeightValue))
95 h = w;
96 if (w && !h)
97 {
98 w = (bgpixmap->w * w) / 100;
99 h = bgpixmap->h;
100 }
101 else if (h && !w)
102 {
103 w = bgpixmap->w;
104 h = (bgpixmap->h * h) / 100;
105 }
106 if (w > 1000)
107 w = 1000;
108 if (h > 1000)
109 h = 1000;
110 if (bgpixmap->w != (short)w)
111 {
112 bgpixmap->w = (short)w;
113 changed++;
114 }
115 if (bgpixmap->h != (short)h)
116 {
117 bgpixmap->h = (short)h;
118 changed++;
119 }
120 }
89 if (!(flags & XValue)) 121 if (! (flags & YValue))
90 x = 50; 122 {
91 if (!(flags & HeightValue)) 123 if (flags & XNegative)
92 h = w; 124 flags |= YNegative;
93 if (w && !h) { 125 y = x;
94 w = (bgpixmap->w * w) / 100; 126 }
95 h = bgpixmap->h; 127
96 } else if (h && !w) { 128 if (! (flags & WidthValue) && geom[0] != '=')
97 w = bgpixmap->w; 129 {
98 h = (bgpixmap->h * h) / 100; 130 x += bgpixmap->x;
131 y += bgpixmap->y;
132 }
133 else
134 {
135 if (flags & XNegative)
136 x += 100;
137 if (flags & YNegative)
138 y += 100;
139 }
140 MIN_IT (x, 100);
141 MIN_IT (y, 100);
142 MAX_IT (x, 0);
143 MAX_IT (y, 0);
144 if (bgpixmap->x != x)
145 {
146 bgpixmap->x = x;
147 changed++;
148 }
149 if (bgpixmap->y != y)
150 {
151 bgpixmap->y = y;
152 changed++;
153 }
99 } 154 }
100 if (w > 1000)
101 w = 1000;
102 if (h > 1000)
103 h = 1000;
104 if (bgpixmap->w != (short)w) {
105 bgpixmap->w = (short)w;
106 changed++;
107 }
108 if (bgpixmap->h != (short)h) {
109 bgpixmap->h = (short)h;
110 changed++;
111 }
112 }
113 if (!(flags & YValue)) {
114 if (flags & XNegative)
115 flags |= YNegative;
116 y = x;
117 }
118
119 if (!(flags & WidthValue) && geom[0] != '=') {
120 x += bgpixmap->x;
121 y += bgpixmap->y;
122 } else {
123 if (flags & XNegative)
124 x += 100;
125 if (flags & YNegative)
126 y += 100;
127 }
128 MIN_IT(x, 100);
129 MIN_IT(y, 100);
130 MAX_IT(x, 0);
131 MAX_IT(y, 0);
132 if (bgpixmap->x != x) {
133 bgpixmap->x = x;
134 changed++;
135 }
136 if (bgpixmap->y != y) {
137 bgpixmap->y = y;
138 changed++;
139 }
140 }
141 free(str); 155 free (str);
142 return changed; 156 return changed;
143} 157}
144 158
145void 159void
146rxvt_term::resize_pixmap () 160rxvt_term::resize_pixmap ()
147{ 161{
148 XGCValues gcvalue; 162 XGCValues gcvalue;
149 GC gc; 163 GC gc;
150 unsigned int width = TermWin_TotalWidth(); 164 unsigned int width = TermWin_TotalWidth ();
151 unsigned int height = TermWin_TotalHeight(); 165 unsigned int height = TermWin_TotalHeight ();
152 166
153 if (TermWin.pixmap != None) 167 if (TermWin.pixmap != None)
154 XFreePixmap(Xdisplay, TermWin.pixmap); 168 XFreePixmap (display->display, TermWin.pixmap);
155 169
156 if (bgPixmap.pixmap == None) { /* So be it: I'm not using pixmaps */ 170 if (bgPixmap.pixmap == None)
171 { /* So be it: I'm not using pixmaps */
157 TermWin.pixmap = None; 172 TermWin.pixmap = None;
158 if (!(Options & Opt_transparent) || am_transparent == 0) 173 if (! (Options & Opt_transparent) || am_transparent == 0)
159 XSetWindowBackground(Xdisplay, TermWin.vt, 174 XSetWindowBackground (display->display, TermWin.vt,
160 PixColors[Color_bg]); 175 PixColors[Color_bg]);
161 return; 176 return;
162 } 177 }
163 178
164 gcvalue.foreground = PixColors[Color_bg]; 179 gcvalue.foreground = PixColors[Color_bg];
165 gc = XCreateGC(Xdisplay, TermWin.vt, GCForeground, &gcvalue); 180 gc = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
166 181
167 if (bgPixmap.pixmap != None) { /* we have a specified pixmap */ 182 if (bgPixmap.pixmap != None)
183 { /* we have a specified pixmap */
168 unsigned int w = bgPixmap.w, h = bgPixmap.h, 184 unsigned int w = bgPixmap.w, h = bgPixmap.h,
169 x = bgPixmap.x, y = bgPixmap.y; 185 x = bgPixmap.x, y = bgPixmap.y;
170 unsigned int xpmh = xpmAttr.height, 186 unsigned int xpmh = xpmAttr.height,
171 xpmw = xpmAttr.width; 187 xpmw = xpmAttr.width;
172 188
173 /* 189 /*
174 * don't zoom pixmap too much nor expand really small pixmaps 190 * don't zoom pixmap too much nor expand really small pixmaps
175 */ 191 */
176 if (w > 1000 || h > 1000) 192 if (w > 1000 || h > 1000)
177 w = 1; 193 w = 1;
178 else if (width > (10 * xpmw) 194 else if (width > (10 * xpmw)
179 || height > (10 * xpmh)) 195 || height > (10 * xpmh))
180 w = 0; /* tile */ 196 w = 0; /* tile */
181 197
182 if (w == 0) { 198 if (w == 0)
199 {
183 /* basic X tiling - let the X server do it */ 200 /* basic X tiling - let the X server do it */
184 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 201 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
185 xpmw, xpmh, 202 xpmw, xpmh,
186 (unsigned int)XDEPTH); 203 (unsigned int)display->depth);
187 XCopyArea(Xdisplay, bgPixmap.pixmap, TermWin.pixmap, gc, 204 XCopyArea (display->display, bgPixmap.pixmap, TermWin.pixmap, gc,
188 0, 0, xpmw, xpmh, 0, 0); 205 0, 0, xpmw, xpmh, 0, 0);
189 } else { 206 }
207 else
208 {
190 float incr, p; 209 float incr, p;
191 Pixmap tmp; 210 Pixmap tmp;
192 211
193 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 212 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
194 width, height, 213 width, height,
195 (unsigned int)XDEPTH); 214 (unsigned int)display->depth);
196 /* 215 /*
197 * horizontal scaling 216 * horizontal scaling
198 */ 217 */
199 rxvt_pixmap_incr(&w, &x, &incr, &p, width, xpmw); 218 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
200 219
201 tmp = XCreatePixmap(Xdisplay, TermWin.vt, 220 tmp = XCreatePixmap (display->display, TermWin.vt,
202 width, xpmh, (unsigned int)XDEPTH); 221 width, xpmh, (unsigned int)display->depth);
203 XFillRectangle(Xdisplay, tmp, gc, 0, 0, width, 222 XFillRectangle (display->display, tmp, gc, 0, 0, width,
204 xpmh); 223 xpmh);
205 224
206 for ( /*nil */ ; x < w; x++, p += incr) { 225 for ( /*nil */ ; x < w; x++, p += incr)
207 if (p >= xpmw) 226 {
208 p = 0; 227 if (p >= xpmw)
228 p = 0;
209 /* copy one column from the original pixmap to the tmp pixmap */ 229 /* copy one column from the original pixmap to the tmp pixmap */
210 XCopyArea(Xdisplay, bgPixmap.pixmap, tmp, gc, 230 XCopyArea (display->display, bgPixmap.pixmap, tmp, gc,
211 (int)p, 0, 1, xpmh, (int)x, 0); 231 (int)p, 0, 1, xpmh, (int)x, 0);
212 } 232 }
213 233
214 /* 234 /*
215 * vertical scaling 235 * vertical scaling
216 */ 236 */
217 rxvt_pixmap_incr(&h, &y, &incr, &p, height, xpmh); 237 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
218 238
219 if (y > 0) 239 if (y > 0)
220 XFillRectangle(Xdisplay, TermWin.pixmap, gc, 0, 0, width, 240 XFillRectangle (display->display, TermWin.pixmap, gc, 0, 0, width,
221 y); 241 y);
222 if (h < height) 242 if (h < height)
223 XFillRectangle(Xdisplay, TermWin.pixmap, gc, 0, (int)h, 243 XFillRectangle (display->display, TermWin.pixmap, gc, 0, (int)h,
224 width, height - h + 1); 244 width, height - h + 1);
225 for ( /*nil */ ; y < h; y++, p += incr) { 245 for ( /*nil */ ; y < h; y++, p += incr)
226 if (p >= xpmh) 246 {
227 p = 0; 247 if (p >= xpmh)
248 p = 0;
228 /* copy one row from the tmp pixmap to the main pixmap */ 249 /* copy one row from the tmp pixmap to the main pixmap */
229 XCopyArea(Xdisplay, tmp, TermWin.pixmap, gc, 250 XCopyArea (display->display, tmp, TermWin.pixmap, gc,
230 0, (int)p, width, 1, 0, (int)y); 251 0, (int)p, width, 1, 0, (int)y);
252 }
253 XFreePixmap (display->display, tmp);
254 }
231 } 255 }
232 XFreePixmap(Xdisplay, tmp); 256
233 }
234 }
235 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, TermWin.pixmap); 257 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap);
236 XFreeGC(Xdisplay, gc); 258 XFreeGC (display->display, gc);
237 am_transparent = 0; 259 am_transparent = 0;
238 260
239 XClearWindow(Xdisplay, TermWin.vt); 261 XClearWindow (display->display, TermWin.vt);
240 262
241 XSync(Xdisplay, False); 263 XSync (display->display, False);
242} 264}
243 265
244/* 266/*
245 * Calculate tiling sizes and increments 267 * Calculate tiling sizes and increments
246 * At start, p == 0, incr == xpmwidthheight 268 * At start, p == 0, incr == xpmwidthheight
247 */ 269 */
248/* INTPROTO */ 270/* INTPROTO */
249static void 271static void
250rxvt_pixmap_incr(unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight) 272rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
251{ 273{
252 unsigned int cwh, cxy; 274 unsigned int cwh, cxy;
253 float cincr, cp; 275 float cincr, cp;
254 276
255 cp = 0; 277 cp = 0;
256 cincr = (float)xpmwidthheight; 278 cincr = (float)xpmwidthheight;
257 cxy = *xy; 279 cxy = *xy;
258 cwh = *wh; 280 cwh = *wh;
281 if (cwh == 1)
259 if (cwh == 1) { /* display one image, no horizontal/vertical scaling */ 282 { /* display one image, no horizontal/vertical scaling */
260 cincr = (float)widthheight; 283 cincr = (float)widthheight;
261 if (xpmwidthheight <= widthheight) { 284 if (xpmwidthheight <= widthheight)
285 {
262 cwh = xpmwidthheight; 286 cwh = xpmwidthheight;
263 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */ 287 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */
264 cwh += cxy; 288 cwh += cxy;
265 } else { 289 }
290 else
291 {
292 cxy = 0;
293 cwh = widthheight;
294 }
295 }
296 else if (cwh < 10)
297 { /* fit WH images across/down screen */
298 cincr *= cwh;
266 cxy = 0; 299 cxy = 0;
267 cwh = widthheight; 300 cwh = widthheight;
268 } 301 }
269 } else if (cwh < 10) { /* fit WH images across/down screen */ 302 else
270 cincr *= cwh; 303 {
271 cxy = 0;
272 cwh = widthheight;
273 } else {
274 cincr *= 100.0 / cwh; 304 cincr *= 100.0 / cwh;
275 if (cwh < 100) { /* contract */ 305 if (cwh < 100)
306 { /* contract */
276 float pos; 307 float pos;
277 308
278 cwh = (cwh * widthheight) / 100; 309 cwh = (cwh * widthheight) / 100;
279 pos = (float)cxy / 100 * widthheight - (cwh / 2); 310 pos = (float)cxy / 100 * widthheight - (cwh / 2);
280 311
281 cxy = (widthheight - cwh); 312 cxy = (widthheight - cwh);
282 if (pos <= 0) 313 if (pos <= 0)
283 cxy = 0; 314 cxy = 0;
284 else if (pos < cxy) 315 else if (pos < cxy)
285 cxy = (int) pos; 316 cxy = (int) pos;
286 cwh += cxy; 317 cwh += cxy;
287 } else { /* expand */ 318 }
288 if (cxy > 0) { /* position */ 319 else
289 float pos; 320 { /* expand */
321 if (cxy > 0)
322 { /* position */
323 float pos;
290 324
291 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2); 325 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2);
292 cp = xpmwidthheight - cincr; 326 cp = xpmwidthheight - cincr;
293 if (pos <= 0) 327 if (pos <= 0)
294 cp = 0; 328 cp = 0;
295 else if (pos < cp) 329 else if (pos < cp)
296 cp = pos; 330 cp = pos;
331 }
332 cxy = 0;
333 cwh = widthheight;
334 }
297 } 335 }
298 cxy = 0;
299 cwh = widthheight;
300 }
301 }
302 cincr /= widthheight; 336 cincr /= widthheight;
303 *wh = cwh; 337 *wh = cwh;
304 *xy = cxy; 338 *xy = cxy;
305 *incr = cincr; 339 *incr = cincr;
306 *p = cp; 340 *p = cp;
307} 341}
308 342
309Pixmap 343Pixmap
310rxvt_term::set_bgPixmap (const char *file) 344rxvt_term::set_bgPixmap (const char *file)
311{ 345{
312 char *f; 346 char *f;
313 347
314 assert(file != NULL); 348 assert (file != NULL);
315 349
316 if (bgPixmap.pixmap != None) { 350 if (bgPixmap.pixmap != None)
351 {
317 XFreePixmap(Xdisplay, bgPixmap.pixmap); 352 XFreePixmap (display->display, bgPixmap.pixmap);
318 bgPixmap.pixmap = None; 353 bgPixmap.pixmap = None;
319 } 354 }
320 XSetWindowBackground(Xdisplay, TermWin.vt, PixColors[Color_bg]); 355 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
321 356
322 if (*file != '\0') { 357 if (*file != '\0')
358 {
323/* XWindowAttributes attr; */ 359 /* XWindowAttributes attr; */
324 360
325 /* 361 /*
326 * we already have the required attributes 362 * we already have the required attributes
327 */ 363 */
328/* XGetWindowAttributes(Xdisplay, TermWin.vt, &attr); */ 364 /* XGetWindowAttributes (display->display, TermWin.vt, &attr); */
329 365
330 xpmAttr.closeness = 30000; 366 xpmAttr.closeness = 30000;
331 xpmAttr.colormap = XCMAP; 367 xpmAttr.colormap = display->cmap;
332 xpmAttr.visual = XVISUAL; 368 xpmAttr.visual = display->visual;
333 xpmAttr.depth = XDEPTH; 369 xpmAttr.depth = display->depth;
334 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual | 370 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual |
335 XpmDepth | XpmSize | XpmReturnPixels); 371 XpmDepth | XpmSize | XpmReturnPixels);
336 372
337 /* search environment variables here too */ 373 /* search environment variables here too */
338 f = (char *)rxvt_File_find(file, ".xpm", rs[Rs_path]); 374 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
339 if (f == NULL 375 if (f == NULL
340 || XpmReadFileToPixmap(Xdisplay, Xroot, f, 376 || XpmReadFileToPixmap (display->display, display->root, f,
341 &bgPixmap.pixmap, NULL, 377 &bgPixmap.pixmap, NULL,
342 &xpmAttr)) { 378 &xpmAttr))
343 char *p; 379 {
380 char *p;
344 381
345 /* semi-colon delimited */ 382 /* semi-colon delimited */
346 if ((p = STRCHR(file, ';')) == NULL) 383 if ((p = STRCHR (file, ';')) == NULL)
347 p = STRCHR(file, '\0'); 384 p = STRCHR (file, '\0');
348 385
349 rxvt_print_error("couldn't load XPM file \"%.*s\"", (p - file), 386 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.", (p - file), file);
350 file); 387 }
351 } 388
352 free(f); 389 free (f);
353 } 390 }
391
354 resize_pixmap (); 392 resize_pixmap ();
355 return bgPixmap.pixmap; 393 return bgPixmap.pixmap;
356} 394}
357 395
358#endif /* XPM_BACKGROUND */ 396#endif /* XPM_BACKGROUND */

Diff Legend

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