--- rxvt-unicode/src/rxvt.h	2011/08/09 18:41:31	1.446
+++ rxvt-unicode/src/rxvt.h	2011/12/12 13:56:03	1.453
@@ -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,
@@ -1321,7 +1321,10 @@
   void init (stringvec *argv, stringvec *envv)
   {
     this->argv = argv;
-    init (argv->size (), argv->begin (), envv);
+    this->envv = envv;
+    argv->push_back (0);
+    envv->push_back (0);
+    init (argv->size () - 1, argv->begin ());
   }
 
   void make_current () const // make this the "currently active" urxvt instance
@@ -1392,7 +1395,7 @@
   // init.C
   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 (int argc, const char *const *argv);
   void init_env ();
   void set_locale (const char *locale);
   void init_xlocale ();
@@ -1465,7 +1468,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 +1482,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 +1495,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;
@@ -1583,6 +1578,7 @@
   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_ */