… | |
… | |
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 */ |
… | |
… | |
264 | #endif |
270 | #endif |
265 | #if ISO_14755 |
271 | #if ISO_14755 |
266 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
272 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
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 | #ifndef NO_RESOURCES |
270 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
276 | RINFO ("xrm", "string"), |
|
|
277 | #endif |
|
|
278 | #ifdef KEYSYM_RESOURCE |
|
|
279 | RINFO ("keysym.sym", "keysym"), |
271 | #endif |
280 | #endif |
272 | INFO ("e", "command arg ...", "command to execute") |
281 | INFO ("e", "command arg ...", "command to execute") |
273 | }; |
282 | }; |
274 | |
283 | |
275 | #undef INFO |
284 | #undef INFO |
|
|
285 | #undef RINFO |
276 | #undef STRG |
286 | #undef STRG |
277 | #undef RSTRG |
287 | #undef RSTRG |
278 | #undef SWCH |
288 | #undef SWCH |
279 | #undef BOOL |
289 | #undef BOOL |
280 | |
290 | |
… | |
… | |
322 | "fade," |
332 | "fade," |
323 | #endif |
333 | #endif |
324 | #if defined(ENABLE_TRANSPARENCY) |
334 | #if defined(ENABLE_TRANSPARENCY) |
325 | "transparent," |
335 | "transparent," |
326 | "tint," |
336 | "tint," |
327 | #endif |
|
|
328 | #if HAVE_AFTERIMAGE |
|
|
329 | "afterimage," |
|
|
330 | #endif |
337 | #endif |
331 | #if HAVE_PIXBUF |
338 | #if HAVE_PIXBUF |
332 | "pixbuf," |
339 | "pixbuf," |
333 | #endif |
340 | #endif |
334 | #if defined(USE_XIM) |
341 | #if defined(USE_XIM) |
… | |
… | |
450 | if (optList[i].kw != NULL) |
457 | if (optList[i].kw != NULL) |
451 | rxvt_log (" %s: %*s%s\n", |
458 | rxvt_log (" %s: %*s%s\n", |
452 | optList[i].kw, |
459 | optList[i].kw, |
453 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
460 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
454 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
461 | (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"); |
462 | rxvt_log ("\n -help to list options"); |
461 | break; |
463 | break; |
462 | } |
464 | } |
463 | |
465 | |
464 | rxvt_log ("\n\n"); |
466 | rxvt_log ("\n\n"); |
… | |
… | |
466 | } |
468 | } |
467 | |
469 | |
468 | /*}}} */ |
470 | /*}}} */ |
469 | |
471 | |
470 | /*{{{ get command-line options before getting resources */ |
472 | /*{{{ get command-line options before getting resources */ |
471 | void |
473 | const char ** |
472 | rxvt_term::get_options (int argc, const char *const *argv) |
474 | rxvt_term::get_options (int argc, const char *const *argv) |
473 | { |
475 | { |
474 | int i, bad_option = 0; |
476 | int i, bad_option = 0; |
475 | |
477 | |
476 | for (i = 1; i < argc; i++) |
478 | for (i = 1; i < argc; i++) |
… | |
… | |
513 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
515 | if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) |
514 | || (!longopt |
516 | || (!longopt |
515 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
517 | && optList[entry].opt && !strcmp (opt, optList[entry].opt))) |
516 | break; |
518 | break; |
517 | |
519 | |
518 | if (entry < ecb_array_length (optList)) |
520 | if (entry < ecb_array_length (optList) |
|
|
521 | && !optList_isInfo (entry)) |
519 | { |
522 | { |
520 | if (optList_isReverse (entry)) |
523 | if (optList_isReverse (entry)) |
521 | flag = !flag; |
524 | flag = !flag; |
522 | |
525 | |
523 | if (optList_isString (entry)) |
526 | if (optList_isString (entry)) |
… | |
… | |
561 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
564 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
562 | XrmPutLineResource (&option_db, res); |
565 | XrmPutLineResource (&option_db, res); |
563 | } |
566 | } |
564 | } |
567 | } |
565 | #endif |
568 | #endif |
|
|
569 | else if (!strcmp (opt, "e")) |
|
|
570 | { |
|
|
571 | if (i+1 == argc) |
|
|
572 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
573 | |
|
|
574 | return (const char **)argv + i + 1; |
|
|
575 | } |
566 | else |
576 | else |
567 | { |
577 | { |
568 | bad_option = 1; |
578 | bad_option = 1; |
569 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
579 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
570 | } |
580 | } |
571 | } |
581 | } |
572 | |
582 | |
573 | if (bad_option) |
583 | if (bad_option) |
574 | rxvt_usage (0); |
584 | rxvt_usage (0); |
|
|
585 | |
|
|
586 | return 0; |
575 | } |
587 | } |
576 | |
588 | |
577 | /*}}} */ |
589 | /*}}} */ |
578 | |
590 | |
579 | #ifndef NO_RESOURCES |
591 | #ifndef NO_RESOURCES |
… | |
… | |
690 | sym = strtol (str, &end, 16); |
702 | sym = strtol (str, &end, 16); |
691 | if (*end) |
703 | if (*end) |
692 | return -1; |
704 | return -1; |
693 | } |
705 | } |
694 | |
706 | |
|
|
707 | wchar_t *ws = rxvt_mbstowcs (arg); |
|
|
708 | 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); |
709 | keyboard->register_user_translation (sym, state, ws); |
|
|
710 | free (ws); |
696 | return 1; |
711 | return 1; |
697 | } |
712 | } |
698 | |
713 | |
699 | # endif /* KEYSYM_RESOURCE */ |
714 | # endif /* KEYSYM_RESOURCE */ |
700 | #endif /* NO_RESOURCES */ |
715 | #endif /* NO_RESOURCES */ |
… | |
… | |
745 | /* |
760 | /* |
746 | * Query resources for options that affect us |
761 | * Query resources for options that affect us |
747 | */ |
762 | */ |
748 | for (int entry = 0; entry < ecb_array_length (optList); entry++) |
763 | for (int entry = 0; entry < ecb_array_length (optList); entry++) |
749 | { |
764 | { |
750 | int s; |
|
|
751 | const char *kw = optList[entry].kw; |
765 | const char *kw = optList[entry].kw; |
752 | |
766 | |
753 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
767 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
754 | continue; // previously set |
768 | continue; // previously set |
755 | |
769 | |
… | |
… | |
761 | allocated.push_back ((void *)p); |
775 | allocated.push_back ((void *)p); |
762 | rs[optList[entry].doff] = p; |
776 | rs[optList[entry].doff] = p; |
763 | |
777 | |
764 | if (optList_isBool (entry)) |
778 | if (optList_isBool (entry)) |
765 | { |
779 | { |
766 | s = strcasecmp (p, "TRUE") == 0 |
780 | bool s = parse_bool_resource (p); |
767 | || strcasecmp (p, "YES") == 0 |
|
|
768 | || strcasecmp (p, "ON") == 0 |
|
|
769 | || strcasecmp (p, "1") == 0; |
|
|
770 | |
781 | |
771 | if (optList_isReverse (entry)) |
782 | if (optList_isReverse (entry)) |
772 | s = !s; |
783 | s = !s; |
773 | |
784 | |
774 | set_option (optList[entry].index, s); |
785 | set_option (optList[entry].index, s); |
775 | } |
786 | } |
776 | } |
787 | } |
777 | } |
788 | } |
|
|
789 | #endif /* NO_RESOURCES */ |
|
|
790 | } |
778 | |
791 | |
|
|
792 | void |
|
|
793 | rxvt_term::extract_keysym_resources () |
|
|
794 | { |
|
|
795 | #if !defined NO_RESOURCES && defined KEYSYM_RESOURCE |
|
|
796 | find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key); |
|
|
797 | #endif |
|
|
798 | } |
|
|
799 | |
|
|
800 | #if !defined NO_RESOURCES && defined KEYSYM_RESOURCE |
|
|
801 | void |
|
|
802 | rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode, |
|
|
803 | Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer)) |
|
|
804 | { |
779 | /* |
805 | /* |
780 | * [R5 or later]: enumerate the resource database |
806 | * [R5 or later]: enumerate the resource database |
781 | */ |
807 | */ |
782 | # ifdef KEYSYM_RESOURCE |
808 | XrmDatabase database = XrmGetDatabase (dpy); |
783 | XrmName name_prefix[3]; |
809 | XrmName name_prefix[3]; |
784 | XrmClass class_prefix[3]; |
810 | XrmClass class_prefix[3]; |
785 | |
811 | |
786 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
812 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
787 | name_prefix[1] = XrmStringToName ("keysym"); |
813 | name_prefix[1] = XrmStringToName (n_prefix); |
788 | name_prefix[2] = NULLQUARK; |
814 | name_prefix[2] = NULLQUARK; |
789 | class_prefix[0] = XrmStringToName (RESCLASS); |
815 | class_prefix[0] = XrmStringToName (RESCLASS); |
790 | class_prefix[1] = XrmStringToName ("Keysym"); |
816 | class_prefix[1] = XrmStringToName (c_prefix); |
791 | class_prefix[2] = NULLQUARK; |
817 | class_prefix[2] = NULLQUARK; |
792 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
818 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
793 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
819 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
794 | XrmEnumOneLevel, rxvt_define_key, NULL); |
820 | mode, proc, NULL); |
795 | # ifdef RESFALLBACK |
821 | # ifdef RESFALLBACK |
796 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
822 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
797 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
823 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
798 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
824 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
799 | XrmEnumOneLevel, rxvt_define_key, NULL); |
825 | mode, proc, NULL); |
800 | # endif |
826 | # endif |
801 | # endif |
|
|
802 | |
|
|
803 | #endif /* NO_RESOURCES */ |
|
|
804 | } |
827 | } |
|
|
828 | #endif |
805 | |
829 | |
806 | /*----------------------- end-of-file (C source) -----------------------*/ |
830 | /*----------------------- end-of-file (C source) -----------------------*/ |