| … | |
… | |
| 63 | /* SWCH () - `-' flag */ |
63 | /* SWCH () - `-' flag */ |
| 64 | #define SWCH(opt, option, flag, desc) \ |
64 | #define SWCH(opt, option, flag, desc) \ |
| 65 | { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} |
65 | { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} |
| 66 | |
66 | |
| 67 | /* convenient macros */ |
67 | /* convenient macros */ |
| 68 | #define optList_strlen(i) \ |
68 | #define optList_isString(i) \ |
| 69 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
69 | (optList[i].flag == 0) |
| 70 | #define optList_isBool(i) \ |
70 | #define optList_isBool(i) \ |
| 71 | (optList[i].flag & Optflag_Boolean) |
71 | (optList[i].flag & Optflag_Boolean) |
| 72 | #define optList_isReverse(i) \ |
72 | #define optList_isReverse(i) \ |
| 73 | (optList[i].flag & Optflag_Reverse) |
73 | (optList[i].flag & Optflag_Reverse) |
| 74 | #define optList_size \ |
74 | #define optList_size \ |
| … | |
… | |
| 413 | for (col = 1, i = 0; i < optList_size; i++) |
413 | for (col = 1, i = 0; i < optList_size; i++) |
| 414 | if (optList[i].desc != NULL) |
414 | if (optList[i].desc != NULL) |
| 415 | { |
415 | { |
| 416 | int len = 0; |
416 | int len = 0; |
| 417 | |
417 | |
| 418 | if (!optList_isBool (i)) |
418 | if (optList[i].arg) |
| 419 | { |
419 | len = strlen (optList[i].arg) + 1; |
| 420 | len = optList_strlen (i); |
|
|
| 421 | if (len > 0) |
|
|
| 422 | len++; /* account for space */ |
|
|
| 423 | } |
|
|
| 424 | #ifdef DEBUG_STRICT |
420 | #ifdef DEBUG_STRICT |
| 425 | assert (optList[i].opt != NULL); |
421 | assert (optList[i].opt != NULL); |
| 426 | #endif |
422 | #endif |
| 427 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
423 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
| 428 | col += len; |
424 | col += len; |
| … | |
… | |
| 432 | rxvt_log ("\n"); |
428 | rxvt_log ("\n"); |
| 433 | col = 1 + len; |
429 | col = 1 + len; |
| 434 | } |
430 | } |
| 435 | |
431 | |
| 436 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
432 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
| 437 | if (optList_strlen (i)) |
433 | if (optList[i].arg) |
| 438 | rxvt_log (" %s]", optList[i].arg); |
434 | rxvt_log (" %s]", optList[i].arg); |
| 439 | else |
435 | else |
| 440 | rxvt_log ("]"); |
436 | rxvt_log ("]"); |
| 441 | } |
437 | } |
| 442 | break; |
438 | break; |
| … | |
… | |
| 538 | if (entry < optList_size) |
534 | if (entry < optList_size) |
| 539 | { |
535 | { |
| 540 | if (optList_isReverse (entry)) |
536 | if (optList_isReverse (entry)) |
| 541 | flag = !flag; |
537 | flag = !flag; |
| 542 | |
538 | |
| 543 | if (optList_strlen (entry)) |
539 | if (optList_isString (entry)) |
| 544 | { |
540 | { |
| 545 | /* |
541 | /* |
| 546 | * special cases are handled in main.c:main () to allow |
542 | * special cases are handled in main.c:main () to allow |
| 547 | * X resources to set these values before we settle for |
543 | * X resources to set these values before we settle for |
| 548 | * default values |
544 | * default values |
