ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/misc.C
(Generate patch)

Comparing rxvt-unicode/src/misc.C (file contents):
Revision 1.6 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.8 by pcg, Fri Feb 27 02:52:51 2004 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1996 mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston 6 * Copyright (c) 1996 mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8 * Copyright (c) 1998-2000 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1998-2000 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
9 * 10 *
10 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 14 * (at your option) any later version.
… …
32{ 33{
33 return str ? strdup (str) : 0; 34 return str ? strdup (str) : 0;
34} 35}
35 36
36/* EXTPROTO */ 37/* EXTPROTO */
37char * 38char *
38rxvt_r_basename(const char *str) 39rxvt_r_basename (const char *str)
39{ 40{
40 char *base = STRRCHR(str, '/'); 41 char *base = STRRCHR (str, '/');
41 42
42 return (char *)(base ? base + 1 : str); 43 return (char *) (base ? base + 1 : str);
43} 44}
44 45
45/* 46/*
46 * Print an error message 47 * Print an error message
47 */ 48 */
48/* EXTPROTO */ 49/* EXTPROTO */
49void 50void
50rxvt_print_error(const char *fmt,...) 51rxvt_print_error (const char *fmt,...)
51{ 52{
52 va_list arg_ptr; 53 va_list arg_ptr;
53 54
54 va_start(arg_ptr, fmt); 55 va_start (arg_ptr, fmt);
55 fprintf(stderr, APL_NAME ": "); 56 fprintf (stderr, APL_NAME ": ");
56 vfprintf(stderr, fmt, arg_ptr); 57 vfprintf (stderr, fmt, arg_ptr);
57 fprintf(stderr, "\n"); 58 fprintf (stderr, "\n");
58 va_end(arg_ptr); 59 va_end (arg_ptr);
59} 60}
60 61
61/* 62/*
62 * check that the first characters of S1 match S2 63 * check that the first characters of S1 match S2
63 * 64 *
… …
66 * Match 67 * Match
67 * return: STRLEN (S2) 68 * return: STRLEN (S2)
68 */ 69 */
69/* EXTPROTO */ 70/* EXTPROTO */
70int 71int
71rxvt_Str_match(const char *s1, const char *s2) 72rxvt_Str_match (const char *s1, const char *s2)
72{ 73{
73 int n = STRLEN(s2); 74 int n = STRLEN (s2);
74 75
75 return ((STRNCMP(s1, s2, n) == 0) ? n : 0); 76 return ((STRNCMP (s1, s2, n) == 0) ? n : 0);
76} 77}
77 78
78/* EXTPROTO */ 79/* EXTPROTO */
79const char * 80const char *
80rxvt_Str_skip_space(const char *str) 81rxvt_Str_skip_space (const char *str)
81{ 82{
82 if (str) 83 if (str)
83 while (*str && isspace(*str)) 84 while (*str && isspace (*str))
84 str++; 85 str++;
86
85 return str; 87 return str;
86} 88}
87 89
88/* 90/*
89 * remove leading/trailing space and strip-off leading/trailing quotes. 91 * remove leading/trailing space and strip-off leading/trailing quotes.
90 * in place. 92 * in place.
91 */ 93 */
92/* EXTPROTO */ 94/* EXTPROTO */
93char * 95char *
94rxvt_Str_trim(char *str) 96rxvt_Str_trim (char *str)
95{ 97{
96 char *r, *s; 98 char *r, *s;
97 int n; 99 int n;
98 100
99 if (!str || !*str) /* shortcut */ 101 if (!str || !*str) /* shortcut */
100 return str; 102 return str;
101 103
102 /* skip leading spaces */ 104 /* skip leading spaces */
103 for (s = str; *s && isspace(*s); s++) ; 105 for (s = str; *s && isspace (*s); s++) ;
104 /* goto end of string */ 106 /* goto end of string */
105 for (n = 0, r = s; *r++; n++) ; 107 for (n = 0, r = s; *r++; n++) ;
106 r -= 2; 108 r -= 2;
107 /* dump return */ 109 /* dump return */
108 if (n > 0 && *r == '\n') 110 if (n > 0 && *r == '\n')
109 n--, r--; 111 n--, r--;
110 /* backtrack along trailing spaces */ 112 /* backtrack along trailing spaces */
111 for (; n > 0 && isspace(*r); r--, n--) ; 113 for (; n > 0 && isspace (*r); r--, n--) ;
112 /* skip matching leading/trailing quotes */ 114 /* skip matching leading/trailing quotes */
113 if (*s == '"' && *r == '"' && n > 1) 115 if (*s == '"' && *r == '"' && n > 1)
114 { 116 {
115 s++; 117 s++;
116 n -= 2; 118 n -= 2;
117 } 119 }
120
118 /* copy back over: forwards copy */ 121 /* copy back over: forwards copy */
119 for (r = str; n; n--) 122 for (r = str; n; n--)
120 *r++ = *s++; 123 *r++ = *s++;
121 *r = '\0'; 124 *r = '\0';
122 125
… …
137 * 140 *
138 * returns the converted string length 141 * returns the converted string length
139 */ 142 */
140/* EXTPROTO */ 143/* EXTPROTO */
141int 144int
142rxvt_Str_escaped(char *str) 145rxvt_Str_escaped (char *str)
143{ 146{
144 char ch, *s, *d; 147 char ch, *s, *d;
145 int i, num, append = 0; 148 int i, num, append = 0;
146 149
147 if (!str || !*str) 150 if (!str || !*str)
… …
152 if (*s == 'M' && s[1] == '-') 155 if (*s == 'M' && s[1] == '-')
153 { 156 {
154 /* Emacs convenience, replace leading `M-..' with `\E..' */ 157 /* Emacs convenience, replace leading `M-..' with `\E..' */
155 *d++ = C0_ESC; 158 *d++ = C0_ESC;
156 s += 2; 159 s += 2;
157 if (toupper(*s) == 'X') 160 if (toupper (*s) == 'X')
158 /* append carriage-return for `M-xcommand' */ 161 /* append carriage-return for `M-xcommand' */
159 for (*d++ = 'x', append = '\r', s++; isspace(*s); s++) ; 162 for (*d++ = 'x', append = '\r', s++; isspace (*s); s++) ;
160 } 163 }
161 for (; (ch = *s++);) 164 for (; (ch = *s++);)
162 { 165 {
163 if (ch == '\\') 166 if (ch == '\\')
164 { 167 {
… …
189 ch = C0_HT; /* tab */ 192 ch = C0_HT; /* tab */
190 } 193 }
191 else if (ch == '^') 194 else if (ch == '^')
192 { 195 {
193 ch = *s++; 196 ch = *s++;
194 ch = toupper(ch); 197 ch = toupper (ch);
195 ch = (ch == '?' ? 127 : (ch - '@')); 198 ch = (ch == '?' ? 127 : (ch - '@'));
196 } 199 }
197 *d++ = ch; 200 *d++ = ch;
198 } 201 }
199 202
… …
215 * are properly returned 218 * are properly returned
216 * Caller should free each entry and array when done 219 * Caller should free each entry and array when done
217 */ 220 */
218/* EXTPROTO */ 221/* EXTPROTO */
219char ** 222char **
220rxvt_splitcommastring(const char *cs) 223rxvt_splitcommastring (const char *cs)
221{ 224{
222 int l, n, p; 225 int l, n, p;
223 const char *s, *t; 226 const char *s, *t;
224 char **ret; 227 char **ret;
225 228
… …
227 s = ""; 230 s = "";
228 231
229 for (n = 1, t = s; *t; t++) 232 for (n = 1, t = s; *t; t++)
230 if (*t == ',') 233 if (*t == ',')
231 n++; 234 n++;
232 ret = (char **)malloc((n + 1) * sizeof(char *)); 235 ret = (char **)malloc ((n + 1) * sizeof (char *));
233 ret[n] = NULL; 236 ret[n] = NULL;
234 237
235 for (l = 0, t = s; l < n; l++) 238 for (l = 0, t = s; l < n; l++)
236 { 239 {
237 for ( ; *t && *t != ','; t++) ; 240 for ( ; *t && *t != ','; t++) ;
238 p = t - s; 241 p = t - s;
239 ret[l] = (char *)malloc(p + 1); 242 ret[l] = (char *)malloc (p + 1);
240 strncpy(ret[l], s, p); 243 strncpy (ret[l], s, p);
241 ret[l][p] = '\0'; 244 ret[l][p] = '\0';
242 rxvt_Str_trim(ret[l]); 245 rxvt_Str_trim (ret[l]);
243 s = ++t; 246 s = ++t;
244 } 247 }
245 return ret; 248 return ret;
246} 249}
247 250
… …
258 * 261 *
259 * FILE is either semi-colon or zero terminated 262 * FILE is either semi-colon or zero terminated
260 */ 263 */
261/* INTPROTO */ 264/* INTPROTO */
262char * 265char *
263rxvt_File_search_path(const char *pathlist, const char *file, const char *ext) 266rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
264{ 267{
265 int maxpath, len; 268 int maxpath, len;
266 const char *p, *path; 269 const char *p, *path;
267 char name[256]; 270 char name[256];
268 271
269 if (!access(file, R_OK)) /* found (plain name) in current directory */ 272 if (!access (file, R_OK)) /* found (plain name) in current directory */
270 return STRDUP(file); 273 return STRDUP (file);
271 274
272 /* semi-colon delimited */ 275 /* semi-colon delimited */
273 if ((p = STRCHR(file, ';'))) 276 if ((p = STRCHR (file, ';')))
274 len = (p - file); 277 len = (p - file);
275 else 278 else
276 len = STRLEN(file); 279 len = STRLEN (file);
277 280
278#ifdef DEBUG_SEARCH_PATH 281#ifdef DEBUG_SEARCH_PATH
279 getcwd(name, sizeof(name)); 282 getcwd (name, sizeof (name));
280 fprintf(stderr, "pwd: \"%s\"\n", name); 283 fprintf (stderr, "pwd: \"%s\"\n", name);
281 fprintf(stderr, "find: \"%.*s\"\n", len, file); 284 fprintf (stderr, "find: \"%.*s\"\n", len, file);
282#endif 285#endif
283 286
284 /* leave room for an extra '/' and trailing '\0' */ 287 /* leave room for an extra '/' and trailing '\0' */
285 maxpath = sizeof(name) - (len + (ext ? STRLEN(ext) : 0) + 2); 288 maxpath = sizeof (name) - (len + (ext ? STRLEN (ext) : 0) + 2);
286 if (maxpath <= 0) 289 if (maxpath <= 0)
287 return NULL; 290 return NULL;
288 291
289 /* check if we can find it now */ 292 /* check if we can find it now */
290 STRNCPY(name, file, len); 293 STRNCPY (name, file, len);
291 name[len] = '\0'; 294 name[len] = '\0';
292 295
293 if (!access(name, R_OK)) 296 if (!access (name, R_OK))
294 return STRDUP(name); 297 return STRDUP (name);
295 if (ext) 298 if (ext)
296 { 299 {
297 STRCAT(name, ext); 300 STRCAT (name, ext);
298 if (!access(name, R_OK)) 301 if (!access (name, R_OK))
299 return STRDUP(name); 302 return STRDUP (name);
300 } 303 }
301 for (path = pathlist; path != NULL && *path != '\0'; path = p) 304 for (path = pathlist; path != NULL && *path != '\0'; path = p)
302 { 305 {
303 int n; 306 int n;
304 307
305 /* colon delimited */ 308 /* colon delimited */
306 if ((p = STRCHR(path, ':')) == NULL) 309 if ((p = STRCHR (path, ':')) == NULL)
307 p = STRCHR(path, '\0'); 310 p = STRCHR (path, '\0');
308 311
309 n = (p - path); 312 n = (p - path);
310 if (*p != '\0') 313 if (*p != '\0')
311 p++; 314 p++;
312 315
313 if (n > 0 && n <= maxpath) 316 if (n > 0 && n <= maxpath)
314 { 317 {
315 STRNCPY(name, path, n); 318 STRNCPY (name, path, n);
316 if (name[n - 1] != '/') 319 if (name[n - 1] != '/')
317 name[n++] = '/'; 320 name[n++] = '/';
318 name[n] = '\0'; 321 name[n] = '\0';
319 STRNCAT(name, file, len); 322 STRNCAT (name, file, len);
320 323
321 if (!access(name, R_OK)) 324 if (!access (name, R_OK))
322 return STRDUP(name); 325 return STRDUP (name);
323 if (ext) 326 if (ext)
324 { 327 {
325 STRCAT(name, ext); 328 STRCAT (name, ext);
326 if (!access(name, R_OK)) 329 if (!access (name, R_OK))
327 return STRDUP(name); 330 return STRDUP (name);
328 } 331 }
329 } 332 }
330 } 333 }
331 return NULL; 334 return NULL;
332} 335}
333 336
334/* EXTPROTO */ 337/* EXTPROTO */
335char * 338char *
336rxvt_File_find(const char *file, const char *ext, const char *path) 339rxvt_File_find (const char *file, const char *ext, const char *path)
337{ 340{
338 char *f; 341 char *f;
339 342
340 if (file == NULL || *file == '\0') 343 if (file == NULL || *file == '\0')
341 return NULL; 344 return NULL;
342 345
343 /* search environment variables here too */ 346 /* search environment variables here too */
344 if ((f = rxvt_File_search_path(path, file, ext)) == NULL) 347 if ((f = rxvt_File_search_path (path, file, ext)) == NULL)
345#ifdef PATH_ENV 348#ifdef PATH_ENV
346 if ((f = rxvt_File_search_path(getenv(PATH_ENV), file, ext)) == NULL) 349 if ((f = rxvt_File_search_path (getenv (PATH_ENV), file, ext)) == NULL)
347#endif 350#endif
348 f = rxvt_File_search_path(getenv("PATH"), file, ext); 351 f = rxvt_File_search_path (getenv ("PATH"), file, ext);
349 352
350#ifdef DEBUG_SEARCH_PATH 353#ifdef DEBUG_SEARCH_PATH
351 if (f) 354 if (f)
352 fprintf(stderr, "found: \"%s\"\n", f); 355 fprintf (stderr, "found: \"%s\"\n", f);
353#endif 356#endif
354 357
355 return f; 358 return f;
356} 359}
357#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 360#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
… …
364 * Draw top/left and bottom/right border shadows around windows 367 * Draw top/left and bottom/right border shadows around windows
365 */ 368 */
366#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 369#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
367/* EXTPROTO */ 370/* EXTPROTO */
368void 371void
369rxvt_Draw_Shadow(Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) 372rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
370{ 373{
371 int shadow; 374 int shadow;
372 375
373 shadow = (w == 0 || h == 0) ? 1 : SHADOW; 376 shadow = (w == 0 || h == 0) ? 1 : SHADOW;
374 w += x - 1; 377 w += x - 1;
375 h += y - 1; 378 h += y - 1;
376 for (; shadow-- > 0; x++, y++, w--, h--) 379 for (; shadow-- > 0; x++, y++, w--, h--)
377 { 380 {
378 XDrawLine(display, win, topShadow, x, y, w, y); 381 XDrawLine (display, win, topShadow, x, y, w, y);
379 XDrawLine(display, win, topShadow, x, y, x, h); 382 XDrawLine (display, win, topShadow, x, y, x, h);
380 XDrawLine(display, win, botShadow, w, h, w, y + 1); 383 XDrawLine (display, win, botShadow, w, h, w, y + 1);
381 XDrawLine(display, win, botShadow, w, h, x + 1, h); 384 XDrawLine (display, win, botShadow, w, h, x + 1, h);
382 } 385 }
383} 386}
384#endif 387#endif
385 388
386/* button shapes */ 389/* button shapes */
387#ifdef MENUBAR 390#ifdef MENUBAR
388/* EXTPROTO */ 391/* EXTPROTO */
389void 392void
390rxvt_Draw_Triangle(Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type) 393rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
391{ 394{
392 switch (type) 395 switch (type)
393 { 396 {
394 case 'r': /* right triangle */ 397 case 'r': /* right triangle */
395 XDrawLine(display, win, topShadow, x, y, x, y + w); 398 XDrawLine (display, win, topShadow, x, y, x, y + w);
396 XDrawLine(display, win, topShadow, x, y, x + w, y + w / 2); 399 XDrawLine (display, win, topShadow, x, y, x + w, y + w / 2);
397 XDrawLine(display, win, botShadow, x, y + w, x + w, y + w / 2); 400 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w / 2);
398 break; 401 break;
399 402
400 case 'l': /* left triangle */ 403 case 'l': /* left triangle */
401 XDrawLine(display, win, botShadow, x + w, y + w, x + w, y); 404 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
402 XDrawLine(display, win, botShadow, x + w, y + w, x, y + w / 2); 405 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w / 2);
403 XDrawLine(display, win, topShadow, x, y + w / 2, x + w, y); 406 XDrawLine (display, win, topShadow, x, y + w / 2, x + w, y);
404 break; 407 break;
405 408
406 case 'd': /* down triangle */ 409 case 'd': /* down triangle */
407 XDrawLine(display, win, topShadow, x, y, x + w / 2, y + w); 410 XDrawLine (display, win, topShadow, x, y, x + w / 2, y + w);
408 XDrawLine(display, win, topShadow, x, y, x + w, y); 411 XDrawLine (display, win, topShadow, x, y, x + w, y);
409 XDrawLine(display, win, botShadow, x + w, y, x + w / 2, y + w); 412 XDrawLine (display, win, botShadow, x + w, y, x + w / 2, y + w);
410 break; 413 break;
411 414
412 case 'u': /* up triangle */ 415 case 'u': /* up triangle */
413 XDrawLine(display, win, botShadow, x + w, y + w, x + w / 2, y); 416 XDrawLine (display, win, botShadow, x + w, y + w, x + w / 2, y);
414 XDrawLine(display, win, botShadow, x + w, y + w, x, y + w); 417 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w);
415 XDrawLine(display, win, topShadow, x, y + w, x + w / 2, y); 418 XDrawLine (display, win, topShadow, x, y + w, x + w / 2, y);
416 break; 419 break;
417#if 0 420#if 0
418 case 's': /* square */ 421 case 's': /* square */
419 XDrawLine(display, win, topShadow, x + w, y, x, y); 422 XDrawLine (display, win, topShadow, x + w, y, x, y);
420 XDrawLine(display, win, topShadow, x, y, x, y + w); 423 XDrawLine (display, win, topShadow, x, y, x, y + w);
421 XDrawLine(display, win, botShadow, x, y + w, x + w, y + w); 424 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w);
422 XDrawLine(display, win, botShadow, x + w, y + w, x + w, y); 425 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
423 break; 426 break;
424#endif 427#endif
425 428
426 } 429 }
427} 430}

Diff Legend

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