… | |
… | |
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 | { |
… | |
… | |
626 | } |
623 | } |
627 | |
624 | |
628 | /* |
625 | /* |
629 | * look for something like this (XK_Delete) |
626 | * look for something like this (XK_Delete) |
630 | * rxvt*keysym.0xFFFF: "\177" |
627 | * rxvt*keysym.0xFFFF: "\177" |
631 | * |
|
|
632 | * arg will be |
|
|
633 | * NULL for ~/.Xdefaults and |
|
|
634 | * non-NULL for command-line options (need to allocate) |
|
|
635 | */ |
628 | */ |
636 | #define NEWARGLIM 500 /* `reasonable' size */ |
|
|
637 | |
629 | |
638 | struct keysym_vocabulary_t |
630 | struct keysym_vocabulary_t |
639 | { |
631 | { |
640 | const char *name; |
632 | const char *name; |
641 | unsigned short len; |
633 | unsigned short len; |
642 | unsigned short value; |
634 | unsigned short value; |
643 | }; |
635 | }; |
644 | keysym_vocabulary_t keysym_vocabulary[] = |
636 | static const keysym_vocabulary_t keysym_vocabulary[] = |
645 | { |
637 | { |
646 | { "ISOLevel3", 9, Level3Mask }, |
638 | { "ISOLevel3", 9, Level3Mask }, |
647 | { "AppKeypad", 9, AppKeypadMask }, |
639 | { "AppKeypad", 9, AppKeypadMask }, |
648 | { "Control", 7, ControlMask }, |
640 | { "Control", 7, ControlMask }, |
649 | { "NumLock", 7, NumLockMask }, |
641 | { "NumLock", 7, NumLockMask }, |
… | |
… | |
671 | }; |
663 | }; |
672 | |
664 | |
673 | int |
665 | int |
674 | rxvt_term::parse_keysym (const char *str, const char *arg) |
666 | rxvt_term::parse_keysym (const char *str, const char *arg) |
675 | { |
667 | { |
676 | int n, sym; |
668 | int sym; |
677 | unsigned int state = 0; |
669 | unsigned int state = 0; |
678 | const char *pmodend = NULL; |
670 | const char *key = strrchr (str, '-'); |
679 | char *newarg = NULL; |
|
|
680 | char newargstr[NEWARGLIM]; |
|
|
681 | |
671 | |
682 | if (arg == NULL) |
672 | if (!key) |
683 | { |
673 | key = str; |
684 | n = sizeof ("keysym.") - 1; |
|
|
685 | if (strncmp (str, "keysym.", n)) |
|
|
686 | return 0; |
|
|
687 | |
|
|
688 | str += n; /* skip `keysym.' */ |
|
|
689 | if (!(pmodend = strchr (str, ':'))) |
|
|
690 | return -1; |
|
|
691 | } |
|
|
692 | else |
674 | else |
693 | pmodend = str + strlen(str); |
675 | key++; |
694 | |
676 | |
695 | for (--pmodend; str < pmodend; --pmodend) |
677 | // string or key is empty |
696 | if (*pmodend == '-') |
678 | if (*arg == '\0' || *key == '\0') |
697 | break; |
679 | return -1; |
698 | |
680 | |
|
|
681 | // parse modifiers |
699 | while (str < pmodend) |
682 | while (str < key) |
700 | { |
683 | { |
701 | unsigned int i; |
684 | unsigned int i; |
702 | |
685 | |
703 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
686 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
704 | { |
687 | { |
… | |
… | |
715 | |
698 | |
716 | if (*str == '-') |
699 | if (*str == '-') |
717 | ++str; |
700 | ++str; |
718 | } |
701 | } |
719 | |
702 | |
720 | /* some scanf () have trouble with a 0x prefix */ |
703 | // convert keysym name to keysym number |
721 | if (str[0] == '0' && toupper (str[1]) == 'X') |
704 | if ((sym = XStringToKeysym (str)) == None) |
722 | { |
705 | { |
723 | str += 2; |
706 | // fallback on hexadecimal parsing |
724 | |
707 | char *end; |
|
|
708 | sym = strtol (str, &end, 16); |
725 | if (arg) |
709 | if (*end) |
726 | { |
|
|
727 | if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) |
|
|
728 | return -1; |
|
|
729 | } |
|
|
730 | else |
|
|
731 | { |
|
|
732 | if (sscanf (str, "%x:", &sym) != 1) |
|
|
733 | return -1; |
|
|
734 | |
|
|
735 | /* cue to ':', it's there since sscanf () worked */ |
|
|
736 | strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1); |
|
|
737 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
738 | newarg = newargstr; |
|
|
739 | } |
|
|
740 | } |
|
|
741 | else |
|
|
742 | { |
|
|
743 | /* |
|
|
744 | * convert keysym name to keysym number |
|
|
745 | */ |
|
|
746 | strncpy (newargstr, str, NEWARGLIM - 1); |
|
|
747 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
748 | |
|
|
749 | if (arg == NULL) |
|
|
750 | { |
|
|
751 | if ((newarg = strchr (newargstr, ':')) == NULL) |
|
|
752 | return -1; |
|
|
753 | |
|
|
754 | *newarg++ = '\0'; /* terminate keysym name */ |
|
|
755 | } |
|
|
756 | |
|
|
757 | if ((sym = XStringToKeysym (newargstr)) == None) |
|
|
758 | return -1; |
710 | return -1; |
759 | } |
711 | } |
760 | |
712 | |
761 | if (newarg == NULL) |
|
|
762 | { |
|
|
763 | strncpy (newargstr, arg, NEWARGLIM - 1); |
|
|
764 | newargstr[NEWARGLIM - 1] = '\0'; |
|
|
765 | newarg = newargstr; |
|
|
766 | } |
|
|
767 | |
|
|
768 | if (*newarg == '\0') |
|
|
769 | return -1; |
|
|
770 | |
|
|
771 | keyboard->register_user_translation (sym, state, newarg); |
713 | keyboard->register_user_translation (sym, state, arg); |
772 | return 1; |
714 | return 1; |
773 | } |
715 | } |
774 | |
716 | |
775 | # endif /* KEYSYM_RESOURCE */ |
717 | # endif /* KEYSYM_RESOURCE */ |
776 | #endif /* NO_RESOURCES */ |
718 | #endif /* NO_RESOURCES */ |