… | |
… | |
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)} |
|
|
51 | |
|
|
52 | #define RINFO(kw, arg) \ |
|
|
53 | {0, Optflag_Info, -1, (kw), NULL, (arg), NULL} |
50 | |
54 | |
51 | /* STRG () - command-line option, with/without resource */ |
55 | /* STRG () - command-line option, with/without resource */ |
52 | #define STRG(rsp, kw, opt, arg, desc) \ |
56 | #define STRG(rsp, kw, opt, arg, desc) \ |
53 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
57 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
54 | |
58 | |
… | |
… | |
69 | (optList[i].flag == 0) |
73 | (optList[i].flag == 0) |
70 | #define optList_isBool(i) \ |
74 | #define optList_isBool(i) \ |
71 | (optList[i].flag & Optflag_Boolean) |
75 | (optList[i].flag & Optflag_Boolean) |
72 | #define optList_isReverse(i) \ |
76 | #define optList_isReverse(i) \ |
73 | (optList[i].flag & Optflag_Reverse) |
77 | (optList[i].flag & Optflag_Reverse) |
|
|
78 | #define optList_isInfo(i) \ |
|
|
79 | (optList[i].flag & Optflag_Info) |
74 | |
80 | |
75 | static const struct |
81 | static const struct |
76 | { |
82 | { |
77 | const uint8_t index; /* Option index */ |
83 | const uint8_t index; /* Option index */ |
78 | const uint8_t flag; /* Option flag */ |
84 | const uint8_t flag; /* Option flag */ |
… | |
… | |
267 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
273 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
268 | #endif |
274 | #endif |
269 | #ifdef HAVE_AFTERIMAGE |
275 | #ifdef HAVE_AFTERIMAGE |
270 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
276 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
271 | #endif |
277 | #endif |
|
|
278 | #ifndef NO_RESOURCES |
|
|
279 | RINFO ("xrm", "string"), |
|
|
280 | #endif |
|
|
281 | #ifdef KEYSYM_RESOURCE |
|
|
282 | RINFO ("keysym.sym", "keysym"), |
|
|
283 | #endif |
272 | INFO ("e", "command arg ...", "command to execute") |
284 | INFO ("e", "command arg ...", "command to execute") |
273 | }; |
285 | }; |
274 | |
286 | |
275 | #undef INFO |
287 | #undef INFO |
|
|
288 | #undef RINFO |
276 | #undef STRG |
289 | #undef STRG |
277 | #undef RSTRG |
290 | #undef RSTRG |
278 | #undef SWCH |
291 | #undef SWCH |
279 | #undef BOOL |
292 | #undef BOOL |
280 | |
293 | |
… | |
… | |
397 | switch (type) |
410 | switch (type) |
398 | { |
411 | { |
399 | case 0: /* brief listing */ |
412 | case 0: /* brief listing */ |
400 | rxvt_log (" [-help] [--help]\n"); |
413 | rxvt_log (" [-help] [--help]\n"); |
401 | |
414 | |
402 | for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++) |
415 | for (col = 1, i = 0; i < ecb_array_length (optList); i++) |
403 | if (optList[i].desc != NULL) |
416 | if (optList[i].desc != NULL) |
404 | { |
417 | { |
405 | int len = 0; |
418 | int len = 0; |
406 | |
419 | |
407 | if (optList[i].arg) |
420 | if (optList[i].arg) |
408 | len = strlen (optList[i].arg) + 1; |
421 | len = strlen (optList[i].arg) + 1; |
409 | assert (optList[i].opt != NULL); |
422 | assert (optList[i].opt != NULL); |
410 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
423 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); |
411 | col += len; |
424 | col += len; |
412 | if (col > 79) |
425 | if (col > 79) |
413 | { |
426 | { |
414 | /* assume regular width */ |
427 | /* assume regular width */ |
415 | rxvt_log ("\n"); |
428 | rxvt_log ("\n"); |
… | |
… | |
425 | break; |
438 | break; |
426 | |
439 | |
427 | case 1: /* full command-line listing */ |
440 | case 1: /* full command-line listing */ |
428 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
441 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
429 | |
442 | |
430 | for (i = 0; i < ARRAY_LENGTH(optList); i++) |
443 | for (i = 0; i < ecb_array_length (optList); i++) |
431 | if (optList[i].desc != NULL) |
444 | if (optList[i].desc != NULL) |
432 | { |
445 | { |
433 | assert (optList[i].opt != NULL); |
446 | assert (optList[i].opt != NULL); |
434 | rxvt_log (" %s%s %-*s%s%s\n", |
447 | rxvt_log (" %s%s %-*s%s%s\n", |
435 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
448 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
… | |
… | |
444 | |
457 | |
445 | case 2: /* full resource listing */ |
458 | case 2: /* full resource listing */ |
446 | rxvt_log (" [options] [-e command args]\n\n" |
459 | rxvt_log (" [options] [-e command args]\n\n" |
447 | "where resources (long-options) include:\n"); |
460 | "where resources (long-options) include:\n"); |
448 | |
461 | |
449 | for (i = 0; i < ARRAY_LENGTH(optList); i++) |
462 | for (i = 0; i < ecb_array_length (optList); i++) |
450 | if (optList[i].kw != NULL) |
463 | if (optList[i].kw != NULL) |
451 | rxvt_log (" %s: %*s%s\n", |
464 | rxvt_log (" %s: %*s%s\n", |
452 | optList[i].kw, |
465 | optList[i].kw, |
453 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
466 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
454 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
467 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
455 | #ifdef KEYSYM_RESOURCE |
|
|
456 | rxvt_log (" " "keysym.sym" ": %*s%s\n", |
|
|
457 | (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ |
|
|
458 | "keysym"); |
|
|
459 | #endif |
|
|
460 | rxvt_log ("\n -help to list options"); |
468 | rxvt_log ("\n -help to list options"); |
461 | break; |
469 | break; |
462 | } |
470 | } |
463 | |
471 | |
464 | rxvt_log ("\n\n"); |
472 | rxvt_log ("\n\n"); |
465 | rxvt_exit_failure (); |
473 | rxvt_exit_failure (); |
466 | /* NOTREACHED */ |
|
|
467 | } |
474 | } |
468 | |
475 | |
469 | /*}}} */ |
476 | /*}}} */ |
470 | |
477 | |
471 | /*{{{ get command-line options before getting resources */ |
478 | /*{{{ get command-line options before getting resources */ |
472 | void |
479 | const char ** |
473 | rxvt_term::get_options (int argc, const char *const *argv) |
480 | rxvt_term::get_options (int argc, const char *const *argv) |
474 | { |
481 | { |
475 | int i, bad_option = 0; |
482 | int i, bad_option = 0; |
476 | |
483 | |
477 | for (i = 1; i < argc; i++) |
484 | for (i = 1; i < argc; i++) |
… | |
… | |
508 | |
515 | |
509 | if (!strcmp (opt, "h")) |
516 | if (!strcmp (opt, "h")) |
510 | rxvt_usage (0); |
517 | rxvt_usage (0); |
511 | |
518 | |
512 | /* feature: always try to match long-options */ |
519 | /* feature: always try to match long-options */ |
513 | for (entry = 0; entry < ARRAY_LENGTH(optList); entry++) |
520 | for (entry = 0; entry < ecb_array_length (optList); entry++) |
514 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
521 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
515 | || (!longopt |
522 | || (!longopt |
516 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
523 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
517 | break; |
524 | break; |
518 | |
525 | |
519 | if (entry < ARRAY_LENGTH(optList)) |
526 | if (entry < ecb_array_length (optList) |
|
|
527 | && !optList_isInfo (entry)) |
520 | { |
528 | { |
521 | if (optList_isReverse (entry)) |
529 | if (optList_isReverse (entry)) |
522 | flag = !flag; |
530 | flag = !flag; |
523 | |
531 | |
524 | if (optList_isString (entry)) |
532 | if (optList_isString (entry)) |
525 | { |
533 | { |
526 | /* |
534 | /* |
527 | * special cases are handled in main.c:main () to allow |
535 | * special cases are handled in init_resources () to allow |
528 | * X resources to set these values before we settle for |
536 | * X resources to set these values before we settle for |
529 | * default values |
537 | * default values |
530 | */ |
538 | */ |
531 | |
539 | |
532 | if (optList[entry].doff != -1) |
540 | if (optList[entry].doff != -1) |
… | |
… | |
562 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
570 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
563 | XrmPutLineResource (&option_db, res); |
571 | XrmPutLineResource (&option_db, res); |
564 | } |
572 | } |
565 | } |
573 | } |
566 | #endif |
574 | #endif |
|
|
575 | else if (!strcmp (opt, "e")) |
|
|
576 | { |
|
|
577 | if (i+1 == argc) |
|
|
578 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
579 | |
|
|
580 | return (const char **)argv + i + 1; |
|
|
581 | } |
567 | else |
582 | else |
568 | { |
583 | { |
569 | bad_option = 1; |
584 | bad_option = 1; |
570 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
585 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
571 | } |
586 | } |
572 | } |
587 | } |
573 | |
588 | |
574 | if (bad_option) |
589 | if (bad_option) |
575 | rxvt_usage (0); |
590 | rxvt_usage (0); |
|
|
591 | |
|
|
592 | return 0; |
576 | } |
593 | } |
577 | |
594 | |
578 | /*}}} */ |
595 | /*}}} */ |
579 | |
596 | |
580 | #ifndef NO_RESOURCES |
597 | #ifndef NO_RESOURCES |
… | |
… | |
585 | * Define key from XrmEnumerateDatabase. |
602 | * Define key from XrmEnumerateDatabase. |
586 | * quarks will be something like |
603 | * quarks will be something like |
587 | * "rxvt" "keysym" "0xFF01" |
604 | * "rxvt" "keysym" "0xFF01" |
588 | * value will be a string |
605 | * value will be a string |
589 | */ |
606 | */ |
590 | /* ARGSUSED */ |
607 | static int |
591 | int |
|
|
592 | rxvt_define_key (XrmDatabase *database UNUSED, |
608 | rxvt_define_key (XrmDatabase *database ecb_unused, |
593 | XrmBindingList bindings UNUSED, |
609 | XrmBindingList bindings ecb_unused, |
594 | XrmQuarkList quarks, |
610 | XrmQuarkList quarks, |
595 | XrmRepresentation *type UNUSED, |
611 | XrmRepresentation *type ecb_unused, |
596 | XrmValue *value, |
612 | XrmValue *value, |
597 | XPointer closure UNUSED) |
613 | XPointer closure ecb_unused) |
598 | { |
614 | { |
599 | int last; |
615 | int last; |
600 | |
616 | |
601 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
617 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
602 | ; |
618 | ; |
… | |
… | |
665 | // parse modifiers |
681 | // parse modifiers |
666 | while (str < key) |
682 | while (str < key) |
667 | { |
683 | { |
668 | unsigned int i; |
684 | unsigned int i; |
669 | |
685 | |
670 | for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i) |
686 | for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i) |
671 | { |
687 | { |
672 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
688 | if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) |
673 | { |
689 | { |
674 | state |= keysym_vocabulary[i].value; |
690 | state |= keysym_vocabulary[i].value; |
675 | str += keysym_vocabulary[i].len; |
691 | str += keysym_vocabulary[i].len; |
676 | break; |
692 | break; |
677 | } |
693 | } |
678 | } |
694 | } |
679 | |
695 | |
680 | if (i >= ARRAY_LENGTH(keysym_vocabulary)) |
696 | if (i >= ecb_array_length (keysym_vocabulary)) |
681 | return -1; |
697 | return -1; |
682 | |
698 | |
683 | if (*str == '-') |
699 | if (*str == '-') |
684 | ++str; |
700 | ++str; |
685 | } |
701 | } |
… | |
… | |
692 | sym = strtol (str, &end, 16); |
708 | sym = strtol (str, &end, 16); |
693 | if (*end) |
709 | if (*end) |
694 | return -1; |
710 | return -1; |
695 | } |
711 | } |
696 | |
712 | |
|
|
713 | wchar_t *ws = rxvt_mbstowcs (arg); |
|
|
714 | if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) |
697 | keyboard->register_user_translation (sym, state, arg); |
715 | keyboard->register_user_translation (sym, state, ws); |
|
|
716 | free (ws); |
698 | return 1; |
717 | return 1; |
699 | } |
718 | } |
700 | |
719 | |
701 | # endif /* KEYSYM_RESOURCE */ |
720 | # endif /* KEYSYM_RESOURCE */ |
702 | #endif /* NO_RESOURCES */ |
721 | #endif /* NO_RESOURCES */ |
… | |
… | |
745 | XrmMergeDatabases (option_db, &database); |
764 | XrmMergeDatabases (option_db, &database); |
746 | option_db = NULL; |
765 | option_db = NULL; |
747 | /* |
766 | /* |
748 | * Query resources for options that affect us |
767 | * Query resources for options that affect us |
749 | */ |
768 | */ |
750 | for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++) |
769 | for (int entry = 0; entry < ecb_array_length (optList); entry++) |
751 | { |
770 | { |
752 | int s; |
771 | int s; |
753 | const char *kw = optList[entry].kw; |
772 | const char *kw = optList[entry].kw; |
754 | |
773 | |
755 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
774 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
… | |
… | |
775 | |
794 | |
776 | set_option (optList[entry].index, s); |
795 | set_option (optList[entry].index, s); |
777 | } |
796 | } |
778 | } |
797 | } |
779 | } |
798 | } |
|
|
799 | #endif /* NO_RESOURCES */ |
|
|
800 | } |
780 | |
801 | |
|
|
802 | void |
|
|
803 | rxvt_term::extract_keysym_resources () |
|
|
804 | { |
|
|
805 | #ifndef NO_RESOURCES |
781 | /* |
806 | /* |
782 | * [R5 or later]: enumerate the resource database |
807 | * [R5 or later]: enumerate the resource database |
783 | */ |
808 | */ |
784 | # ifdef KEYSYM_RESOURCE |
809 | # ifdef KEYSYM_RESOURCE |
|
|
810 | XrmDatabase database = XrmGetDatabase (dpy); |
785 | XrmName name_prefix[3]; |
811 | XrmName name_prefix[3]; |
786 | XrmClass class_prefix[3]; |
812 | XrmClass class_prefix[3]; |
787 | |
813 | |
788 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
814 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
789 | name_prefix[1] = XrmStringToName ("keysym"); |
815 | name_prefix[1] = XrmStringToName ("keysym"); |
… | |
… | |
793 | class_prefix[2] = NULLQUARK; |
819 | class_prefix[2] = NULLQUARK; |
794 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
820 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
795 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
821 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
796 | XrmEnumOneLevel, rxvt_define_key, NULL); |
822 | XrmEnumOneLevel, rxvt_define_key, NULL); |
797 | # ifdef RESFALLBACK |
823 | # ifdef RESFALLBACK |
798 | name_prefix[0] = XrmStringToName (RESFALLBACK); |
|
|
799 | name_prefix[1] = XrmStringToName ("keysym"); |
|
|
800 | class_prefix[0] = XrmStringToName (RESFALLBACK); |
824 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
801 | class_prefix[1] = XrmStringToName ("Keysym"); |
|
|
802 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
825 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
803 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
826 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
804 | XrmEnumOneLevel, rxvt_define_key, NULL); |
827 | XrmEnumOneLevel, rxvt_define_key, NULL); |
805 | # endif |
828 | # endif |
806 | # endif |
829 | # endif |