--- rxvt-unicode/src/rxvt.h	2011/08/09 18:41:31	1.446
+++ rxvt-unicode/src/rxvt.h	2012/01/09 21:12:08	1.464
@@ -872,6 +872,8 @@
 
 struct TermWin_t
 {
+  int            vt_width;      /* actual window width             [pixels] */
+  int            vt_height;     /* actual window height            [pixels] */
   int            width;         /* window width                    [pixels] */
   int            height;        /* window height                   [pixels] */
   int            fwidth;        /* font width                      [pixels] */
@@ -893,7 +895,6 @@
   Window         parent;        /* parent identifier                        */
   Window         vt;            /* vt100 window                             */
   GC             gc;            /* GC for drawing                           */
-  Pixmap         pixmap;
   rxvt_drawable *drawable;
   rxvt_fontset  *fontset[4];
 };
@@ -1030,6 +1031,7 @@
                   enc_utf8:1,		/* whether locale uses utf-8 */
                   seen_input:1,         /* whether we have seen some program output yet */
                   seen_resize:1,	/* whether we had a resize event */
+                  init_done:1,
                   parsed_geometry:1;
 
   unsigned char   refresh_type,
@@ -1073,8 +1075,6 @@
   unsigned int    ModLevel3Mask,
                   ModMetaMask,
                   ModNumLockMask;
-  int             old_width,  /* last used width in screen resize          */
-                  old_height; /* last used height in screen resize         */
   unsigned long   priv_modes,
                   SavedModes;
 /* ---------- */
@@ -1101,10 +1101,10 @@
 
     BG_EFFECTS_FLAGS     = BG_NEEDS_TINT | BG_NEEDS_BLUR,
 
-    BG_PROP_SCALE        = 1 <<  3,
+    BG_KEEP_ASPECT       = 1 <<  3,
     BG_ROOT_ALIGN        = 1 <<  4,
     BG_TILE              = 1 << 14,
-    BG_GEOMETRY_FLAGS    = BG_PROP_SCALE | BG_ROOT_ALIGN | BG_TILE,
+    BG_GEOMETRY_FLAGS    = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
 
     BG_TINT_SET          = 1 <<  5,
     BG_TINT_BITAND       = 1 <<  6,
@@ -1163,6 +1163,7 @@
 
   bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
   bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
+  void tint_ximage (Visual *visual, XImage *ximage);
   unsigned long make_transparency_pixmap ();
 # endif
 
@@ -1216,11 +1217,6 @@
 
   vector<void *> allocated;           // free these memory blocks with free()
 
-  char            env_windowid[21];   /* environmental variable WINDOWID */
-  char            env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
-  char           *env_display;        /* environmental variable DISPLAY  */
-  char           *env_term;           /* environmental variable TERM     */
-
   char           *locale;
   char            charsets[4];
   char           *v_buffer;           /* pointer to physical buffer */
@@ -1318,12 +1314,6 @@
   void tt_write (const char *data, unsigned int len);
   void pty_write ();
 
-  void init (stringvec *argv, stringvec *envv)
-  {
-    this->argv = argv;
-    init (argv->size (), argv->begin (), envv);
-  }
-
   void make_current () const // make this the "currently active" urxvt instance
   {
     SET_R (this);
@@ -1390,9 +1380,11 @@
   void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
   void process_sgr_mode (unsigned int nargs, const int *arg);
   // init.C
+  void init (stringvec *argv, stringvec *envv);
+  void init (int argc, const char *const *argv, const char *const *envv);
+  void init2 (int argc, const char *const *argv);
   void init_vars ();
   const char **init_resources (int argc, const char *const *argv);
-  void init (int argc, const char *const *argv, stringvec *envv);
   void init_env ();
   void set_locale (const char *locale);
   void init_xlocale ();
@@ -1420,7 +1412,7 @@
   void set_title (const char *str);
   void set_icon_name (const char *str);
   void set_window_color (int idx, const char *color);
-  void set_colorfgbg ();
+  char *get_colorfgbg ();
   bool set_color (rxvt_color &color, const char *name);
   void alias_color (int dst, int src);
   void set_widthheight (unsigned int newwidth, unsigned int newheight);
@@ -1465,7 +1457,7 @@
 # if ENABLE_STYLES
         && option (Opt_intensityStyles)
 # endif
-        && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
+        && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
       base += minBrightCOLOR - minCOLOR;
 #endif
     return base;
@@ -1479,7 +1471,7 @@
 # if ENABLE_STYLES
         && option (Opt_intensityStyles)
 # endif
-        && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
+        && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
       base += minBrightCOLOR - minCOLOR;
 #endif
     return base;
@@ -1492,14 +1484,6 @@
 
   void set_option (uint8_t opt, bool set = true) NOTHROW;
 
-  void set_privmode (unsigned bit, int set) NOTHROW
-  {
-    if (set)
-      priv_modes |= bit;
-    else
-      priv_modes &= ~bit;
-  }
-
   // modifies first argument(!)
   void tt_paste (char *data, unsigned int len) NOTHROW;
   void paste (char *data, unsigned int len) NOTHROW;
@@ -1579,10 +1563,11 @@
   void selection_rotate (int x, int y) NOTHROW;
 
   // xdefaults.C
-  void get_options (int argc, const char *const *argv);
+  const char **get_options (int argc, const char *const *argv);
   int parse_keysym (const char *str, const char *arg);
   const char *x_resource (const char *name);
   void extract_resources ();
+  void extract_keysym_resources ();
 };
 
 #endif /* _RXVT_H_ */