--- rxvt-unicode/src/rxvt.h	2010/12/07 17:51:27	1.419
+++ rxvt-unicode/src/rxvt.h	2011/01/10 14:07:19	1.427
@@ -30,6 +30,8 @@
 
 using namespace std;
 
+// we assume that Xlib.h defines XPointer, and it does since at least 1994...
+
 extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -100,10 +102,6 @@
  *****************************************************************************
  */
 
-#ifndef HAVE_XPOINTER
-typedef char *XPointer;
-#endif
-
 #include <termios.h>
 
 #include "background.h"
@@ -157,8 +155,14 @@
 void             rxvt_exit_failure                () THROW ((class rxvt_failure_exception)) NORETURN;
 
 char           * rxvt_strtrim                     (char *str) NOTHROW;
-char          ** rxvt_splitcommastring            (const char *cs) NOTHROW;
-void             rxvt_freecommastring             (char **cs) NOTHROW;
+char          ** rxvt_strsplit                    (char delim, const char *str) NOTHROW;
+
+static inline void
+rxvt_free_strsplit (char **ptr) NOTHROW
+{
+  free (ptr[0]);
+  free (ptr);
+}
 
 void           * rxvt_malloc                      (size_t size);
 void           * rxvt_calloc                      (size_t number, size_t size);
@@ -192,6 +196,22 @@
     environ = envv;
 }
 
+struct localise_env
+{
+  char **orig_env;
+
+  localise_env (char **new_env)
+  {
+    orig_env = environ;
+    environ = new_env;
+  }
+
+  ~localise_env ()
+  {
+    environ = orig_env;
+  }
+};
+
 /*
  *****************************************************************************
  * STRUCTURES AND TYPEDEFS
@@ -1320,7 +1340,7 @@
   void alias_color (int dst, int src);
   void set_widthheight (unsigned int newwidth, unsigned int newheight);
   void get_window_origin (int &x, int &y);
-  Pixmap get_pixmap_property (int prop_id);
+  Pixmap get_pixmap_property (Atom property);
 
   // screen.C
 
@@ -1382,24 +1402,10 @@
 
   bool option (uint8_t opt) const NOTHROW
   {
-    if (!opt)
-      return 0;
-
-    --opt;
     return options[opt >> 3] & (1 << (opt & 7));
   }
 
-  void set_option (uint8_t opt, bool set = true) NOTHROW
-  {
-    if (!opt)
-      return;
-
-    --opt;
-    if (set)
-      options[opt >> 3] |= (1 << (opt & 7));
-    else
-      options[opt >> 3] &= ~(1 << (opt & 7));
-  }
+  void set_option (uint8_t opt, bool set = true) NOTHROW;
 
   void set_privmode (unsigned bit, int set) NOTHROW
   {