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.4 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.5 by pcg, Sun Feb 1 01:34:41 2004 UTC

… …
35 35
36/* EXTPROTO */ 36/* EXTPROTO */
37char * 37char *
38rxvt_r_basename(const char *str) 38rxvt_r_basename(const char *str)
39{ 39{
40 char *base = STRRCHR(str, '/'); 40 char *base = STRRCHR(str, '/');
41 41
42 return (char *)(base ? base + 1 : str); 42 return (char *)(base ? base + 1 : str);
43} 43}
44 44
45/* 45/*
46 * Print an error message 46 * Print an error message
47 */ 47 */
48/* EXTPROTO */ 48/* EXTPROTO */
49void 49void
50rxvt_print_error(const char *fmt,...) 50rxvt_print_error(const char *fmt,...)
51{ 51{
52 va_list arg_ptr; 52 va_list arg_ptr;
53 53
54 va_start(arg_ptr, fmt); 54 va_start(arg_ptr, fmt);
55 fprintf(stderr, APL_NAME ": "); 55 fprintf(stderr, APL_NAME ": ");
56 vfprintf(stderr, fmt, arg_ptr); 56 vfprintf(stderr, fmt, arg_ptr);
57 fprintf(stderr, "\n"); 57 fprintf(stderr, "\n");
58 va_end(arg_ptr); 58 va_end(arg_ptr);
59} 59}
60 60
61/* 61/*
62 * check that the first characters of S1 match S2 62 * check that the first characters of S1 match S2
63 * 63 *
… …
68 */ 68 */
69/* EXTPROTO */ 69/* EXTPROTO */
70int 70int
71rxvt_Str_match(const char *s1, const char *s2) 71rxvt_Str_match(const char *s1, const char *s2)
72{ 72{
73 int n = STRLEN(s2); 73 int n = STRLEN(s2);
74 74
75 return ((STRNCMP(s1, s2, n) == 0) ? n : 0); 75 return ((STRNCMP(s1, s2, n) == 0) ? n : 0);
76} 76}
77 77
78/* EXTPROTO */ 78/* EXTPROTO */
79const char * 79const char *
80rxvt_Str_skip_space(const char *str) 80rxvt_Str_skip_space(const char *str)
81{ 81{
82 if (str) 82 if (str)
83 while (*str && isspace(*str)) 83 while (*str && isspace(*str))
84 str++; 84 str++;
85 return str; 85 return str;
86} 86}
87 87
88/* 88/*
89 * remove leading/trailing space and strip-off leading/trailing quotes. 89 * remove leading/trailing space and strip-off leading/trailing quotes.
90 * in place. 90 * in place.
91 */ 91 */
92/* EXTPROTO */ 92/* EXTPROTO */
93char * 93char *
94rxvt_Str_trim(char *str) 94rxvt_Str_trim(char *str)
95{ 95{
96 char *r, *s; 96 char *r, *s;
97 int n; 97 int n;
98 98
99 if (!str || !*str) /* shortcut */ 99 if (!str || !*str) /* shortcut */
100 return str;
101
102/* skip leading spaces */
103 for (s = str; *s && isspace(*s); s++) ;
104/* goto end of string */
105 for (n = 0, r = s; *r++; n++) ;
106 r -= 2;
107/* dump return */
108 if (n > 0 && *r == '\n')
109 n--, r--;
110/* backtrack along trailing spaces */
111 for (; n > 0 && isspace(*r); r--, n--) ;
112/* skip matching leading/trailing quotes */
113 if (*s == '"' && *r == '"' && n > 1) {
114 s++;
115 n -= 2;
116 }
117/* copy back over: forwards copy */
118 for (r = str; n; n--)
119 *r++ = *s++;
120 *r = '\0';
121
122 return str; 100 return str;
101
102 /* skip leading spaces */
103 for (s = str; *s && isspace(*s); s++) ;
104 /* goto end of string */
105 for (n = 0, r = s; *r++; n++) ;
106 r -= 2;
107 /* dump return */
108 if (n > 0 && *r == '\n')
109 n--, r--;
110 /* backtrack along trailing spaces */
111 for (; n > 0 && isspace(*r); r--, n--) ;
112 /* skip matching leading/trailing quotes */
113 if (*s == '"' && *r == '"' && n > 1)
114 {
115 s++;
116 n -= 2;
117 }
118 /* copy back over: forwards copy */
119 for (r = str; n; n--)
120 *r++ = *s++;
121 *r = '\0';
122
123 return str;
123} 124}
124 125
125/* 126/*
126 * in-place interpretation of string: 127 * in-place interpretation of string:
127 * 128 *
… …
138 */ 139 */
139/* EXTPROTO */ 140/* EXTPROTO */
140int 141int
141rxvt_Str_escaped(char *str) 142rxvt_Str_escaped(char *str)
142{ 143{
143 char ch, *s, *d; 144 char ch, *s, *d;
144 int i, num, append = 0; 145 int i, num, append = 0;
145 146
146 if (!str || !*str) 147 if (!str || !*str)
147 return 0; 148 return 0;
148 149
149 d = s = str; 150 d = s = str;
150 151
151 if (*s == 'M' && s[1] == '-') { 152 if (*s == 'M' && s[1] == '-')
153 {
152 /* Emacs convenience, replace leading `M-..' with `\E..' */ 154 /* Emacs convenience, replace leading `M-..' with `\E..' */
153 *d++ = C0_ESC; 155 *d++ = C0_ESC;
154 s += 2; 156 s += 2;
155 if (toupper(*s) == 'X') 157 if (toupper(*s) == 'X')
156 /* append carriage-return for `M-xcommand' */ 158 /* append carriage-return for `M-xcommand' */
157 for (*d++ = 'x', append = '\r', s++; isspace(*s); s++) ; 159 for (*d++ = 'x', append = '\r', s++; isspace(*s); s++) ;
158 } 160 }
159 for (; (ch = *s++);) { 161 for (; (ch = *s++);)
162 {
160 if (ch == '\\') { 163 if (ch == '\\')
164 {
161 ch = *s++; 165 ch = *s++;
162 if (ch >= '0' && ch <= '7') { /* octal */ 166 if (ch >= '0' && ch <= '7')
163 num = ch - '0'; 167 { /* octal */
168 num = ch - '0';
164 for (i = 0; i < 2; i++, s++) { 169 for (i = 0; i < 2; i++, s++)
165 ch = *s; 170 {
171 ch = *s;
166 if (ch < '0' || ch > '7') 172 if (ch < '0' || ch > '7')
167 break; 173 break;
168 num = num * 8 + ch - '0'; 174 num = num * 8 + ch - '0';
169 } 175 }
170 ch = (char)num; 176 ch = (char)num;
171 } else if (ch == 'a') 177 }
178 else if (ch == 'a')
172 ch = C0_BEL; /* bell */ 179 ch = C0_BEL; /* bell */
173 else if (ch == 'b') 180 else if (ch == 'b')
174 ch = C0_BS; /* backspace */ 181 ch = C0_BS; /* backspace */
175 else if (ch == 'E' || ch == 'e') 182 else if (ch == 'E' || ch == 'e')
176 ch = C0_ESC; /* escape */ 183 ch = C0_ESC; /* escape */
184 else if (ch == 'n')
185 ch = '\n'; /* newline */
186 else if (ch == 'r')
187 ch = '\r'; /* carriage-return */
188 else if (ch == 't')
189 ch = C0_HT; /* tab */
190 }
177 else if (ch == 'n') 191 else if (ch == '^')
178 ch = '\n'; /* newline */ 192 {
179 else if (ch == 'r')
180 ch = '\r'; /* carriage-return */
181 else if (ch == 't')
182 ch = C0_HT; /* tab */
183 } else if (ch == '^') {
184 ch = *s++; 193 ch = *s++;
185 ch = toupper(ch); 194 ch = toupper(ch);
186 ch = (ch == '?' ? 127 : (ch - '@')); 195 ch = (ch == '?' ? 127 : (ch - '@'));
187 } 196 }
188 *d++ = ch; 197 *d++ = ch;
189 } 198 }
190 199
191/* ESC] is an XTerm escape sequence, must be terminated */ 200 /* ESC] is an XTerm escape sequence, must be terminated */
192 if (*str == '\0' && str[1] == C0_ESC && str[2] == ']') 201 if (*str == '\0' && str[1] == C0_ESC && str[2] == ']')
193 append = CHAR_ST; 202 append = CHAR_ST;
194 203
195/* add trailing character as required */ 204 /* add trailing character as required */
196 if (append && d[-1] != append) 205 if (append && d[-1] != append)
197 *d++ = append; 206 *d++ = append;
198 *d = '\0'; 207 *d = '\0';
199 208
200 return (d - str); 209 return (d - str);
201} 210}
202 211
203/* 212/*
204 * Split a comma-separated string into an array, stripping leading and 213 * Split a comma-separated string into an array, stripping leading and
205 * trailing spaces (and paired quotes) from each entry. Empty strings 214 * trailing spaces (and paired quotes) from each entry. Empty strings
… …
208 */ 217 */
209/* EXTPROTO */ 218/* EXTPROTO */
210char ** 219char **
211rxvt_splitcommastring(const char *cs) 220rxvt_splitcommastring(const char *cs)
212{ 221{
213 int l, n, p; 222 int l, n, p;
214 const char *s, *t; 223 const char *s, *t;
215 char **ret; 224 char **ret;
216 225
217 if ((s = cs) == NULL) 226 if ((s = cs) == NULL)
218 s = ""; 227 s = "";
219 228
220 for (n = 1, t = s; *t; t++) 229 for (n = 1, t = s; *t; t++)
221 if (*t == ',') 230 if (*t == ',')
222 n++; 231 n++;
223 ret = (char **)malloc((n + 1) * sizeof(char *)); 232 ret = (char **)malloc((n + 1) * sizeof(char *));
224 ret[n] = NULL; 233 ret[n] = NULL;
225 234
226 for (l = 0, t = s; l < n; l++) { 235 for (l = 0, t = s; l < n; l++)
236 {
227 for ( ; *t && *t != ','; t++) ; 237 for ( ; *t && *t != ','; t++) ;
228 p = t - s; 238 p = t - s;
229 ret[l] = (char *)malloc(p + 1); 239 ret[l] = (char *)malloc(p + 1);
230 strncpy(ret[l], s, p); 240 strncpy(ret[l], s, p);
231 ret[l][p] = '\0'; 241 ret[l][p] = '\0';
232 rxvt_Str_trim(ret[l]); 242 rxvt_Str_trim(ret[l]);
233 s = ++t; 243 s = ++t;
234 } 244 }
235 return ret; 245 return ret;
236} 246}
237 247
238/*----------------------------------------------------------------------* 248/*----------------------------------------------------------------------*
239 * file searching 249 * file searching
240 */ 250 */
… …
250 */ 260 */
251/* INTPROTO */ 261/* INTPROTO */
252char * 262char *
253rxvt_File_search_path(const char *pathlist, const char *file, const char *ext) 263rxvt_File_search_path(const char *pathlist, const char *file, const char *ext)
254{ 264{
255 int maxpath, len; 265 int maxpath, len;
256 const char *p, *path; 266 const char *p, *path;
257 char name[256]; 267 char name[256];
258 268
259 if (!access(file, R_OK)) /* found (plain name) in current directory */ 269 if (!access(file, R_OK)) /* found (plain name) in current directory */
260 return STRDUP(file); 270 return STRDUP(file);
261 271
262/* semi-colon delimited */ 272 /* semi-colon delimited */
263 if ((p = STRCHR(file, ';'))) 273 if ((p = STRCHR(file, ';')))
264 len = (p - file); 274 len = (p - file);
265 else 275 else
266 len = STRLEN(file); 276 len = STRLEN(file);
267 277
268#ifdef DEBUG_SEARCH_PATH 278#ifdef DEBUG_SEARCH_PATH
269 getcwd(name, sizeof(name)); 279 getcwd(name, sizeof(name));
270 fprintf(stderr, "pwd: \"%s\"\n", name); 280 fprintf(stderr, "pwd: \"%s\"\n", name);
271 fprintf(stderr, "find: \"%.*s\"\n", len, file); 281 fprintf(stderr, "find: \"%.*s\"\n", len, file);
272#endif 282#endif
273 283
274/* leave room for an extra '/' and trailing '\0' */ 284 /* leave room for an extra '/' and trailing '\0' */
275 maxpath = sizeof(name) - (len + (ext ? STRLEN(ext) : 0) + 2); 285 maxpath = sizeof(name) - (len + (ext ? STRLEN(ext) : 0) + 2);
276 if (maxpath <= 0) 286 if (maxpath <= 0)
277 return NULL;
278
279/* check if we can find it now */
280 STRNCPY(name, file, len);
281 name[len] = '\0';
282
283 if (!access(name, R_OK))
284 return STRDUP(name);
285 if (ext) {
286 STRCAT(name, ext);
287 if (!access(name, R_OK))
288 return STRDUP(name);
289 }
290 for (path = pathlist; path != NULL && *path != '\0'; path = p) {
291 int n;
292
293 /* colon delimited */
294 if ((p = STRCHR(path, ':')) == NULL)
295 p = STRCHR(path, '\0');
296
297 n = (p - path);
298 if (*p != '\0')
299 p++;
300
301 if (n > 0 && n <= maxpath) {
302 STRNCPY(name, path, n);
303 if (name[n - 1] != '/')
304 name[n++] = '/';
305 name[n] = '\0';
306 STRNCAT(name, file, len);
307
308 if (!access(name, R_OK))
309 return STRDUP(name);
310 if (ext) {
311 STRCAT(name, ext);
312 if (!access(name, R_OK))
313 return STRDUP(name);
314 }
315 }
316 }
317 return NULL; 287 return NULL;
288
289 /* check if we can find it now */
290 STRNCPY(name, file, len);
291 name[len] = '\0';
292
293 if (!access(name, R_OK))
294 return STRDUP(name);
295 if (ext)
296 {
297 STRCAT(name, ext);
298 if (!access(name, R_OK))
299 return STRDUP(name);
300 }
301 for (path = pathlist; path != NULL && *path != '\0'; path = p)
302 {
303 int n;
304
305 /* colon delimited */
306 if ((p = STRCHR(path, ':')) == NULL)
307 p = STRCHR(path, '\0');
308
309 n = (p - path);
310 if (*p != '\0')
311 p++;
312
313 if (n > 0 && n <= maxpath)
314 {
315 STRNCPY(name, path, n);
316 if (name[n - 1] != '/')
317 name[n++] = '/';
318 name[n] = '\0';
319 STRNCAT(name, file, len);
320
321 if (!access(name, R_OK))
322 return STRDUP(name);
323 if (ext)
324 {
325 STRCAT(name, ext);
326 if (!access(name, R_OK))
327 return STRDUP(name);
328 }
329 }
330 }
331 return NULL;
318} 332}
319 333
320/* EXTPROTO */ 334/* EXTPROTO */
321char * 335char *
322rxvt_File_find(const char *file, const char *ext, const char *path) 336rxvt_File_find(const char *file, const char *ext, const char *path)
323{ 337{
324 char *f; 338 char *f;
325 339
326 if (file == NULL || *file == '\0') 340 if (file == NULL || *file == '\0')
327 return NULL; 341 return NULL;
328 342
329/* search environment variables here too */ 343 /* search environment variables here too */
330 if ((f = rxvt_File_search_path(path, file, ext)) == NULL) 344 if ((f = rxvt_File_search_path(path, file, ext)) == NULL)
331#ifdef PATH_ENV 345#ifdef PATH_ENV
332 if ((f = rxvt_File_search_path(getenv(PATH_ENV), file, ext)) == NULL) 346 if ((f = rxvt_File_search_path(getenv(PATH_ENV), file, ext)) == NULL)
333#endif 347#endif
334 f = rxvt_File_search_path(getenv("PATH"), file, ext); 348 f = rxvt_File_search_path(getenv("PATH"), file, ext);
335 349
336#ifdef DEBUG_SEARCH_PATH 350#ifdef DEBUG_SEARCH_PATH
337 if (f) 351 if (f)
338 fprintf(stderr, "found: \"%s\"\n", f); 352 fprintf(stderr, "found: \"%s\"\n", f);
339#endif 353#endif
340 354
341 return f; 355 return f;
342} 356}
343#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 357#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
344 358
345/*----------------------------------------------------------------------* 359/*----------------------------------------------------------------------*
346 * miscellaneous drawing routines 360 * miscellaneous drawing routines
… …
352#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 366#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
353/* EXTPROTO */ 367/* EXTPROTO */
354void 368void
355rxvt_Draw_Shadow(Display *Xdisplay, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) 369rxvt_Draw_Shadow(Display *Xdisplay, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
356{ 370{
357 int shadow; 371 int shadow;
358 372
359 shadow = (w == 0 || h == 0) ? 1 : SHADOW; 373 shadow = (w == 0 || h == 0) ? 1 : SHADOW;
360 w += x - 1; 374 w += x - 1;
361 h += y - 1; 375 h += y - 1;
362 for (; shadow-- > 0; x++, y++, w--, h--) { 376 for (; shadow-- > 0; x++, y++, w--, h--)
377 {
363 XDrawLine(Xdisplay, win, topShadow, x, y, w, y); 378 XDrawLine(Xdisplay, win, topShadow, x, y, w, y);
364 XDrawLine(Xdisplay, win, topShadow, x, y, x, h); 379 XDrawLine(Xdisplay, win, topShadow, x, y, x, h);
365 XDrawLine(Xdisplay, win, botShadow, w, h, w, y + 1); 380 XDrawLine(Xdisplay, win, botShadow, w, h, w, y + 1);
366 XDrawLine(Xdisplay, win, botShadow, w, h, x + 1, h); 381 XDrawLine(Xdisplay, win, botShadow, w, h, x + 1, h);
367 } 382 }
368} 383}
369#endif 384#endif
370 385
371/* button shapes */ 386/* button shapes */
372#ifdef MENUBAR 387#ifdef MENUBAR
373/* EXTPROTO */ 388/* EXTPROTO */
374void 389void
375rxvt_Draw_Triangle(Display *Xdisplay, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type) 390rxvt_Draw_Triangle(Display *Xdisplay, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
376{ 391{
377 switch (type) { 392 switch (type)
393 {
378 case 'r': /* right triangle */ 394 case 'r': /* right triangle */
379 XDrawLine(Xdisplay, win, topShadow, x, y, x, y + w); 395 XDrawLine(Xdisplay, win, topShadow, x, y, x, y + w);
380 XDrawLine(Xdisplay, win, topShadow, x, y, x + w, y + w / 2); 396 XDrawLine(Xdisplay, win, topShadow, x, y, x + w, y + w / 2);
381 XDrawLine(Xdisplay, win, botShadow, x, y + w, x + w, y + w / 2); 397 XDrawLine(Xdisplay, win, botShadow, x, y + w, x + w, y + w / 2);
382 break; 398 break;
383 399
384 case 'l': /* left triangle */ 400 case 'l': /* left triangle */
385 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x + w, y); 401 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x + w, y);
386 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x, y + w / 2); 402 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x, y + w / 2);
387 XDrawLine(Xdisplay, win, topShadow, x, y + w / 2, x + w, y); 403 XDrawLine(Xdisplay, win, topShadow, x, y + w / 2, x + w, y);
388 break; 404 break;
389 405
390 case 'd': /* down triangle */ 406 case 'd': /* down triangle */
391 XDrawLine(Xdisplay, win, topShadow, x, y, x + w / 2, y + w); 407 XDrawLine(Xdisplay, win, topShadow, x, y, x + w / 2, y + w);
392 XDrawLine(Xdisplay, win, topShadow, x, y, x + w, y); 408 XDrawLine(Xdisplay, win, topShadow, x, y, x + w, y);
393 XDrawLine(Xdisplay, win, botShadow, x + w, y, x + w / 2, y + w); 409 XDrawLine(Xdisplay, win, botShadow, x + w, y, x + w / 2, y + w);
394 break; 410 break;
395 411
396 case 'u': /* up triangle */ 412 case 'u': /* up triangle */
397 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x + w / 2, y); 413 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x + w / 2, y);
398 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x, y + w); 414 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x, y + w);
399 XDrawLine(Xdisplay, win, topShadow, x, y + w, x + w / 2, y); 415 XDrawLine(Xdisplay, win, topShadow, x, y + w, x + w / 2, y);
400 break; 416 break;
401#if 0 417#if 0
402 case 's': /* square */ 418 case 's': /* square */
403 XDrawLine(Xdisplay, win, topShadow, x + w, y, x, y); 419 XDrawLine(Xdisplay, win, topShadow, x + w, y, x, y);
404 XDrawLine(Xdisplay, win, topShadow, x, y, x, y + w); 420 XDrawLine(Xdisplay, win, topShadow, x, y, x, y + w);
405 XDrawLine(Xdisplay, win, botShadow, x, y + w, x + w, y + w); 421 XDrawLine(Xdisplay, win, botShadow, x, y + w, x + w, y + w);
406 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x + w, y); 422 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x + w, y);
407 break; 423 break;
408#endif 424#endif
425
409 } 426 }
410} 427}
411#endif 428#endif
412/*----------------------- end-of-file (C source) -----------------------*/ 429/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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