--- rxvt-unicode/src/xdefaults.C	2007/05/01 09:34:07	1.97
+++ rxvt-unicode/src/xdefaults.C	2007/06/09 09:05:38	1.105
@@ -56,11 +56,11 @@
 
 /* BOOL () - regular boolean `-/+' flag */
 #define BOOL(rsp, kw, opt, option, flag, desc)			\
-    { option ## _idx, (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
+    { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
 
 /* SWCH () - `-' flag */
 #define SWCH(opt, option, flag, desc)				\
-    { option ## _idx, (flag), -1, NULL, (opt), NULL, (desc)}
+    { (option), (Optflag_Boolean | (flag)), -1, NULL, (opt), NULL, (desc)}
 
 /* convenient macros */
 #define optList_strlen(i)						\
@@ -76,7 +76,7 @@
   {
     const uint8_t   index;      /* Option index */
     const uint8_t   flag;	/* Option flag */
-    const int       doff;	/* data offset */
+    const int16_t   doff;	/* resource value index or -1 */
     const char     *kw;		/* keyword */
     const char     *opt;	/* option */
     const char     *arg;	/* argument */
@@ -123,6 +123,9 @@
 #endif
               BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
 #ifndef NO_BELL
+# if ENABLE_FRILLS
+              BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, NULL),
+# endif
               BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
 # if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
               BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
@@ -257,6 +260,13 @@
               RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
               STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
 #endif
+#if ISO_14755
+              BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
+#endif
+#ifdef HAVE_AFTERIMAGE
+              STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
+              STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"),
+#endif
 #ifndef NO_RESOURCES
               INFO ("xrm", "string", "X resource"),
 #endif
@@ -551,7 +561,7 @@
             }
           else
             {		/* boolean value */
-              set_option (1UL << optList[entry].index, flag == resval_on);
+              set_option (optList[entry].index, flag == resval_on);
 
               if (optList[entry].doff != -1)
                 rs[optList[entry].doff] = flag;
@@ -829,7 +839,7 @@
               if (optList_isReverse (entry))
                 s = !s;
 
-              set_option (1UL << optList[entry].index, s);
+              set_option (optList[entry].index, s);
             }
         }
     }