--- rxvt-unicode/src/misc.C 2004/02/13 12:16:21 1.7 +++ rxvt-unicode/src/misc.C 2004/12/13 07:26:18 1.21 @@ -1,11 +1,12 @@ /*--------------------------------*-C-*---------------------------------* - * File: misc.c + * File: misc.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. * Copyright (c) 1996 mj olesen Queen's Univ at Kingston * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2000 Geoff Wing + * Copyright (c) 2003-2004 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,18 +27,154 @@ #include "rxvt.h" /* NECESSARY */ #include "misc.intpro" /* PROTOS for internal routines */ -/* EXTPROTO */ +char * +rxvt_wcstombs (const wchar_t *str, int len) +{ + if (len < 0) len = wcslen (str); + + mbstate mbs; + char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1); + + char *dst = r; + while (len--) + { + int l = wcrtomb (dst, *str++, mbs); + if (l < 0) + *dst++ = '?'; + else + dst += l; + } + + *dst++ = 0; + + return r; +} + +wchar_t * +rxvt_mbstowcs (const char *str, int len) +{ + if (len < 0) len = strlen (str); + + wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)); + + if (mbstowcs (r, str, len + 1) < 0) + *r = 0; + + return r; +} + +char * +rxvt_wcstoutf8 (const wchar_t *str, int len) +{ + if (len < 0) len = wcslen (str); + + char *r = (char *)rxvt_malloc (len * 4 + 1); + char *p = r; + + while (len--) + { + unicode_t w = *str++; + + if (w < 0x000080) + *p++ = w; + else if (w < 0x000800) + *p++ = 0xc0 | ( w >> 6), + *p++ = 0x80 | ( w & 0x3f); + else if (w < 0x010000) + *p++ = 0xe0 | ( w >> 12 ), + *p++ = 0x80 | ((w >> 6) & 0x3f), + *p++ = 0x80 | ( w & 0x3f); + else if (w < 0x110000) + *p++ = 0xf0 | ( w >> 18), + *p++ = 0x80 | ((w >> 12) & 0x3f), + *p++ = 0x80 | ((w >> 6) & 0x3f), + *p++ = 0x80 | ( w & 0x3f); + else + *p++ = '?'; + } + + *p = 0; + + return r; +} + +wchar_t * +rxvt_utf8towcs (const char *str, int len) +{ + if (len < 0) len = strlen (str); + + wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)), + *p = r; + + unsigned char *s = (unsigned char *)str, + *e = s + len; + + for (;;) + { + len = e - s; + + if (len == 0) + break; + else if (s[0] < 0x80) + *p++ = *s++; + else if (len >= 2 + && s[0] >= 0xc2 && s[0] <= 0xdf + && (s[1] & 0xc0) == 0x80) + { + *p++ = ((s[0] & 0x1f) << 6) + | (s[1] & 0x3f); + s += 2; + } + else if (len >= 3 + && ( (s[0] == 0xe0 && s[1] >= 0xa0 && s[1] <= 0xbf) + || (s[0] >= 0xe1 && s[0] <= 0xec && s[1] >= 0x80 && s[1] <= 0xbf) + || (s[0] == 0xed && s[1] >= 0x80 && s[1] <= 0x9f) + || (s[0] >= 0xee && s[0] <= 0xef && s[1] >= 0x80 && s[1] <= 0xbf) + ) + && (s[2] & 0xc0) == 0x80) + { + *p++ = ((s[0] & 0x0f) << 12) + | ((s[1] & 0x3f) << 6) + | (s[2] & 0x3f); + s += 3; + } + else if (len >= 4 + && ( (s[0] == 0xf0 && s[1] >= 0x90 && s[1] <= 0xbf) + || (s[0] >= 0xf1 && s[0] <= 0xf3 && s[1] >= 0x80 && s[1] <= 0xbf) + || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f) + ) + && (s[2] & 0xc0) == 0x80 + && (s[3] & 0xc0) == 0x80) + { + *p++ = ((s[0] & 0x07) << 18) + | ((s[1] & 0x3f) << 12) + | ((s[2] & 0x3f) << 6) + | (s[3] & 0x3f); + s += 4; + } + else + { + *p++ = 0xfffd; + s++; + } + } + + *p = 0; + + return r; +} + char * rxvt_strdup (const char *str) { return str ? strdup (str) : 0; } -/* EXTPROTO */ -char * +/* INTPROTO */ +char * rxvt_r_basename (const char *str) { - char *base = STRRCHR (str, '/'); + char *base = strrchr (str, '/'); return (char *) (base ? base + 1 : str); } @@ -45,17 +182,69 @@ /* * Print an error message */ -/* EXTPROTO */ +/* INTPROTO */ void -rxvt_print_error (const char *fmt,...) +rxvt_vlog (const char *fmt, va_list arg_ptr) { - va_list arg_ptr; + char msg[1024]; + + vsnprintf (msg, sizeof msg, fmt, arg_ptr); + + if (GET_R && GET_R->log_hook) + (*GET_R->log_hook) (msg); + else + write (STDOUT_FILENO, msg, strlen (msg)); +} + +/* INTPROTO */ +void +rxvt_log (const char *fmt,...) +{ + va_list arg_ptr; + + va_start (arg_ptr, fmt); + rxvt_vlog (fmt, arg_ptr); + va_end (arg_ptr); +} + +/* + * Print an error message + */ +/* INTPROTO */ +void +rxvt_warn (const char *fmt,...) +{ + va_list arg_ptr; + + rxvt_log ("%s: ", RESNAME); + + va_start (arg_ptr, fmt); + rxvt_vlog (fmt, arg_ptr); + va_end (arg_ptr); +} + +/* INTPROTO */ +void +rxvt_fatal (const char *fmt,...) +{ + va_list arg_ptr; + + rxvt_log ("%s: ", RESNAME); va_start (arg_ptr, fmt); - fprintf (stderr, APL_NAME ": "); - vfprintf (stderr, fmt, arg_ptr); - fprintf (stderr, "\n"); + rxvt_vlog (fmt, arg_ptr); va_end (arg_ptr); + + rxvt_exit_failure (); +} + +class rxvt_failure_exception rxvt_failure_exception; + +/* INTPROTO */ +void +rxvt_exit_failure () +{ + throw (rxvt_failure_exception); } /* @@ -64,24 +253,25 @@ * No Match * return: 0 * Match - * return: STRLEN (S2) + * return: strlen (S2) */ -/* EXTPROTO */ +/* INTPROTO */ int rxvt_Str_match (const char *s1, const char *s2) { - int n = STRLEN (s2); + int n = strlen (s2); - return ((STRNCMP (s1, s2, n) == 0) ? n : 0); + return ((strncmp (s1, s2, n) == 0) ? n : 0); } -/* EXTPROTO */ -const char * +/* INTPROTO */ +const char * rxvt_Str_skip_space (const char *str) { if (str) while (*str && isspace (*str)) str++; + return str; } @@ -89,12 +279,12 @@ * remove leading/trailing space and strip-off leading/trailing quotes. * in place. */ -/* EXTPROTO */ +/* INTPROTO */ char * rxvt_Str_trim (char *str) { - char *r, *s; - int n; + char *r, *s; + int n; if (!str || !*str) /* shortcut */ return str; @@ -115,6 +305,7 @@ s++; n -= 2; } + /* copy back over: forwards copy */ for (r = str; n; n--) *r++ = *s++; @@ -137,7 +328,7 @@ * * returns the converted string length */ -/* EXTPROTO */ +/* INTPROTO */ int rxvt_Str_escaped (char *str) { @@ -215,7 +406,7 @@ * are properly returned * Caller should free each entry and array when done */ -/* EXTPROTO */ +/* INTPROTO */ char ** rxvt_splitcommastring (const char *cs) { @@ -245,6 +436,15 @@ return ret; } +void +rxvt_freecommastring (char **cs) +{ + for (int i = 0; cs[i]; ++i) + free (cs[i]); + + free (cs); +} + /*----------------------------------------------------------------------* * file searching */ @@ -267,13 +467,13 @@ char name[256]; if (!access (file, R_OK)) /* found (plain name) in current directory */ - return STRDUP (file); + return strdup (file); /* semi-colon delimited */ - if ((p = STRCHR (file, ';'))) + if ((p = strchr (file, ';'))) len = (p - file); else - len = STRLEN (file); + len = strlen (file); #ifdef DEBUG_SEARCH_PATH getcwd (name, sizeof (name)); @@ -282,29 +482,29 @@ #endif /* leave room for an extra '/' and trailing '\0' */ - maxpath = sizeof (name) - (len + (ext ? STRLEN (ext) : 0) + 2); + maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2); if (maxpath <= 0) return NULL; /* check if we can find it now */ - STRNCPY (name, file, len); + strncpy (name, file, len); name[len] = '\0'; if (!access (name, R_OK)) - return STRDUP (name); + return strdup (name); if (ext) { - STRCAT (name, ext); + strcat (name, ext); if (!access (name, R_OK)) - return STRDUP (name); + return strdup (name); } for (path = pathlist; path != NULL && *path != '\0'; path = p) { int n; /* colon delimited */ - if ((p = STRCHR (path, ':')) == NULL) - p = STRCHR (path, '\0'); + if ((p = strchr (path, ':')) == NULL) + p = strchr (path, '\0'); n = (p - path); if (*p != '\0') @@ -312,26 +512,26 @@ if (n > 0 && n <= maxpath) { - STRNCPY (name, path, n); + strncpy (name, path, n); if (name[n - 1] != '/') name[n++] = '/'; name[n] = '\0'; - STRNCAT (name, file, len); + strncat (name, file, len); if (!access (name, R_OK)) - return STRDUP (name); + return strdup (name); if (ext) { - STRCAT (name, ext); + strcat (name, ext); if (!access (name, R_OK)) - return STRDUP (name); + return strdup (name); } } } return NULL; } -/* EXTPROTO */ +/* INTPROTO */ char * rxvt_File_find (const char *file, const char *ext, const char *path) { @@ -364,7 +564,7 @@ * Draw top/left and bottom/right border shadows around windows */ #if defined(RXVT_SCROLLBAR) || defined(MENUBAR) -/* EXTPROTO */ +/* INTPROTO */ void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) { @@ -385,7 +585,7 @@ /* button shapes */ #ifdef MENUBAR -/* EXTPROTO */ +/* INTPROTO */ void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type) {