--- rxvt-unicode/src/misc.C	2005/02/16 20:32:05	1.26
+++ rxvt-unicode/src/misc.C	2006/01/21 23:50:33	1.37
@@ -38,6 +38,7 @@
   while (len--)
     {
       ssize_t l = wcrtomb (dst, *str++, mbs);
+
       if (l < 0)
         *dst++ = '?';
       else
@@ -164,14 +165,7 @@
 }
 
 char *
-rxvt_strdup (const char *str)
-{
-  return str ? strdup (str) : 0;
-}
-
-/* INTPROTO */
-char *
-rxvt_r_basename (const char *str)
+rxvt_r_basename (const char *str) NOTHROW
 {
   char *base = strrchr (str, '/');
 
@@ -181,9 +175,8 @@
 /*
  * Print an error message
  */
-/* INTPROTO */
 void
-rxvt_vlog (const char *fmt, va_list arg_ptr)
+rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW
 {
   char msg[1024];
 
@@ -195,9 +188,8 @@
     write (STDOUT_FILENO, msg, strlen (msg));
 }
 
-/* INTPROTO */
 void
-rxvt_log (const char *fmt,...)
+rxvt_log (const char *fmt,...) NOTHROW
 {
   va_list arg_ptr;
 
@@ -209,9 +201,8 @@
 /*
  * Print an error message
  */
-/* INTPROTO */
 void
-rxvt_warn (const char *fmt,...)
+rxvt_warn (const char *fmt,...) NOTHROW
 {
   va_list arg_ptr;
 
@@ -222,9 +213,8 @@
   va_end (arg_ptr);
 }
 
-/* INTPROTO */
 void
-rxvt_fatal (const char *fmt,...)
+rxvt_fatal (const char *fmt,...) THROW ((class rxvt_failure_exception))
 {
   va_list arg_ptr;
 
@@ -237,12 +227,10 @@
   rxvt_exit_failure ();
 }
 
-class rxvt_failure_exception rxvt_failure_exception;
-
-/* INTPROTO */
 void
-rxvt_exit_failure ()
+rxvt_exit_failure () THROW ((class rxvt_failure_exception))
 {
+  static class rxvt_failure_exception rxvt_failure_exception;
   throw (rxvt_failure_exception);
 }
 
@@ -254,18 +242,16 @@
  * Match
  *      return: strlen (S2)
  */
-/* INTPROTO */
 int
-rxvt_Str_match (const char *s1, const char *s2)
+rxvt_Str_match (const char *s1, const char *s2) NOTHROW
 {
   int n = strlen (s2);
 
   return ((strncmp (s1, s2, n) == 0) ? n : 0);
 }
 
-/* INTPROTO */
 const char *
-rxvt_Str_skip_space (const char *str)
+rxvt_Str_skip_space (const char *str) NOTHROW
 {
   if (str)
     while (*str && isspace (*str))
@@ -278,9 +264,8 @@
  * remove leading/trailing space and strip-off leading/trailing quotes.
  * in place.
  */
-/* INTPROTO */
 char           *
-rxvt_Str_trim (char *str)
+rxvt_Str_trim (char *str) NOTHROW
 {
   char *r, *s;
 
@@ -326,9 +311,8 @@
  *
  * returns the converted string length
  */
-/* INTPROTO */
 int
-rxvt_Str_escaped (char *str)
+rxvt_Str_escaped (char *str) NOTHROW
 {
   char            ch, *s, *d;
   int             i, num, append = 0;
@@ -403,9 +387,8 @@
  * trailing spaces from each entry.  Empty strings are properly returned
  * Caller should free each entry and array when done
  */
-/* INTPROTO */
 char          **
-rxvt_splitcommastring (const char *cs)
+rxvt_splitcommastring (const char *cs) NOTHROW
 {
   int             l, n, p;
   const char     *s, *t;
@@ -436,7 +419,7 @@
 }
 
 void
-rxvt_freecommastring (char **cs)
+rxvt_freecommastring (char **cs) NOTHROW
 {
   for (int i = 0; cs[i]; ++i)
     free (cs[i]);
@@ -450,16 +433,15 @@
 
 /* #define DEBUG_SEARCH_PATH */
 
-#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
+#ifdef XPM_BACKGROUND
 /*
  * search for FILE in the current working directory, and within the
  * colon-delimited PATHLIST, adding the file extension EXT if required.
  *
  * FILE is either semi-colon or zero terminated
  */
-/* INTPROTO */
 char           *
-rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
+rxvt_File_search_path (const char *pathlist, const char *file, const char *ext) NOTHROW
 {
   int             maxpath, len;
   const char     *p, *path;
@@ -530,21 +512,15 @@
   return NULL;
 }
 
-/* INTPROTO */
 char           *
-rxvt_File_find (const char *file, const char *ext, const char *path)
+rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW
 {
   char           *f;
 
   if (file == NULL || *file == '\0')
     return NULL;
 
-  /* search environment variables here too */
-  if ((f = rxvt_File_search_path (path, file, ext)) == NULL)
-#ifdef PATH_ENV
-    if ((f = rxvt_File_search_path (getenv (PATH_ENV), file, ext)) == NULL)
-#endif
-      f = rxvt_File_search_path (getenv ("PATH"), file, ext);
+  f = rxvt_File_search_path (path, file, ext);
 
 #ifdef DEBUG_SEARCH_PATH
   if (f)
@@ -553,76 +529,6 @@
 
   return f;
 }
-#endif				/* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
-
-/*----------------------------------------------------------------------*
- * miscellaneous drawing routines
- */
-
-/*
- * Draw top/left and bottom/right border shadows around windows
- */
-#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
-/* INTPROTO */
-void
-rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
-{
-  int             shadow;
-
-  shadow = (w == 0 || h == 0) ? 1 : SHADOW;
-  w += x - 1;
-  h += y - 1;
-  for (; shadow-- > 0; x++, y++, w--, h--)
-    {
-      XDrawLine (display, win, topShadow, x, y, w, y);
-      XDrawLine (display, win, topShadow, x, y, x, h);
-      XDrawLine (display, win, botShadow, w, h, w, y + 1);
-      XDrawLine (display, win, botShadow, w, h, x + 1, h);
-    }
-}
 #endif
 
-/* button shapes */
-#ifdef MENUBAR
-/* INTPROTO */
-void
-rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
-{
-  switch (type)
-    {
-      case 'r':			/* right triangle */
-        XDrawLine (display, win, topShadow, x, y, x, y + w);
-        XDrawLine (display, win, topShadow, x, y, x + w, y + w / 2);
-        XDrawLine (display, win, botShadow, x, y + w, x + w, y + w / 2);
-        break;
-
-      case 'l':			/* left triangle */
-        XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
-        XDrawLine (display, win, botShadow, x + w, y + w, x, y + w / 2);
-        XDrawLine (display, win, topShadow, x, y + w / 2, x + w, y);
-        break;
-
-      case 'd':			/* down triangle */
-        XDrawLine (display, win, topShadow, x, y, x + w / 2, y + w);
-        XDrawLine (display, win, topShadow, x, y, x + w, y);
-        XDrawLine (display, win, botShadow, x + w, y, x + w / 2, y + w);
-        break;
 
-      case 'u':			/* up triangle */
-        XDrawLine (display, win, botShadow, x + w, y + w, x + w / 2, y);
-        XDrawLine (display, win, botShadow, x + w, y + w, x, y + w);
-        XDrawLine (display, win, topShadow, x, y + w, x + w / 2, y);
-        break;
-#if 0
-      case 's':			/* square */
-        XDrawLine (display, win, topShadow, x + w, y, x, y);
-        XDrawLine (display, win, topShadow, x, y, x, y + w);
-        XDrawLine (display, win, botShadow, x, y + w, x + w, y + w);
-        XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
-        break;
-#endif
-
-    }
-}
-#endif
-/*----------------------- end-of-file (C source) -----------------------*/