--- rxvt-unicode/src/misc.C	2005/01/16 23:55:42	1.24
+++ rxvt-unicode/src/misc.C	2006/01/16 15:00:20	1.33
@@ -25,7 +25,6 @@
 
 #include "../config.h"		/* NECESSARY */
 #include "rxvt.h"		/* NECESSARY */
-#include "misc.intpro"		/* PROTOS for internal routines */
 
 char *
 rxvt_wcstombs (const wchar_t *str, int len)
@@ -39,6 +38,7 @@
   while (len--)
     {
       ssize_t l = wcrtomb (dst, *str++, mbs);
+
       if (l < 0)
         *dst++ = '?';
       else
@@ -170,7 +170,6 @@
   return str ? strdup (str) : 0;
 }
 
-/* INTPROTO */
 char *
 rxvt_r_basename (const char *str)
 {
@@ -182,7 +181,6 @@
 /*
  * Print an error message
  */
-/* INTPROTO */
 void
 rxvt_vlog (const char *fmt, va_list arg_ptr)
 {
@@ -196,7 +194,6 @@
     write (STDOUT_FILENO, msg, strlen (msg));
 }
 
-/* INTPROTO */
 void
 rxvt_log (const char *fmt,...)
 {
@@ -210,7 +207,6 @@
 /*
  * Print an error message
  */
-/* INTPROTO */
 void
 rxvt_warn (const char *fmt,...)
 {
@@ -223,7 +219,6 @@
   va_end (arg_ptr);
 }
 
-/* INTPROTO */
 void
 rxvt_fatal (const char *fmt,...)
 {
@@ -240,7 +235,6 @@
 
 class rxvt_failure_exception rxvt_failure_exception;
 
-/* INTPROTO */
 void
 rxvt_exit_failure ()
 {
@@ -255,7 +249,6 @@
  * Match
  *      return: strlen (S2)
  */
-/* INTPROTO */
 int
 rxvt_Str_match (const char *s1, const char *s2)
 {
@@ -264,7 +257,6 @@
   return ((strncmp (s1, s2, n) == 0) ? n : 0);
 }
 
-/* INTPROTO */
 const char *
 rxvt_Str_skip_space (const char *str)
 {
@@ -279,37 +271,35 @@
  * remove leading/trailing space and strip-off leading/trailing quotes.
  * in place.
  */
-/* INTPROTO */
 char           *
 rxvt_Str_trim (char *str)
 {
   char *r, *s;
-  int n;
 
   if (!str || !*str)		/* shortcut */
     return str;
 
   /* skip leading spaces */
   for (s = str; *s && isspace (*s); s++) ;
+
   /* goto end of string */
-  for (n = 0, r = s; *r++; n++) ;
-  r -= 2;
-  /* dump return */
-  if (n > 0 && *r == '\n')
-    n--, r--;
-  /* backtrack along trailing spaces */
-  for (; n > 0 && isspace (*r); r--, n--) ;
+  r = s + strlen (s) - 1;
+
+  /* dump return and other trailing whitespace */
+  while (r > s && isspace (*r))
+    r--;
+
+#if 0
   /* skip matching leading/trailing quotes */
   if (*s == '"' && *r == '"' && n > 1)
     {
       s++;
       n -= 2;
     }
+#endif
 
-  /* copy back over: forwards copy */
-  for (r = str; n; n--)
-    *r++ = *s++;
-  *r = '\0';
+  memmove (str, s, r + 1 - s);
+  str[r + 1 - s] = 0;
 
   return str;
 }
@@ -328,7 +318,6 @@
  *
  * returns the converted string length
  */
-/* INTPROTO */
 int
 rxvt_Str_escaped (char *str)
 {
@@ -402,11 +391,9 @@
 
 /*
  * Split a comma-separated string into an array, stripping leading and
- * trailing spaces (and paired quotes) from each entry.  Empty strings
- * are properly returned
+ * 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)
 {
@@ -420,6 +407,7 @@
   for (n = 1, t = s; *t; t++)
     if (*t == ',')
       n++;
+
   ret = (char **)malloc ((n + 1) * sizeof (char *));
   ret[n] = NULL;
 
@@ -433,6 +421,7 @@
       rxvt_Str_trim (ret[l]);
       s = ++t;
     }
+
   return ret;
 }
 
@@ -451,14 +440,13 @@
 
 /* #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)
 {
@@ -531,7 +519,6 @@
   return NULL;
 }
 
-/* INTPROTO */
 char           *
 rxvt_File_find (const char *file, const char *ext, const char *path)
 {
@@ -540,12 +527,7 @@
   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)
@@ -554,7 +536,7 @@
 
   return f;
 }
-#endif				/* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
+#endif
 
 /*----------------------------------------------------------------------*
  * miscellaneous drawing routines
@@ -563,14 +545,13 @@
 /*
  * Draw top/left and bottom/right border shadows around windows
  */
-#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
-/* INTPROTO */
+#ifdef RXVT_SCROLLBAR
 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;
+  shadow = (w == 0 || h == 0) ? 1 : MENU_SHADOW;
   w += x - 1;
   h += y - 1;
   for (; shadow-- > 0; x++, y++, w--, h--)
@@ -583,47 +564,24 @@
 }
 #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)
+// should not be used in interactive programs, for obvious reasons
+void rxvt_usleep (int usecs)
 {
-  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;
+#if HAVE_NANOSLEEP
+  struct timespec ts;
 
-      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
-
-    }
+  ts.tv_sec = 0;
+  ts.tv_nsec = usecs * 1000;
+  nanosleep (&ts, NULL);
+#else                 
+  /* use select for timing */
+  struct timeval  tv;
+
+  tv.tv_sec = 0;
+  tv.tv_usec = usecs;
+  select (0, NULL, NULL, NULL, &tv);
+#endif                
 }
-#endif
+
 /*----------------------- end-of-file (C source) -----------------------*/
+