| … | |
… | |
| 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 |
| … | |
… | |
| 538 | |
541 | |
| 539 | if (entry < optList_size) |
542 | if (entry < optList_size) |
| 540 | { |
543 | { |
| 541 | if (optList_isReverse (entry)) |
544 | if (optList_isReverse (entry)) |
| 542 | flag = flag == resval_on ? resval_off : resval_on; |
545 | flag = flag == resval_on ? resval_off : resval_on; |
| 543 | fprintf( stderr, "entry = %d, opt = [%s], flag = 0x%X, resval_on = %d\n", entry, opt, *flag, *resval_on ); |
|
|
| 544 | |
546 | |
| 545 | if (optList_strlen (entry)) |
547 | if (optList_strlen (entry)) |
| 546 | { |
548 | { |
| 547 | /* |
549 | /* |
| 548 | * special cases are handled in main.c:main () to allow |
550 | * special cases are handled in main.c:main () to allow |
| 549 | * X resources to set these values before we settle for |
551 | * X resources to set these values before we settle for |
| 550 | * default values |
552 | * default values |
| 551 | */ |
553 | */ |
| 552 | fprintf( stderr, "string\n"); |
554 | |
| 553 | if (optList[entry].doff != -1) |
555 | if (optList[entry].doff != -1) |
| 554 | { |
556 | { |
| 555 | if (flag == resval_on && !argv [i+1]) |
557 | if (flag == resval_on && !argv [i+1]) |
| 556 | rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); |
558 | rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); |
| 557 | |
559 | |
