… | |
… | |
34 | |
34 | |
35 | /* place holders used for parsing command-line options */ |
35 | /* place holders used for parsing command-line options */ |
36 | #define Optflag_Reverse 1 |
36 | #define Optflag_Reverse 1 |
37 | #define Optflag_Boolean 2 |
37 | #define Optflag_Boolean 2 |
38 | #define Optflag_Switch 4 |
38 | #define Optflag_Switch 4 |
|
|
39 | #define Optflag_Info 8 |
39 | |
40 | |
40 | /* monolithic option/resource structure: */ |
41 | /* monolithic option/resource structure: */ |
41 | /* |
42 | /* |
42 | * `string' options MUST have a usage argument |
43 | * `string' options MUST have a usage argument |
43 | * `switch' and `boolean' options have no argument |
44 | * `switch' and `boolean' options have no argument |
44 | * if there's no desc (ription), it won't appear in rxvt_usage () |
45 | * if there's no desc (ription), it won't appear in rxvt_usage () |
45 | */ |
46 | */ |
46 | |
47 | |
47 | /* INFO () - descriptive information only */ |
48 | /* INFO () - descriptive information only */ |
48 | #define INFO(opt, arg, desc) \ |
49 | #define INFO(opt, arg, desc) \ |
49 | {0, 0, -1, NULL, (opt), (arg), (desc)} |
50 | {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)} |
50 | |
51 | |
51 | /* STRG () - command-line option, with/without resource */ |
52 | /* STRG () - command-line option, with/without resource */ |
52 | #define STRG(rsp, kw, opt, arg, desc) \ |
53 | #define STRG(rsp, kw, opt, arg, desc) \ |
53 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
54 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
54 | |
55 | |
… | |
… | |
69 | (optList[i].flag == 0) |
70 | (optList[i].flag == 0) |
70 | #define optList_isBool(i) \ |
71 | #define optList_isBool(i) \ |
71 | (optList[i].flag & Optflag_Boolean) |
72 | (optList[i].flag & Optflag_Boolean) |
72 | #define optList_isReverse(i) \ |
73 | #define optList_isReverse(i) \ |
73 | (optList[i].flag & Optflag_Reverse) |
74 | (optList[i].flag & Optflag_Reverse) |
|
|
75 | #define optList_isInfo(i) \ |
|
|
76 | (optList[i].flag & Optflag_Info) |
74 | |
77 | |
75 | static const struct |
78 | static const struct |
76 | { |
79 | { |
77 | const uint8_t index; /* Option index */ |
80 | const uint8_t index; /* Option index */ |
78 | const uint8_t flag; /* Option flag */ |
81 | const uint8_t flag; /* Option flag */ |
… | |
… | |
466 | } |
469 | } |
467 | |
470 | |
468 | /*}}} */ |
471 | /*}}} */ |
469 | |
472 | |
470 | /*{{{ get command-line options before getting resources */ |
473 | /*{{{ get command-line options before getting resources */ |
471 | void |
474 | const char ** |
472 | rxvt_term::get_options (int argc, const char *const *argv) |
475 | rxvt_term::get_options (int argc, const char *const *argv) |
473 | { |
476 | { |
474 | int i, bad_option = 0; |
477 | int i, bad_option = 0; |
475 | |
478 | |
476 | for (i = 1; i < argc; i++) |
479 | for (i = 1; i < argc; i++) |
… | |
… | |
513 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
516 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
514 | || (!longopt |
517 | || (!longopt |
515 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
518 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
516 | break; |
519 | break; |
517 | |
520 | |
518 | if (entry < ecb_array_length (optList)) |
521 | if (entry < ecb_array_length (optList) |
|
|
522 | && !optList_isInfo (entry)) |
519 | { |
523 | { |
520 | if (optList_isReverse (entry)) |
524 | if (optList_isReverse (entry)) |
521 | flag = !flag; |
525 | flag = !flag; |
522 | |
526 | |
523 | if (optList_isString (entry)) |
527 | if (optList_isString (entry)) |
… | |
… | |
561 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
565 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
562 | XrmPutLineResource (&option_db, res); |
566 | XrmPutLineResource (&option_db, res); |
563 | } |
567 | } |
564 | } |
568 | } |
565 | #endif |
569 | #endif |
|
|
570 | else if (!strcmp (opt, "e")) |
|
|
571 | { |
|
|
572 | if (i+1 == argc) |
|
|
573 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
574 | |
|
|
575 | return (const char **)argv + i + 1; |
|
|
576 | } |
566 | else |
577 | else |
567 | { |
578 | { |
568 | bad_option = 1; |
579 | bad_option = 1; |
569 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
580 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
570 | } |
581 | } |
571 | } |
582 | } |
572 | |
583 | |
573 | if (bad_option) |
584 | if (bad_option) |
574 | rxvt_usage (0); |
585 | rxvt_usage (0); |
|
|
586 | |
|
|
587 | return 0; |
575 | } |
588 | } |
576 | |
589 | |
577 | /*}}} */ |
590 | /*}}} */ |
578 | |
591 | |
579 | #ifndef NO_RESOURCES |
592 | #ifndef NO_RESOURCES |
… | |
… | |
584 | * Define key from XrmEnumerateDatabase. |
597 | * Define key from XrmEnumerateDatabase. |
585 | * quarks will be something like |
598 | * quarks will be something like |
586 | * "rxvt" "keysym" "0xFF01" |
599 | * "rxvt" "keysym" "0xFF01" |
587 | * value will be a string |
600 | * value will be a string |
588 | */ |
601 | */ |
589 | int |
602 | static int |
590 | rxvt_define_key (XrmDatabase *database ecb_unused, |
603 | rxvt_define_key (XrmDatabase *database ecb_unused, |
591 | XrmBindingList bindings ecb_unused, |
604 | XrmBindingList bindings ecb_unused, |
592 | XrmQuarkList quarks, |
605 | XrmQuarkList quarks, |
593 | XrmRepresentation *type ecb_unused, |
606 | XrmRepresentation *type ecb_unused, |
594 | XrmValue *value, |
607 | XrmValue *value, |
… | |
… | |
690 | sym = strtol (str, &end, 16); |
703 | sym = strtol (str, &end, 16); |
691 | if (*end) |
704 | if (*end) |
692 | return -1; |
705 | return -1; |
693 | } |
706 | } |
694 | |
707 | |
|
|
708 | wchar_t *ws = rxvt_mbstowcs (arg); |
|
|
709 | if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) |
695 | keyboard->register_user_translation (sym, state, arg); |
710 | keyboard->register_user_translation (sym, state, ws); |
|
|
711 | free (ws); |
696 | return 1; |
712 | return 1; |
697 | } |
713 | } |
698 | |
714 | |
699 | # endif /* KEYSYM_RESOURCE */ |
715 | # endif /* KEYSYM_RESOURCE */ |
700 | #endif /* NO_RESOURCES */ |
716 | #endif /* NO_RESOURCES */ |
… | |
… | |
773 | |
789 | |
774 | set_option (optList[entry].index, s); |
790 | set_option (optList[entry].index, s); |
775 | } |
791 | } |
776 | } |
792 | } |
777 | } |
793 | } |
|
|
794 | #endif /* NO_RESOURCES */ |
|
|
795 | } |
778 | |
796 | |
|
|
797 | void |
|
|
798 | rxvt_term::extract_keysym_resources () |
|
|
799 | { |
|
|
800 | #ifndef NO_RESOURCES |
779 | /* |
801 | /* |
780 | * [R5 or later]: enumerate the resource database |
802 | * [R5 or later]: enumerate the resource database |
781 | */ |
803 | */ |
782 | # ifdef KEYSYM_RESOURCE |
804 | # ifdef KEYSYM_RESOURCE |
|
|
805 | XrmDatabase database = XrmGetDatabase (dpy); |
783 | XrmName name_prefix[3]; |
806 | XrmName name_prefix[3]; |
784 | XrmClass class_prefix[3]; |
807 | XrmClass class_prefix[3]; |
785 | |
808 | |
786 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
809 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
787 | name_prefix[1] = XrmStringToName ("keysym"); |
810 | name_prefix[1] = XrmStringToName ("keysym"); |