| … | |
… | |
| 494 | int i, bad_option = 0; |
494 | int i, bad_option = 0; |
| 495 | |
495 | |
| 496 | for (i = 1; i < argc; i++) |
496 | for (i = 1; i < argc; i++) |
| 497 | { |
497 | { |
| 498 | unsigned int entry, longopt = 0; |
498 | unsigned int entry, longopt = 0; |
| 499 | const char *flag, *opt; |
499 | const char *opt; |
|
|
500 | int flag; |
| 500 | |
501 | |
| 501 | opt = argv[i]; |
502 | opt = argv[i]; |
| 502 | |
503 | |
| 503 | if (*opt == '-') |
504 | if (*opt == '-') |
| 504 | { |
505 | { |
| 505 | flag = resval_on; |
506 | flag = 1; |
| 506 | |
507 | |
| 507 | if (*++opt == '-') |
508 | if (*++opt == '-') |
| 508 | longopt = *opt++; /* long option */ |
509 | longopt = *opt++; /* long option */ |
| 509 | } |
510 | } |
| 510 | else if (*opt == '+') |
511 | else if (*opt == '+') |
| 511 | { |
512 | { |
| 512 | flag = resval_off; |
513 | flag = 0; |
| 513 | |
514 | |
| 514 | if (*++opt == '+') |
515 | if (*++opt == '+') |
| 515 | longopt = *opt++; /* long option */ |
516 | longopt = *opt++; /* long option */ |
| 516 | } |
517 | } |
| 517 | else |
518 | else |
| … | |
… | |
| 535 | break; |
536 | break; |
| 536 | |
537 | |
| 537 | if (entry < optList_size) |
538 | if (entry < optList_size) |
| 538 | { |
539 | { |
| 539 | if (optList_isReverse (entry)) |
540 | if (optList_isReverse (entry)) |
| 540 | flag = flag == resval_on ? resval_off : resval_on; |
541 | flag = !flag; |
| 541 | |
542 | |
| 542 | if (optList_strlen (entry)) |
543 | if (optList_strlen (entry)) |
| 543 | { |
544 | { |
| 544 | /* |
545 | /* |
| 545 | * special cases are handled in main.c:main () to allow |
546 | * special cases are handled in main.c:main () to allow |
| … | |
… | |
| 547 | * default values |
548 | * default values |
| 548 | */ |
549 | */ |
| 549 | |
550 | |
| 550 | if (optList[entry].doff != -1) |
551 | if (optList[entry].doff != -1) |
| 551 | { |
552 | { |
| 552 | if (flag == resval_on && i+1 == argc) |
553 | if (flag && i+1 == argc) |
| 553 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
554 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
| 554 | |
555 | |
| 555 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
556 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
| 556 | } |
557 | } |
| 557 | } |
558 | } |
| 558 | else |
559 | else |
| 559 | { |
560 | { |
| 560 | /* boolean value */ |
561 | /* boolean value */ |
| 561 | set_option (optList[entry].index, flag == resval_on); |
562 | set_option (optList[entry].index, flag); |
| 562 | |
563 | |
| 563 | if (optList[entry].doff != -1) |
564 | if (optList[entry].doff != -1) |
| 564 | rs[optList[entry].doff] = flag; |
565 | rs[optList[entry].doff] = flag ? resval_on : resval_off; |
| 565 | } |
566 | } |
| 566 | } |
567 | } |
| 567 | #ifndef NO_RESOURCES |
568 | #ifndef NO_RESOURCES |
| 568 | else if (!strcmp (opt, "xrm")) |
569 | else if (!strcmp (opt, "xrm")) |
| 569 | { |
570 | { |
| … | |
… | |
| 626 | } |
627 | } |
| 627 | |
628 | |
| 628 | /* |
629 | /* |
| 629 | * look for something like this (XK_Delete) |
630 | * look for something like this (XK_Delete) |
| 630 | * rxvt*keysym.0xFFFF: "\177" |
631 | * 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 | */ |
632 | */ |
| 636 | #define NEWARGLIM 500 /* `reasonable' size */ |
|
|
| 637 | |
633 | |
| 638 | struct keysym_vocabulary_t |
634 | struct keysym_vocabulary_t |
| 639 | { |
635 | { |
| 640 | const char *name; |
636 | const char *name; |
| 641 | unsigned short len; |
637 | unsigned short len; |
| 642 | unsigned short value; |
638 | unsigned short value; |
| 643 | }; |
639 | }; |
| 644 | keysym_vocabulary_t keysym_vocabulary[] = |
640 | static const keysym_vocabulary_t keysym_vocabulary[] = |
| 645 | { |
641 | { |
| 646 | { "ISOLevel3", 9, Level3Mask }, |
642 | { "ISOLevel3", 9, Level3Mask }, |
| 647 | { "AppKeypad", 9, AppKeypadMask }, |
643 | { "AppKeypad", 9, AppKeypadMask }, |
| 648 | { "Control", 7, ControlMask }, |
644 | { "Control", 7, ControlMask }, |
| 649 | { "NumLock", 7, NumLockMask }, |
645 | { "NumLock", 7, NumLockMask }, |
| … | |
… | |
| 671 | }; |
667 | }; |
| 672 | |
668 | |
| 673 | int |
669 | int |
| 674 | rxvt_term::parse_keysym (const char *str, const char *arg) |
670 | rxvt_term::parse_keysym (const char *str, const char *arg) |
| 675 | { |
671 | { |
| 676 | int n, sym; |
672 | int sym; |
| 677 | unsigned int state = 0; |
673 | unsigned int state = 0; |
| 678 | const char *pmodend = NULL; |
674 | const char *key = strrchr (str, '-'); |
| 679 | char *newarg = NULL; |
|
|
| 680 | char newargstr[NEWARGLIM]; |
|
|
| 681 | |
675 | |
| 682 | if (arg == NULL) |
676 | if (!key) |
| 683 | { |
677 | 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 |
678 | else |
| 693 | pmodend = str + strlen(str); |
679 | key++; |
| 694 | |
680 | |
| 695 | for (--pmodend; str < pmodend; --pmodend) |
681 | // string or key is empty |
| 696 | if (*pmodend == '-') |
682 | if (*arg == '\0' || *key == '\0') |
| 697 | break; |
683 | return -1; |
| 698 | |
684 | |
|
|
685 | // parse modifiers |
| 699 | while (str < pmodend) |
686 | while (str < key) |
| 700 | { |
687 | { |
| 701 | unsigned int i; |
688 | unsigned int i; |
| 702 | |
689 | |
| 703 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
690 | for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) |
| 704 | { |
691 | { |
| … | |
… | |
| 715 | |
702 | |
| 716 | if (*str == '-') |
703 | if (*str == '-') |
| 717 | ++str; |
704 | ++str; |
| 718 | } |
705 | } |
| 719 | |
706 | |
| 720 | /* some scanf () have trouble with a 0x prefix */ |
707 | // convert keysym name to keysym number |
| 721 | if (str[0] == '0' && toupper (str[1]) == 'X') |
708 | if ((sym = XStringToKeysym (str)) == None) |
| 722 | { |
709 | { |
| 723 | str += 2; |
710 | // fallback on hexadecimal parsing |
| 724 | |
711 | char *end; |
|
|
712 | sym = strtol (str, &end, 16); |
| 725 | if (arg) |
713 | 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; |
714 | return -1; |
| 759 | } |
715 | } |
| 760 | |
716 | |
| 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); |
717 | keyboard->register_user_translation (sym, state, arg); |
| 772 | return 1; |
718 | return 1; |
| 773 | } |
719 | } |
| 774 | |
720 | |
| 775 | # endif /* KEYSYM_RESOURCE */ |
721 | # endif /* KEYSYM_RESOURCE */ |
| 776 | #endif /* NO_RESOURCES */ |
722 | #endif /* NO_RESOURCES */ |
