--- rxvt-unicode/src/xdefaults.C 2007/06/09 09:05:38 1.105 +++ rxvt-unicode/src/xdefaults.C 2007/07/31 22:24:36 1.109 @@ -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) \ @@ -94,6 +95,7 @@ BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), + BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), #if HAVE_SCROLLBARS RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), @@ -107,7 +109,7 @@ BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), -#if TRANSPARENT +#if ENABLE_TRANSPARENCY BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), SWCH ("tr", Opt_transparent, 0, NULL), # if TINTING @@ -265,7 +267,7 @@ #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"), + STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), #endif #ifndef NO_RESOURCES INFO ("xrm", "string", "X resource"), @@ -325,7 +327,7 @@ #if defined(XPM_BACKGROUND) "XPM," #endif -#if defined(TRANSPARENT) +#if defined(ENABLE_TRANSPARENCY) "transparent," #endif #if TINTING