--- rxvt-unicode/src/rxvt.h	2007/08/17 22:01:33	1.294
+++ rxvt-unicode/src/rxvt.h	2007/09/09 10:14:40	1.303
@@ -101,9 +101,6 @@
  *****************************************************************************
  */
 // main.C
-RETSIGTYPE       rxvt_Child_signal                (int sig) NOTHROW;
-RETSIGTYPE       rxvt_Exit_signal                 (int sig) NOTHROW;
-void             rxvt_clean_exit                  () NOTHROW;
 void           * rxvt_malloc                      (size_t size);
 void           * rxvt_calloc                      (size_t number, size_t size);
 void           * rxvt_realloc                     (void *ptr, size_t size);
@@ -116,17 +113,14 @@
 
 #define rxvt_strdup(s) ((s) ? strdup(s) : 0)
 
-char *           rxvt_r_basename                  (const char *str) NOTHROW;
+char *           rxvt_basename                    (const char *str) NOTHROW;
 void             rxvt_vlog                        (const char *fmt, va_list arg_ptr) NOTHROW;
 void             rxvt_log                         (const char *fmt,...) NOTHROW;
 void             rxvt_warn                        (const char *fmt,...) NOTHROW;
 void             rxvt_fatal                       (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
 void             rxvt_exit_failure                () THROW ((class rxvt_failure_exception)) NORETURN;
 
-int              rxvt_Str_match                   (const char *s1, const char *s2) NOTHROW;
-const char *     rxvt_Str_skip_space              (const char *str) NOTHROW;
-char           * rxvt_Str_trim                    (char *str) NOTHROW;
-int              rxvt_Str_escaped                 (char *str) NOTHROW;
+char           * rxvt_strtrim                     (char *str) NOTHROW;
 char          ** rxvt_splitcommastring            (const char *cs) NOTHROW;
 void             rxvt_freecommastring             (char **cs) NOTHROW;
 
@@ -136,7 +130,7 @@
 extern char **environ;
 extern char **rxvt_environ; // the original environ pointer
 
-inline void set_environ (stringvec *envv)
+static inline void set_environ (stringvec *envv)
 {
 #if ENABLE_PERL
   assert (envv);
@@ -146,7 +140,7 @@
     environ = (char **)envv->begin ();
 }
 
-inline void set_environ (char **envv)
+static inline void set_environ (char **envv)
 {
 #if ENABLE_PERL
   assert (envv);
@@ -183,9 +177,10 @@
 
     tintSet         = (1UL<<8),
     tintNeeded      = (1UL<<9),
-    tintServerSide  = (1UL<<10),
-    tintFlags       = (tintSet|tintServerSide|tintNeeded),
-    blurNeeded      = (1UL<<11),
+    tintWholesome   = (1UL<<10),
+    tintServerSide  = (1UL<<11),
+    tintFlags       = (tintSet|tintServerSide|tintNeeded|tintWholesome),
+    blurNeeded      = (1UL<<12),
 
     isTransparent   = (1UL<<16),
     isInvalid       = (1UL<<17)
@@ -700,11 +695,6 @@
 /* #define PrivMode_MouseX11Track       (1LU<<20) */
 
 #define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11)
-#define PrivMode(test,bit)              \
-    if (test)                           \
-        priv_modes |= (bit);            \
-    else                                \
-        priv_modes &= ~(bit)
 
 #ifdef ALLOW_132_MODE
 # define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
@@ -1078,12 +1068,6 @@
 /* ---------- */
   Cursor          leftptr_cursor;
 /* ---------- */
-#ifndef NO_BACKSPACE_KEY
-  const char     *key_backspace;
-#endif
-#ifndef NO_DELETE_KEY
-  const char     *key_delete;
-#endif
   struct mouse_event MEvent;
   XComposeStatus  compose;
   ttymode_t       tio;
@@ -1401,6 +1385,14 @@
       options[opt >> 3] &= ~(1 << (opt & 7));
   }
 
+  void PrivMode (int set, unsigned bit) NOTHROW
+  {
+    if (set)
+      priv_modes |= bit;
+    else
+      priv_modes &= ~bit;
+  }
+
   void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
   void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
   int scr_scroll_text (int row1, int row2, int count) NOTHROW;
@@ -1518,16 +1510,5 @@
   Pixmap get_pixmap_property (int prop_id);
 };
 
-/*
- *****************************************************************************
- * PROTOTYPES
- *****************************************************************************
- */
-#ifdef PROTOTYPES
-# define __PROTO(p)     p
-#else
-# define __PROTO(p)     ()
-#endif
-
 #endif                          /* _RXVT_H_ */