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