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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.12 by pcg, Thu Apr 8 20:31:45 2004 UTC

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

Diff Legend

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