… | |
… | |
195 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
195 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
196 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
196 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
197 | #if BG_IMAGE_FROM_FILE |
197 | #if BG_IMAGE_FROM_FILE |
198 | RSTRG (Rs_path, "path", "search path"), |
198 | RSTRG (Rs_path, "path", "search path"), |
199 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
199 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
|
|
200 | #endif |
200 | # if ENABLE_EWMH |
201 | #if ENABLE_EWMH |
201 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
202 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
202 | # endif |
|
|
203 | #endif |
203 | #endif |
204 | /* fonts: command-line option = resource name */ |
204 | /* fonts: command-line option = resource name */ |
205 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
205 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
206 | #if ENABLE_STYLES |
206 | #if ENABLE_STYLES |
207 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
207 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
… | |
… | |
222 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
222 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
223 | #if ENABLE_XEMBED |
223 | #if ENABLE_XEMBED |
224 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
224 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
225 | #endif |
225 | #endif |
226 | #if XFT |
226 | #if XFT |
|
|
227 | BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), |
|
|
228 | #endif |
|
|
229 | #if ENABLE_FRILLS |
227 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
230 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
228 | BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), |
231 | STRG (Rs_visual, "visual", "visual", "number", "visual id to request"), |
229 | #endif |
|
|
230 | #if ENABLE_FRILLS |
|
|
231 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
232 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
232 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
233 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
233 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
234 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
234 | BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), |
235 | BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), |
235 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
236 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
… | |
… | |
384 | #if defined(XTERM_SCROLLBAR) |
385 | #if defined(XTERM_SCROLLBAR) |
385 | "+xterm" |
386 | "+xterm" |
386 | #endif |
387 | #endif |
387 | "\nUsage: "; /* Usage */ |
388 | "\nUsage: "; /* Usage */ |
388 | |
389 | |
389 | #define INDENT 18 |
390 | #define INDENT 28 |
390 | |
391 | |
391 | const char rxvt_term::resval_undef [] = "<undef>"; |
392 | const char rxvt_term::resval_undef [] = "<undef>"; |
392 | const char rxvt_term::resval_on [] = "on"; |
393 | const char rxvt_term::resval_on [] = "on"; |
393 | const char rxvt_term::resval_off [] = "off"; |
394 | const char rxvt_term::resval_off [] = "off"; |
394 | |
395 | |
395 | /*{{{ usage: */ |
396 | /*{{{ usage: */ |
396 | /*----------------------------------------------------------------------*/ |
397 | /*----------------------------------------------------------------------*/ |
397 | static void |
398 | void |
398 | rxvt_usage (int type) |
399 | rxvt_term::rxvt_usage (int type) |
399 | { |
400 | { |
400 | unsigned int i, col; |
401 | unsigned int i, col; |
401 | |
402 | |
402 | rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); |
403 | rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); |
403 | |
404 | |
… | |
… | |
411 | { |
412 | { |
412 | int len = 0; |
413 | int len = 0; |
413 | |
414 | |
414 | if (optList[i].arg) |
415 | if (optList[i].arg) |
415 | len = strlen (optList[i].arg) + 1; |
416 | len = strlen (optList[i].arg) + 1; |
|
|
417 | |
416 | assert (optList[i].opt != NULL); |
418 | assert (optList[i].opt != NULL); |
417 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); |
419 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); |
418 | col += len; |
420 | col += len; |
|
|
421 | |
419 | if (col > 79) |
422 | if (col > 79) |
420 | { |
423 | { |
421 | /* assume regular width */ |
424 | /* assume regular width */ |
422 | rxvt_log ("\n"); |
425 | rxvt_log ("\n"); |
423 | col = 1 + len; |
426 | col = 1 + len; |
424 | } |
427 | } |
425 | |
428 | |
426 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
429 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
|
|
430 | |
427 | if (optList[i].arg) |
431 | if (optList[i].arg) |
428 | rxvt_log (" %s]", optList[i].arg); |
432 | rxvt_log (" %s]", optList[i].arg); |
429 | else |
433 | else |
430 | rxvt_log ("]"); |
434 | rxvt_log ("]"); |
431 | } |
435 | } |
… | |
… | |
444 | + (optList_isBool (i) ? 0 : 2)), |
448 | + (optList_isBool (i) ? 0 : 2)), |
445 | (optList[i].arg ? optList[i].arg : ""), |
449 | (optList[i].arg ? optList[i].arg : ""), |
446 | (optList_isBool (i) ? "turn on/off " : ""), |
450 | (optList_isBool (i) ? "turn on/off " : ""), |
447 | optList[i].desc); |
451 | optList[i].desc); |
448 | } |
452 | } |
|
|
453 | |
|
|
454 | #if ENABLE_PERL |
|
|
455 | rxvt_perl.init (this); |
|
|
456 | rxvt_perl.usage (this, 1); |
|
|
457 | #endif |
|
|
458 | |
449 | rxvt_log ("\n --help to list long-options"); |
459 | rxvt_log ("\n --help to list long-options"); |
450 | break; |
460 | break; |
451 | |
461 | |
452 | case 2: /* full resource listing */ |
462 | case 2: /* full resource listing */ |
453 | rxvt_log (" [options] [-e command args]\n\n" |
463 | rxvt_log (" [options] [-e command args]\n\n" |
… | |
… | |
455 | |
465 | |
456 | for (i = 0; i < ecb_array_length (optList); i++) |
466 | for (i = 0; i < ecb_array_length (optList); i++) |
457 | if (optList[i].kw != NULL) |
467 | if (optList[i].kw != NULL) |
458 | rxvt_log (" %s: %*s%s\n", |
468 | rxvt_log (" %s: %*s%s\n", |
459 | optList[i].kw, |
469 | optList[i].kw, |
460 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
470 | (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */ |
461 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
471 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
|
|
472 | |
|
|
473 | #if ENABLE_PERL |
|
|
474 | rxvt_perl.init (this); |
|
|
475 | rxvt_perl.usage (this, 2); |
|
|
476 | #endif |
|
|
477 | |
462 | rxvt_log ("\n -help to list options"); |
478 | rxvt_log ("\n -help to list options"); |
463 | break; |
479 | break; |
464 | } |
480 | } |
465 | |
481 | |
466 | rxvt_log ("\n\n"); |
482 | rxvt_log ("\n\n"); |
… | |
… | |
531 | * default values |
547 | * default values |
532 | */ |
548 | */ |
533 | |
549 | |
534 | if (optList[entry].doff != -1) |
550 | if (optList[entry].doff != -1) |
535 | { |
551 | { |
536 | if (flag && i+1 == argc) |
552 | if (flag && i + 1 == argc) |
537 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
553 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
538 | |
554 | |
539 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
555 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
540 | } |
556 | } |
541 | } |
557 | } |
… | |
… | |
549 | } |
565 | } |
550 | } |
566 | } |
551 | #ifndef NO_RESOURCES |
567 | #ifndef NO_RESOURCES |
552 | else if (!strcmp (opt, "xrm")) |
568 | else if (!strcmp (opt, "xrm")) |
553 | { |
569 | { |
554 | if (i+1 < argc) |
570 | if (i + 1 < argc) |
555 | XrmPutLineResource (&option_db, argv[++i]); |
571 | XrmPutLineResource (&option_db, argv[++i]); |
556 | } |
572 | } |
557 | #endif |
573 | #endif |
558 | #ifdef KEYSYM_RESOURCE |
574 | #ifdef KEYSYM_RESOURCE |
559 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
575 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
560 | { |
576 | { |
561 | if (i+1 < argc) |
577 | if (i + 1 < argc) |
562 | { |
578 | { |
563 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
579 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
564 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
580 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
565 | XrmPutLineResource (&option_db, res); |
581 | XrmPutLineResource (&option_db, res); |
566 | } |
582 | } |
567 | } |
583 | } |
568 | #endif |
584 | #endif |
569 | else if (!strcmp (opt, "e")) |
585 | else if (!strcmp (opt, "e")) |
570 | { |
586 | { |
571 | if (i+1 == argc) |
587 | if (i + 1 < argc) |
572 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
573 | |
|
|
574 | return (const char **)argv + i + 1; |
588 | return (const char **)argv + i + 1; |
|
|
589 | |
|
|
590 | rxvt_warn ("option '-e' requires an argument, aborting.\n"); |
|
|
591 | bad_option = 1; |
575 | } |
592 | } |
576 | else |
593 | else |
577 | { |
594 | { |
|
|
595 | #if ENABLE_PERL |
|
|
596 | rxvt_perl.init (this); |
|
|
597 | |
|
|
598 | if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1])) |
|
|
599 | { |
|
|
600 | if (flags & rxvt_perl.RESOURCE_ARG) |
|
|
601 | { |
|
|
602 | if (i + 1 == argc) |
|
|
603 | { |
|
|
604 | rxvt_warn ("option '%s' requires an argument.\n", argv [i]); |
578 | bad_option = 1; |
605 | bad_option = 1; |
|
|
606 | } |
|
|
607 | else |
|
|
608 | ++i; |
|
|
609 | } |
|
|
610 | } |
|
|
611 | else |
|
|
612 | #endif |
|
|
613 | { |
579 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
614 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
|
|
615 | bad_option = 1; |
|
|
616 | } |
580 | } |
617 | } |
581 | } |
618 | } |
582 | |
619 | |
583 | if (bad_option) |
620 | if (bad_option) |
584 | rxvt_usage (0); |
621 | rxvt_usage (0); |
… | |
… | |
602 | rxvt_define_key (XrmDatabase *database ecb_unused, |
639 | rxvt_define_key (XrmDatabase *database ecb_unused, |
603 | XrmBindingList bindings ecb_unused, |
640 | XrmBindingList bindings ecb_unused, |
604 | XrmQuarkList quarks, |
641 | XrmQuarkList quarks, |
605 | XrmRepresentation *type ecb_unused, |
642 | XrmRepresentation *type ecb_unused, |
606 | XrmValue *value, |
643 | XrmValue *value, |
607 | XPointer closure ecb_unused) |
644 | XPointer closure) |
608 | { |
645 | { |
|
|
646 | rxvt_term *term = (rxvt_term *)closure; |
609 | int last; |
647 | int last; |
610 | |
648 | |
611 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
649 | for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ |
612 | ; |
650 | ; |
613 | |
651 | |
614 | last--; |
652 | last--; |
615 | GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO |
653 | term->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr); |
616 | return False; |
654 | return False; |
617 | } |
655 | } |
618 | |
656 | |
619 | /* |
657 | /* |
620 | * look for something like this (XK_Delete) |
658 | * look for something like this (XK_Delete) |
… | |
… | |
705 | } |
743 | } |
706 | |
744 | |
707 | wchar_t *ws = rxvt_mbstowcs (arg); |
745 | 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))) |
746 | if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) |
709 | keyboard->register_user_translation (sym, state, ws); |
747 | keyboard->register_user_translation (sym, state, ws); |
|
|
748 | |
710 | free (ws); |
749 | free (ws); |
711 | return 1; |
750 | return 1; |
712 | } |
751 | } |
713 | |
752 | |
714 | # endif /* KEYSYM_RESOURCE */ |
753 | # endif /* KEYSYM_RESOURCE */ |
… | |
… | |
760 | /* |
799 | /* |
761 | * Query resources for options that affect us |
800 | * Query resources for options that affect us |
762 | */ |
801 | */ |
763 | for (int entry = 0; entry < ecb_array_length (optList); entry++) |
802 | for (int entry = 0; entry < ecb_array_length (optList); entry++) |
764 | { |
803 | { |
|
|
804 | int s; |
765 | const char *kw = optList[entry].kw; |
805 | const char *kw = optList[entry].kw; |
766 | |
806 | |
767 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
807 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
768 | continue; // previously set |
808 | continue; // previously set |
769 | |
809 | |
… | |
… | |
775 | allocated.push_back ((void *)p); |
815 | allocated.push_back ((void *)p); |
776 | rs[optList[entry].doff] = p; |
816 | rs[optList[entry].doff] = p; |
777 | |
817 | |
778 | if (optList_isBool (entry)) |
818 | if (optList_isBool (entry)) |
779 | { |
819 | { |
780 | bool s = parse_bool_resource (p); |
820 | s = strcasecmp (p, "TRUE") == 0 |
|
|
821 | || strcasecmp (p, "YES") == 0 |
|
|
822 | || strcasecmp (p, "ON") == 0 |
|
|
823 | || strcasecmp (p, "1") == 0; |
781 | |
824 | |
782 | if (optList_isReverse (entry)) |
825 | if (optList_isReverse (entry)) |
783 | s = !s; |
826 | s = !s; |
784 | |
827 | |
785 | set_option (optList[entry].index, s); |
828 | set_option (optList[entry].index, s); |
… | |
… | |
790 | } |
833 | } |
791 | |
834 | |
792 | void |
835 | void |
793 | rxvt_term::extract_keysym_resources () |
836 | rxvt_term::extract_keysym_resources () |
794 | { |
837 | { |
795 | #if !defined NO_RESOURCES && defined KEYSYM_RESOURCE |
838 | #ifndef NO_RESOURCES |
796 | find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key); |
|
|
797 | #endif |
|
|
798 | } |
|
|
799 | |
|
|
800 | #if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE) |
|
|
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 | { |
|
|
805 | /* |
839 | /* |
806 | * [R5 or later]: enumerate the resource database |
840 | * [R5 or later]: enumerate the resource database |
807 | */ |
841 | */ |
|
|
842 | # ifdef KEYSYM_RESOURCE |
808 | XrmDatabase database = XrmGetDatabase (dpy); |
843 | XrmDatabase database = XrmGetDatabase (dpy); |
809 | XrmName name_prefix[3]; |
844 | XrmName name_prefix[3]; |
810 | XrmClass class_prefix[3]; |
845 | XrmClass class_prefix[3]; |
811 | |
846 | |
812 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
847 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
813 | name_prefix[1] = XrmStringToName (n_prefix); |
848 | name_prefix[1] = XrmStringToName ("keysym"); |
814 | name_prefix[2] = NULLQUARK; |
849 | name_prefix[2] = NULLQUARK; |
815 | class_prefix[0] = XrmStringToName (RESCLASS); |
850 | class_prefix[0] = XrmStringToName (RESCLASS); |
816 | class_prefix[1] = XrmStringToName (c_prefix); |
851 | class_prefix[1] = XrmStringToName ("Keysym"); |
817 | class_prefix[2] = NULLQUARK; |
852 | class_prefix[2] = NULLQUARK; |
818 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
853 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
819 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
854 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
820 | mode, proc, NULL); |
855 | XrmEnumOneLevel, rxvt_define_key, (XPointer)this); |
821 | # ifdef RESFALLBACK |
856 | # ifdef RESFALLBACK |
822 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
857 | name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); |
823 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
858 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
824 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
859 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
825 | mode, proc, NULL); |
860 | XrmEnumOneLevel, rxvt_define_key, (XPointer)this); |
826 | # endif |
861 | # endif |
|
|
862 | # endif |
|
|
863 | |
|
|
864 | #endif /* NO_RESOURCES */ |
827 | } |
865 | } |
828 | #endif |
|
|
829 | |
866 | |
830 | /*----------------------- end-of-file (C source) -----------------------*/ |
867 | /*----------------------- end-of-file (C source) -----------------------*/ |