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.104 by sasha, Fri Jun 8 20:41:01 2007 UTC vs.
Revision 1.106 by ayin, Sun Jun 10 14:27:58 2007 UTC

32#endif 32#endif
33 33
34/* place holders used for parsing command-line options */ 34/* place holders used for parsing command-line options */
35#define Optflag_Reverse 1 35#define Optflag_Reverse 1
36#define Optflag_Boolean 2 36#define Optflag_Boolean 2
37#define Optflag_Switch 4
37 38
38/* monolithic option/resource structure: */ 39/* monolithic option/resource structure: */
39/* 40/*
40 * `string' options MUST have a usage argument 41 * `string' options MUST have a usage argument
41 * `switch' and `boolean' options have no argument 42 * `switch' and `boolean' options have no argument
58#define BOOL(rsp, kw, opt, option, flag, desc) \ 59#define BOOL(rsp, kw, opt, option, flag, desc) \
59 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 60 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
60 61
61/* SWCH () - `-' flag */ 62/* SWCH () - `-' flag */
62#define SWCH(opt, option, flag, desc) \ 63#define SWCH(opt, option, flag, desc) \
63 { (option), (Optflag_Boolean | (flag)), -1, NULL, (opt), NULL, (desc)} 64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
64 65
65/* convenient macros */ 66/* convenient macros */
66#define optList_strlen(i) \ 67#define optList_strlen(i) \
67 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
68#define optList_isBool(i) \ 69#define optList_isBool(i) \
258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 259 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 260 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 261 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"), 262 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 263#endif
263 264#if ISO_14755
265 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
266#endif
264#ifdef HAVE_AFTERIMAGE 267#ifdef HAVE_AFTERIMAGE
265 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 268 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"), 269 STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"),
267#endif 270#endif
268#ifndef NO_RESOURCES 271#ifndef NO_RESOURCES
546 /* 549 /*
547 * special cases are handled in main.c:main () to allow 550 * special cases are handled in main.c:main () to allow
548 * X resources to set these values before we settle for 551 * X resources to set these values before we settle for
549 * default values 552 * default values
550 */ 553 */
554
551 if (optList[entry].doff != -1) 555 if (optList[entry].doff != -1)
552 { 556 {
553 if (flag == resval_on && !argv [i+1]) 557 if (flag == resval_on && !argv [i+1])
554 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); 558 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
555 559

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines