--- rxvt-unicode/src/rxvt.h	2007/08/27 20:00:27	1.299
+++ rxvt-unicode/src/rxvt.h	2007/09/12 19:51:41	1.304
@@ -113,16 +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;
-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;
 
@@ -183,9 +181,12 @@
     tintServerSide  = (1UL<<11),
     tintFlags       = (tintSet|tintServerSide|tintNeeded|tintWholesome),
     blurNeeded      = (1UL<<12),
+    blurServerSide  = (1UL<<13), /* this don't work yet */
 
     isTransparent   = (1UL<<16),
-    isInvalid       = (1UL<<17)
+    isInvalid       = (1UL<<17),
+    isVtOrigin      = (1UL<<18)  /* if set pixmap has origin at corner of
+                                    vt window instead of parent[0]! */
   };
 
   unsigned long flags;
@@ -246,6 +247,14 @@
   unsigned int pmap_depth;
 
   bool window_size_sensitive ();
+  bool window_position_sensitive () {
+    return (flags & isTransparent);
+  };
+
+  bool is_parentOrigin () {
+    return !(flags & isVtOrigin);
+  };
+
   bool need_client_side_rendering ();
   void apply ();
   bool render ();
@@ -963,9 +972,6 @@
   struct mbstate  mbstate;              // current input multibyte state
 
   unsigned char   want_refresh:1,
-#ifdef ENABLE_TRANSPARENCY
-                  want_full_refresh:1,	/* awaiting full screen refresh      */
-#endif
                   current_screen:1,	/* primary or secondary              */
                   num_scr_allow:1,
                   bypass_keystate:1,
@@ -1070,12 +1076,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;