ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.101 by ayin, Thu May 3 18:11:08 2007 UTC vs.
Revision 1.103 by sasha, Fri Jun 8 20:40:07 2007 UTC

58#define BOOL(rsp, kw, opt, option, flag, desc) \ 58#define BOOL(rsp, kw, opt, option, flag, desc) \
59 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 59 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
60 60
61/* SWCH () - `-' flag */ 61/* SWCH () - `-' flag */
62#define SWCH(opt, option, flag, desc) \ 62#define SWCH(opt, option, flag, desc) \
63 { (option), (flag), -1, NULL, (opt), NULL, (desc)} 63 { (option), (Optflag_Boolean | (flag)), -1, NULL, (opt), NULL, (desc)}
64 64
65/* convenient macros */ 65/* convenient macros */
66#define optList_strlen(i) \ 66#define optList_strlen(i) \
67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
68#define optList_isBool(i) \ 68#define optList_isBool(i) \
258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 262#endif
263
264#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"),
267#endif
263#ifndef NO_RESOURCES 268#ifndef NO_RESOURCES
264 INFO ("xrm", "string", "X resource"), 269 INFO ("xrm", "string", "X resource"),
265#endif 270#endif
266 INFO ("e", "command arg ...", "command to execute") 271 INFO ("e", "command arg ...", "command to execute")
267 }; 272 };
533 538
534 if (entry < optList_size) 539 if (entry < optList_size)
535 { 540 {
536 if (optList_isReverse (entry)) 541 if (optList_isReverse (entry))
537 flag = flag == resval_on ? resval_off : resval_on; 542 flag = flag == resval_on ? resval_off : resval_on;
543fprintf( stderr, "entry = %d, opt = [%s], flag = 0x%X, resval_on = %d\n", entry, opt, *flag, *resval_on );
538 544
539 if (optList_strlen (entry)) 545 if (optList_strlen (entry))
540 { 546 {
541 /* 547 /*
542 * special cases are handled in main.c:main () to allow 548 * special cases are handled in main.c:main () to allow
543 * X resources to set these values before we settle for 549 * X resources to set these values before we settle for
544 * default values 550 * default values
545 */ 551 */
546 552fprintf( stderr, "string\n");
547 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
548 { 554 {
549 if (flag == resval_on && !argv [i+1]) 555 if (flag == resval_on && !argv [i+1])
550 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 556 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
551 557

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines