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.22 by root, Mon Dec 20 18:07:19 2004 UTC vs.
Revision 1.39 by root, Mon Feb 20 22:40:35 2006 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 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * 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
12 * 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
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28#include "misc.intpro" /* PROTOS for internal routines */
29 28
30char * 29char *
31rxvt_wcstombs (const wchar_t *str, int len) 30rxvt_wcstombs (const wchar_t *str, int len)
32{ 31{
33 if (len < 0) len = wcslen (str); 32 if (len < 0) len = wcslen (str);
… …
36 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1); 35 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1);
37 36
38 char *dst = r; 37 char *dst = r;
39 while (len--) 38 while (len--)
40 { 39 {
41 int l = wcrtomb (dst, *str++, mbs); 40 ssize_t l = wcrtomb (dst, *str++, mbs);
41
42 if (l < 0) 42 if (l < 0)
43 *dst++ = '?'; 43 *dst++ = '?';
44 else 44 else
45 dst += l; 45 dst += l;
46 } 46 }
47 47
48 *dst++ = 0; 48 *dst++ = 0;
49 49
50 return r; 50 return (char *)rxvt_realloc (r, dst - r);
51} 51}
52 52
53wchar_t * 53wchar_t *
54rxvt_mbstowcs (const char *str, int len) 54rxvt_mbstowcs (const char *str, int len)
55{ 55{
56 if (len < 0) len = strlen (str); 56 if (len < 0) len = strlen (str);
57 57
58 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)); 58 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
59 59
60 if (mbstowcs (r, str, len + 1) < 0) 60 if ((ssize_t)mbstowcs (r, str, len + 1) < 0)
61 *r = 0; 61 *r = 0;
62 62
63 return r; 63 return r;
64} 64}
65 65
… …
91 *p++ = 0x80 | ( w & 0x3f); 91 *p++ = 0x80 | ( w & 0x3f);
92 else 92 else
93 *p++ = '?'; 93 *p++ = '?';
94 } 94 }
95 95
96 *p = 0; 96 *p++ = 0;
97 97
98 return r; 98 return (char *)rxvt_realloc (r, p - r);
99} 99}
100 100
101wchar_t * 101wchar_t *
102rxvt_utf8towcs (const char *str, int len) 102rxvt_utf8towcs (const char *str, int len)
103{ 103{
… …
163 163
164 return r; 164 return r;
165} 165}
166 166
167char * 167char *
168rxvt_strdup (const char *str)
169{
170 return str ? strdup (str) : 0;
171}
172
173/* INTPROTO */
174char *
175rxvt_r_basename (const char *str) 168rxvt_r_basename (const char *str) NOTHROW
176{ 169{
177 char *base = strrchr (str, '/'); 170 char *base = strrchr (str, '/');
178 171
179 return (char *) (base ? base + 1 : str); 172 return (char *) (base ? base + 1 : str);
180} 173}
181 174
182/* 175/*
183 * Print an error message 176 * Print an error message
184 */ 177 */
185/* INTPROTO */
186void 178void
187rxvt_vlog (const char *fmt, va_list arg_ptr) 179rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW
188{ 180{
189 char msg[1024]; 181 char msg[1024];
190 182
191 vsnprintf (msg, sizeof msg, fmt, arg_ptr); 183 vsnprintf (msg, sizeof msg, fmt, arg_ptr);
192 184
… …
194 (*GET_R->log_hook) (msg); 186 (*GET_R->log_hook) (msg);
195 else 187 else
196 write (STDOUT_FILENO, msg, strlen (msg)); 188 write (STDOUT_FILENO, msg, strlen (msg));
197} 189}
198 190
199/* INTPROTO */
200void 191void
201rxvt_log (const char *fmt,...) 192rxvt_log (const char *fmt,...) NOTHROW
202{ 193{
203 va_list arg_ptr; 194 va_list arg_ptr;
204 195
205 va_start (arg_ptr, fmt); 196 va_start (arg_ptr, fmt);
206 rxvt_vlog (fmt, arg_ptr); 197 rxvt_vlog (fmt, arg_ptr);
… …
208} 199}
209 200
210/* 201/*
211 * Print an error message 202 * Print an error message
212 */ 203 */
213/* INTPROTO */
214void 204void
215rxvt_warn (const char *fmt,...) 205rxvt_warn (const char *fmt,...) NOTHROW
216{ 206{
217 va_list arg_ptr; 207 va_list arg_ptr;
218 208
219 rxvt_log ("%s: ", RESNAME); 209 rxvt_log ("%s: ", RESNAME);
220 210
221 va_start (arg_ptr, fmt); 211 va_start (arg_ptr, fmt);
222 rxvt_vlog (fmt, arg_ptr); 212 rxvt_vlog (fmt, arg_ptr);
223 va_end (arg_ptr); 213 va_end (arg_ptr);
224} 214}
225 215
226/* INTPROTO */
227void 216void
228rxvt_fatal (const char *fmt,...) 217rxvt_fatal (const char *fmt,...) THROW ((class rxvt_failure_exception))
229{ 218{
230 va_list arg_ptr; 219 va_list arg_ptr;
231 220
232 rxvt_log ("%s: ", RESNAME); 221 rxvt_log ("%s: ", RESNAME);
233 222
… …
236 va_end (arg_ptr); 225 va_end (arg_ptr);
237 226
238 rxvt_exit_failure (); 227 rxvt_exit_failure ();
239} 228}
240 229
241class rxvt_failure_exception rxvt_failure_exception;
242
243/* INTPROTO */
244void 230void
245rxvt_exit_failure () 231rxvt_exit_failure () THROW ((class rxvt_failure_exception))
246{ 232{
233 static class rxvt_failure_exception rxvt_failure_exception;
247 throw (rxvt_failure_exception); 234 throw (rxvt_failure_exception);
248} 235}
249 236
250/* 237/*
251 * check that the first characters of S1 match S2 238 * check that the first characters of S1 match S2
… …
253 * No Match 240 * No Match
254 * return: 0 241 * return: 0
255 * Match 242 * Match
256 * return: strlen (S2) 243 * return: strlen (S2)
257 */ 244 */
258/* INTPROTO */
259int 245int
260rxvt_Str_match (const char *s1, const char *s2) 246rxvt_Str_match (const char *s1, const char *s2) NOTHROW
261{ 247{
262 int n = strlen (s2); 248 int n = strlen (s2);
263 249
264 return ((strncmp (s1, s2, n) == 0) ? n : 0); 250 return ((strncmp (s1, s2, n) == 0) ? n : 0);
265} 251}
266 252
267/* INTPROTO */
268const char * 253const char *
269rxvt_Str_skip_space (const char *str) 254rxvt_Str_skip_space (const char *str) NOTHROW
270{ 255{
271 if (str) 256 if (str)
272 while (*str && isspace (*str)) 257 while (*str && isspace (*str))
273 str++; 258 str++;
274 259
… …
277 262
278/* 263/*
279 * remove leading/trailing space and strip-off leading/trailing quotes. 264 * remove leading/trailing space and strip-off leading/trailing quotes.
280 * in place. 265 * in place.
281 */ 266 */
282/* INTPROTO */
283char * 267char *
284rxvt_Str_trim (char *str) 268rxvt_Str_trim (char *str) NOTHROW
285{ 269{
286 char *r, *s; 270 char *r, *s;
287 int n;
288 271
289 if (!str || !*str) /* shortcut */ 272 if (!str || !*str) /* shortcut */
290 return str; 273 return str;
291 274
292 /* skip leading spaces */ 275 /* skip leading spaces */
293 for (s = str; *s && isspace (*s); s++) ; 276 for (s = str; *s && isspace (*s); s++) ;
277
294 /* goto end of string */ 278 /* goto end of string */
295 for (n = 0, r = s; *r++; n++) ; 279 r = s + strlen (s) - 1;
296 r -= 2; 280
297 /* dump return */ 281 /* dump return and other trailing whitespace */
298 if (n > 0 && *r == '\n') 282 while (r > s && isspace (*r))
299 n--, r--; 283 r--;
300 /* backtrack along trailing spaces */ 284
301 for (; n > 0 && isspace (*r); r--, n--) ; 285#if 0
302 /* skip matching leading/trailing quotes */ 286 /* skip matching leading/trailing quotes */
303 if (*s == '"' && *r == '"' && n > 1) 287 if (*s == '"' && *r == '"' && n > 1)
304 { 288 {
305 s++; 289 s++;
306 n -= 2; 290 n -= 2;
307 } 291 }
292#endif
308 293
309 /* copy back over: forwards copy */ 294 memmove (str, s, r + 1 - s);
310 for (r = str; n; n--) 295 str[r + 1 - s] = 0;
311 *r++ = *s++;
312 *r = '\0';
313 296
314 return str; 297 return str;
315} 298}
316 299
317/* 300/*
… …
326 * "M-x" prefixed strings, append "\r" if needed 309 * "M-x" prefixed strings, append "\r" if needed
327 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed 310 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
328 * 311 *
329 * returns the converted string length 312 * returns the converted string length
330 */ 313 */
331/* INTPROTO */
332int 314int
333rxvt_Str_escaped (char *str) 315rxvt_Str_escaped (char *str) NOTHROW
334{ 316{
335 char ch, *s, *d; 317 char ch, *s, *d;
336 int i, num, append = 0; 318 int i, num, append = 0;
337 319
338 if (!str || !*str) 320 if (!str || !*str)
… …
400 return (d - str); 382 return (d - str);
401} 383}
402 384
403/* 385/*
404 * Split a comma-separated string into an array, stripping leading and 386 * Split a comma-separated string into an array, stripping leading and
405 * trailing spaces (and paired quotes) from each entry. Empty strings 387 * trailing spaces from each entry. Empty strings are properly returned
406 * are properly returned
407 * Caller should free each entry and array when done 388 * Caller should free each entry and array when done
408 */ 389 */
409/* INTPROTO */
410char ** 390char **
411rxvt_splitcommastring (const char *cs) 391rxvt_splitcommastring (const char *cs) NOTHROW
412{ 392{
413 int l, n, p; 393 int l, n, p;
414 const char *s, *t; 394 const char *s, *t;
415 char **ret; 395 char **ret;
416 396
… …
418 s = ""; 398 s = "";
419 399
420 for (n = 1, t = s; *t; t++) 400 for (n = 1, t = s; *t; t++)
421 if (*t == ',') 401 if (*t == ',')
422 n++; 402 n++;
403
423 ret = (char **)malloc ((n + 1) * sizeof (char *)); 404 ret = (char **)malloc ((n + 1) * sizeof (char *));
424 ret[n] = NULL; 405 ret[n] = NULL;
425 406
426 for (l = 0, t = s; l < n; l++) 407 for (l = 0, t = s; l < n; l++)
427 { 408 {
… …
431 strncpy (ret[l], s, p); 412 strncpy (ret[l], s, p);
432 ret[l][p] = '\0'; 413 ret[l][p] = '\0';
433 rxvt_Str_trim (ret[l]); 414 rxvt_Str_trim (ret[l]);
434 s = ++t; 415 s = ++t;
435 } 416 }
417
436 return ret; 418 return ret;
437} 419}
438 420
439void 421void
440rxvt_freecommastring (char **cs) 422rxvt_freecommastring (char **cs) NOTHROW
441{ 423{
442 for (int i = 0; cs[i]; ++i) 424 for (int i = 0; cs[i]; ++i)
443 free (cs[i]); 425 free (cs[i]);
444 426
445 free (cs); 427 free (cs);
… …
447 429
448/*----------------------------------------------------------------------* 430/*----------------------------------------------------------------------*
449 * file searching 431 * file searching
450 */ 432 */
451 433
452/* #define DEBUG_SEARCH_PATH */ 434#ifdef XPM_BACKGROUND
453
454#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
455/* 435/*
456 * search for FILE in the current working directory, and within the 436 * search for FILE in the current working directory, and within the
457 * colon-delimited PATHLIST, adding the file extension EXT if required. 437 * colon-delimited PATHLIST, adding the file extension EXT if required.
458 * 438 *
459 * FILE is either semi-colon or zero terminated 439 * FILE is either semi-colon or zero terminated
460 */ 440 */
461/* INTPROTO */ 441char *
462char *
463rxvt_File_search_path (const char *pathlist, const char *file, const char *ext) 442rxvt_File_search_path (const char *pathlist, const char *file, const char *ext) NOTHROW
464{ 443{
465 int maxpath, len; 444 int maxpath, len;
466 const char *p, *path; 445 const char *p, *path;
467 char name[256]; 446 char name[256];
468 447
… …
472 /* semi-colon delimited */ 451 /* semi-colon delimited */
473 if ((p = strchr (file, ';'))) 452 if ((p = strchr (file, ';')))
474 len = (p - file); 453 len = (p - file);
475 else 454 else
476 len = strlen (file); 455 len = strlen (file);
477
478#ifdef DEBUG_SEARCH_PATH
479 getcwd (name, sizeof (name));
480 fprintf (stderr, "pwd: \"%s\"\n", name);
481 fprintf (stderr, "find: \"%.*s\"\n", len, file);
482#endif
483 456
484 /* leave room for an extra '/' and trailing '\0' */ 457 /* leave room for an extra '/' and trailing '\0' */
485 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2); 458 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
486 if (maxpath <= 0) 459 if (maxpath <= 0)
487 return NULL; 460 return NULL;
… …
529 } 502 }
530 } 503 }
531 return NULL; 504 return NULL;
532} 505}
533 506
534/* INTPROTO */ 507char *
535char *
536rxvt_File_find (const char *file, const char *ext, const char *path) 508rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW
537{ 509{
538 char *f; 510 char *f;
539 511
540 if (file == NULL || *file == '\0') 512 if (file == NULL || *file == '\0')
541 return NULL; 513 return NULL;
542 514
543 /* search environment variables here too */
544 if ((f = rxvt_File_search_path (path, file, ext)) == NULL) 515 f = rxvt_File_search_path (path, file, ext);
545#ifdef PATH_ENV 516
546 if ((f = rxvt_File_search_path (getenv (PATH_ENV), file, ext)) == NULL) 517 return f;
518}
547#endif 519#endif
548 f = rxvt_File_search_path (getenv ("PATH"), file, ext);
549 520
550#ifdef DEBUG_SEARCH_PATH
551 if (f)
552 fprintf (stderr, "found: \"%s\"\n", f);
553#endif
554 521
555 return f;
556}
557#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
558
559/*----------------------------------------------------------------------*
560 * miscellaneous drawing routines
561 */
562
563/*
564 * Draw top/left and bottom/right border shadows around windows
565 */
566#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
567/* INTPROTO */
568void
569rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
570{
571 int shadow;
572
573 shadow = (w == 0 || h == 0) ? 1 : SHADOW;
574 w += x - 1;
575 h += y - 1;
576 for (; shadow-- > 0; x++, y++, w--, h--)
577 {
578 XDrawLine (display, win, topShadow, x, y, w, y);
579 XDrawLine (display, win, topShadow, x, y, x, h);
580 XDrawLine (display, win, botShadow, w, h, w, y + 1);
581 XDrawLine (display, win, botShadow, w, h, x + 1, h);
582 }
583}
584#endif
585
586/* button shapes */
587#ifdef MENUBAR
588/* INTPROTO */
589void
590rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
591{
592 switch (type)
593 {
594 case 'r': /* right triangle */
595 XDrawLine (display, win, topShadow, x, y, x, y + w);
596 XDrawLine (display, win, topShadow, x, y, x + w, y + w / 2);
597 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w / 2);
598 break;
599
600 case 'l': /* left triangle */
601 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
602 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w / 2);
603 XDrawLine (display, win, topShadow, x, y + w / 2, x + w, y);
604 break;
605
606 case 'd': /* down triangle */
607 XDrawLine (display, win, topShadow, x, y, x + w / 2, y + w);
608 XDrawLine (display, win, topShadow, x, y, x + w, y);
609 XDrawLine (display, win, botShadow, x + w, y, x + w / 2, y + w);
610 break;
611
612 case 'u': /* up triangle */
613 XDrawLine (display, win, botShadow, x + w, y + w, x + w / 2, y);
614 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w);
615 XDrawLine (display, win, topShadow, x, y + w, x + w / 2, y);
616 break;
617#if 0
618 case 's': /* square */
619 XDrawLine (display, win, topShadow, x + w, y, x, y);
620 XDrawLine (display, win, topShadow, x, y, x, y + w);
621 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w);
622 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
623 break;
624#endif
625
626 }
627}
628#endif
629/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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