… | |
… | |
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; |
… | |
… | |
494 | int i, bad_option = 0; |
490 | int i, bad_option = 0; |
495 | |
491 | |
496 | for (i = 1; i < argc; i++) |
492 | for (i = 1; i < argc; i++) |
497 | { |
493 | { |
498 | unsigned int entry, longopt = 0; |
494 | unsigned int entry, longopt = 0; |
499 | const char *flag, *opt; |
495 | const char *opt; |
|
|
496 | int flag; |
500 | |
497 | |
501 | opt = argv[i]; |
498 | opt = argv[i]; |
502 | |
499 | |
503 | if (*opt == '-') |
500 | if (*opt == '-') |
504 | { |
501 | { |
505 | flag = resval_on; |
502 | flag = 1; |
506 | |
503 | |
507 | if (*++opt == '-') |
504 | if (*++opt == '-') |
508 | longopt = *opt++; /* long option */ |
505 | longopt = *opt++; /* long option */ |
509 | } |
506 | } |
510 | else if (*opt == '+') |
507 | else if (*opt == '+') |
511 | { |
508 | { |
512 | flag = resval_off; |
509 | flag = 0; |
513 | |
510 | |
514 | if (*++opt == '+') |
511 | if (*++opt == '+') |
515 | longopt = *opt++; /* long option */ |
512 | longopt = *opt++; /* long option */ |
516 | } |
513 | } |
517 | else |
514 | else |
… | |
… | |
535 | break; |
532 | break; |
536 | |
533 | |
537 | if (entry < optList_size) |
534 | if (entry < optList_size) |
538 | { |
535 | { |
539 | if (optList_isReverse (entry)) |
536 | if (optList_isReverse (entry)) |
540 | flag = flag == resval_on ? resval_off : resval_on; |
537 | flag = !flag; |
541 | |
538 | |
542 | if (optList_strlen (entry)) |
539 | if (optList_isString (entry)) |
543 | { |
540 | { |
544 | /* |
541 | /* |
545 | * special cases are handled in main.c:main () to allow |
542 | * special cases are handled in main.c:main () to allow |
546 | * X resources to set these values before we settle for |
543 | * X resources to set these values before we settle for |
547 | * default values |
544 | * default values |
548 | */ |
545 | */ |
549 | |
546 | |
550 | if (optList[entry].doff != -1) |
547 | if (optList[entry].doff != -1) |
551 | { |
548 | { |
552 | if (flag == resval_on && i+1 == argc) |
549 | if (flag && i+1 == argc) |
553 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
550 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
554 | |
551 | |
555 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
552 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
556 | } |
553 | } |
557 | } |
554 | } |
558 | else |
555 | else |
559 | { |
556 | { |
560 | /* boolean value */ |
557 | /* boolean value */ |
561 | set_option (optList[entry].index, flag == resval_on); |
558 | set_option (optList[entry].index, flag); |
562 | |
559 | |
563 | if (optList[entry].doff != -1) |
560 | if (optList[entry].doff != -1) |
564 | rs[optList[entry].doff] = flag; |
561 | rs[optList[entry].doff] = flag ? resval_on : resval_off; |
565 | } |
562 | } |
566 | } |
563 | } |
567 | #ifndef NO_RESOURCES |
564 | #ifndef NO_RESOURCES |
568 | else if (!strcmp (opt, "xrm")) |
565 | else if (!strcmp (opt, "xrm")) |
569 | { |
566 | { |