--- rxvt-unicode/src/rxvt.h	2006/01/11 00:59:58	1.195
+++ rxvt-unicode/src/rxvt.h	2006/01/12 01:30:53	1.199
@@ -115,6 +115,24 @@
 void             rxvt_Draw_Triangle               (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
 void             rxvt_usleep                      (int usecs);
 
+/////////////////////////////////////////////////////////////////////////////
+
+// temporarily replace the process environment
+extern char **environ;
+extern char **rxvt_environ; // the original environ pointer
+
+inline void set_environ (stringvec *envv)
+{
+  if (envv)
+    environ = (char **)envv->begin ();
+}
+
+inline void set_environ (char **envv)
+{
+  if (envv)
+    environ = envv;
+}
+
 /*
  *****************************************************************************
  * STRUCTURES AND TYPEDEFS
@@ -436,10 +454,10 @@
   XTerm_Color00          = 10,      // not implemented, CLASH!
   XTerm_Color01          = 11,      // not implemented
   XTerm_Color_cursor     = 12,      // change actual 'Cursor' color
-  XTerm_Color_pointer_fg = 13,      // change actual 'Pointer' color
-  XTerm_Color_pointer_bg = 14,      // not implemented
-  XTerm_Color05          = 15,      // not implemented
-  XTerm_Color06          = 16,      // not implemented
+  XTerm_Color_pointer_fg = 13,      // change actual 'Pointer' fg color
+  XTerm_Color_pointer_bg = 14,      // change actual 'Pointer' bg color
+  XTerm_Color05          = 15,      // not implemented (tektronix fg)
+  XTerm_Color06          = 16,      // not implemented (tektronix bg)
   XTerm_Color_RV         = 17,      // change actual 'Highlight' color
   XTerm_logfile          = 46,      // not implemented
   XTerm_font             = 50,
@@ -449,18 +467,21 @@
   XTerm_emacs51          = 51,      // reserved for emacs shell
   /*
    * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
+   * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
    */
-  XTerm_Color_BD         = 18,      // change actual 'Bold' color
-  XTerm_Color_UL         = 19,      // change actual 'Underline' color
-  XTerm_Pixmap           = 20,      // new bg pixmap
-  XTerm_restoreFG        = 39,      // change default fg color
-  XTerm_restoreBG        = 49,      // change default bg color
-  XTerm_dumpscreen       = 55,      // dump scrollback and all of screen
+  Rxvt_Color_BD          = 18,      // change actual 'Bold' color
+  Rxvt_Color_UL          = 19,      // change actual 'Underline' color
+  Rxvt_Pixmap            = 20,      // new bg pixmap
+  Rxvt_restoreFG         = 39,      // change default fg color
+  Rxvt_restoreBG         = 49,      // change default bg color
+  Rxvt_dumpscreen        = 55,      // dump scrollback and all of screen
 
   URxvt_locale           = 701,     // change locale
   URxvt_Menu             = 703,     // set menu item
   URxvt_Color_IT         = 704,     // change actual 'Italic' colour
   URxvt_Color_tint       = 705,     // change actual tint colour
+  URxvt_Color_BD         = 706,
+  URxvt_Color_UL         = 707,
 
   URxvt_font             = 710,
   URxvt_boldFont         = 711,
@@ -697,8 +718,6 @@
 #define Width2Pixel(n)          ((int32_t)(n) * (int32_t)fwidth)
 #define Height2Pixel(n)         ((int32_t)(n) * (int32_t)fheight)
 
-#define TEMP_ENV		temp_environ temp_environ (envv)
-
 #define OPTION(opt)		(options & (opt))
 #define DEFAULT_OPTIONS		(Opt_scrollBar | Opt_scrollTtyOutput \
 				 | Opt_jumpScroll | Opt_secondaryScreen \
@@ -1258,6 +1277,7 @@
 
   void init_secondary ();
   const char **init_resources (int argc, const char *const *argv);
+  const char *x_resource (const char *name);
   void init_env ();
   void set_locale (const char *locale);
   void init_xlocale ();