--- rxvt-unicode/src/xdefaults.C 2007/06/08 20:40:07 1.103 +++ rxvt-unicode/src/xdefaults.C 2007/06/10 14:27:58 1.106 @@ -34,6 +34,7 @@ /* place holders used for parsing command-line options */ #define Optflag_Reverse 1 #define Optflag_Boolean 2 +#define Optflag_Switch 4 /* monolithic option/resource structure: */ /* @@ -60,7 +61,7 @@ /* SWCH () - `-' flag */ #define SWCH(opt, option, flag, desc) \ - { (option), (Optflag_Boolean | (flag)), -1, NULL, (opt), NULL, (desc)} + { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} /* convenient macros */ #define optList_strlen(i) \ @@ -260,7 +261,9 @@ 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"), @@ -540,7 +543,6 @@ { if (optList_isReverse (entry)) flag = flag == resval_on ? resval_off : resval_on; -fprintf( stderr, "entry = %d, opt = [%s], flag = 0x%X, resval_on = %d\n", entry, opt, *flag, *resval_on ); if (optList_strlen (entry)) { @@ -549,7 +551,7 @@ * X resources to set these values before we settle for * default values */ -fprintf( stderr, "string\n"); + if (optList[entry].doff != -1) { if (flag == resval_on && !argv [i+1])