--- rxvt-unicode/src/misc.C	2004/03/17 05:15:02	1.12
+++ rxvt-unicode/src/misc.C	2005/01/16 23:55:42	1.24
@@ -1,5 +1,5 @@
 /*--------------------------------*-C-*---------------------------------*
- * File:	misc.c
+ * File:	misc.C
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
@@ -27,17 +27,18 @@
 #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);
+      ssize_t l = wcrtomb (dst, *str++, mbs);
       if (l < 0)
         *dst++ = '?';
       else
@@ -46,21 +47,134 @@
 
   *dst++ = 0;
 
+  return (char *)rxvt_realloc (r, dst - 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 ((ssize_t)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++ & UNICODE_MASK;
+
+      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 (char *)rxvt_realloc (r, p - 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;
 }
 
-/* EXTPROTO */
 char *
 rxvt_strdup (const char *str)
 {
   return str ? strdup (str) : 0;
 }
 
-/* EXTPROTO */
+/* INTPROTO */
 char *
 rxvt_r_basename (const char *str)
 {
-  char *base = STRRCHR (str, '/');
+  char *base = strrchr (str, '/');
 
   return (char *) (base ? base + 1 : str);
 }
@@ -68,7 +182,7 @@
 /*
  * Print an error message
  */
-/* EXTPROTO */
+/* INTPROTO */
 void
 rxvt_vlog (const char *fmt, va_list arg_ptr)
 {
@@ -82,7 +196,7 @@
     write (STDOUT_FILENO, msg, strlen (msg));
 }
 
-/* EXTPROTO */
+/* INTPROTO */
 void
 rxvt_log (const char *fmt,...)
 {
@@ -96,7 +210,7 @@
 /*
  * Print an error message
  */
-/* EXTPROTO */
+/* INTPROTO */
 void
 rxvt_warn (const char *fmt,...)
 {
@@ -109,7 +223,7 @@
   va_end (arg_ptr);
 }
 
-/* EXTPROTO */
+/* INTPROTO */
 void
 rxvt_fatal (const char *fmt,...)
 {
@@ -126,7 +240,7 @@
 
 class rxvt_failure_exception rxvt_failure_exception;
 
-/* EXTPROTO */
+/* INTPROTO */
 void
 rxvt_exit_failure ()
 {
@@ -139,18 +253,18 @@
  * 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 */
+/* INTPROTO */
 const char *
 rxvt_Str_skip_space (const char *str)
 {
@@ -165,7 +279,7 @@
  * remove leading/trailing space and strip-off leading/trailing quotes.
  * in place.
  */
-/* EXTPROTO */
+/* INTPROTO */
 char           *
 rxvt_Str_trim (char *str)
 {
@@ -214,7 +328,7 @@
  *
  * returns the converted string length
  */
-/* EXTPROTO */
+/* INTPROTO */
 int
 rxvt_Str_escaped (char *str)
 {
@@ -292,7 +406,7 @@
  * are properly returned
  * Caller should free each entry and array when done
  */
-/* EXTPROTO */
+/* INTPROTO */
 char          **
 rxvt_splitcommastring (const char *cs)
 {
@@ -322,6 +436,15 @@
   return ret;
 }
 
+void
+rxvt_freecommastring (char **cs)
+{
+  for (int i = 0; cs[i]; ++i)
+    free (cs[i]);
+
+  free (cs);
+}
+
 /*----------------------------------------------------------------------*
  * file searching
  */
@@ -344,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));
@@ -359,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')
@@ -389,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)
 {
@@ -441,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)
 {
@@ -462,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)
 {