… | |
… | |
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 | |
… | |
… | |
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"); |
… | |
… | |
466 | } |
474 | } |
467 | |
475 | |
468 | /*}}} */ |
476 | /*}}} */ |
469 | |
477 | |
470 | /*{{{ get command-line options before getting resources */ |
478 | /*{{{ get command-line options before getting resources */ |
471 | void |
479 | const char ** |
472 | rxvt_term::get_options (int argc, const char *const *argv) |
480 | rxvt_term::get_options (int argc, const char *const *argv) |
473 | { |
481 | { |
474 | int i, bad_option = 0; |
482 | int i, bad_option = 0; |
475 | |
483 | |
476 | for (i = 1; i < argc; i++) |
484 | for (i = 1; i < argc; i++) |
… | |
… | |
513 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
521 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
514 | || (!longopt |
522 | || (!longopt |
515 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
523 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
516 | break; |
524 | break; |
517 | |
525 | |
518 | if (entry < ecb_array_length (optList)) |
526 | if (entry < ecb_array_length (optList) |
|
|
527 | && !optList_isInfo (entry)) |
519 | { |
528 | { |
520 | if (optList_isReverse (entry)) |
529 | if (optList_isReverse (entry)) |
521 | flag = !flag; |
530 | flag = !flag; |
522 | |
531 | |
523 | if (optList_isString (entry)) |
532 | if (optList_isString (entry)) |
… | |
… | |
561 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
570 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
562 | XrmPutLineResource (&option_db, res); |
571 | XrmPutLineResource (&option_db, res); |
563 | } |
572 | } |
564 | } |
573 | } |
565 | #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 | } |
566 | else |
582 | else |
567 | { |
583 | { |
568 | bad_option = 1; |
584 | bad_option = 1; |
569 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
585 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
570 | } |
586 | } |
571 | } |
587 | } |
572 | |
588 | |
573 | if (bad_option) |
589 | if (bad_option) |
574 | rxvt_usage (0); |
590 | rxvt_usage (0); |
|
|
591 | |
|
|
592 | return 0; |
575 | } |
593 | } |
576 | |
594 | |
577 | /*}}} */ |
595 | /*}}} */ |
578 | |
596 | |
579 | #ifndef NO_RESOURCES |
597 | #ifndef NO_RESOURCES |
… | |
… | |
691 | if (*end) |
709 | if (*end) |
692 | return -1; |
710 | return -1; |
693 | } |
711 | } |
694 | |
712 | |
695 | wchar_t *ws = rxvt_mbstowcs (arg); |
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))) |
696 | keyboard->register_user_translation (sym, state, ws); |
715 | keyboard->register_user_translation (sym, state, ws); |
697 | free (ws); |
716 | free (ws); |
698 | return 1; |
717 | return 1; |
699 | } |
718 | } |
700 | |
719 | |
701 | # endif /* KEYSYM_RESOURCE */ |
720 | # endif /* KEYSYM_RESOURCE */ |
… | |
… | |
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"); |