… | |
… | |
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 | |
… | |
… | |
464 | |
465 | |
465 | for (i = 0; i < ecb_array_length (optList); i++) |
466 | for (i = 0; i < ecb_array_length (optList); i++) |
466 | if (optList[i].kw != NULL) |
467 | if (optList[i].kw != NULL) |
467 | rxvt_log (" %s: %*s%s\n", |
468 | rxvt_log (" %s: %*s%s\n", |
468 | optList[i].kw, |
469 | optList[i].kw, |
469 | (INDENT - strlen (optList[i].kw)), "", /* XXX */ |
470 | (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */ |
470 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
471 | (optList_isBool (i) ? "boolean" : optList[i].arg)); |
471 | |
472 | |
472 | #if ENABLE_PERL |
473 | #if ENABLE_PERL |
473 | rxvt_perl.init (this); |
474 | rxvt_perl.init (this); |
474 | rxvt_perl.usage (this, 2); |
475 | rxvt_perl.usage (this, 2); |
… | |
… | |
546 | * default values |
547 | * default values |
547 | */ |
548 | */ |
548 | |
549 | |
549 | if (optList[entry].doff != -1) |
550 | if (optList[entry].doff != -1) |
550 | { |
551 | { |
551 | if (flag && i+1 == argc) |
552 | if (flag && i + 1 == argc) |
552 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
553 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
553 | |
554 | |
554 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
555 | rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; |
555 | } |
556 | } |
556 | } |
557 | } |
… | |
… | |
564 | } |
565 | } |
565 | } |
566 | } |
566 | #ifndef NO_RESOURCES |
567 | #ifndef NO_RESOURCES |
567 | else if (!strcmp (opt, "xrm")) |
568 | else if (!strcmp (opt, "xrm")) |
568 | { |
569 | { |
569 | if (i+1 < argc) |
570 | if (i + 1 < argc) |
570 | XrmPutLineResource (&option_db, argv[++i]); |
571 | XrmPutLineResource (&option_db, argv[++i]); |
571 | } |
572 | } |
572 | #endif |
573 | #endif |
573 | #ifdef KEYSYM_RESOURCE |
574 | #ifdef KEYSYM_RESOURCE |
574 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
575 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
575 | { |
576 | { |
576 | if (i+1 < argc) |
577 | if (i + 1 < argc) |
577 | { |
578 | { |
578 | 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); |
579 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
580 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
580 | XrmPutLineResource (&option_db, res); |
581 | XrmPutLineResource (&option_db, res); |
581 | } |
582 | } |
582 | } |
583 | } |
583 | #endif |
584 | #endif |
584 | else if (!strcmp (opt, "e")) |
585 | else if (!strcmp (opt, "e")) |
585 | { |
586 | { |
586 | if (i+1 == argc) |
587 | if (i + 1 < argc) |
587 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
588 | |
|
|
589 | 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; |
590 | } |
592 | } |
591 | else |
593 | else |
592 | { |
594 | { |
593 | #if ENABLE_PERL |
595 | #if ENABLE_PERL |
594 | rxvt_perl.init (this); |
596 | rxvt_perl.init (this); |
595 | |
597 | |
596 | if (int flags = rxvt_perl.resource (this, opt, true, longopt, flag, argv [i + 1])) |
598 | if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1])) |
597 | { |
599 | { |
598 | if ((!flags & rxvt_perl.RESOURCE_BOOLEAN)) |
600 | if (flags & rxvt_perl.RESOURCE_ARG) |
599 | { |
601 | { |
600 | if (flag && i + 1 == argc) |
602 | if (i + 1 == argc) |
|
|
603 | { |
601 | rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); |
604 | rxvt_warn ("option '%s' requires an argument.\n", argv [i]); |
602 | |
605 | bad_option = 1; |
|
|
606 | } |
|
|
607 | else |
603 | ++i; |
608 | ++i; |
604 | } |
609 | } |
605 | } |
610 | } |
606 | else |
611 | else |
607 | #endif |
612 | #endif |
608 | { |
613 | { |
|
|
614 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
609 | bad_option = 1; |
615 | bad_option = 1; |
610 | rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); |
|
|
611 | } |
616 | } |
612 | } |
617 | } |
613 | } |
618 | } |
614 | |
619 | |
615 | if (bad_option) |
620 | if (bad_option) |
… | |
… | |
827 | #if !defined NO_RESOURCES && defined KEYSYM_RESOURCE |
832 | #if !defined NO_RESOURCES && defined KEYSYM_RESOURCE |
828 | find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key); |
833 | find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key); |
829 | #endif |
834 | #endif |
830 | } |
835 | } |
831 | |
836 | |
832 | #if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE) |
837 | #if !defined NO_RESOURCES && defined KEYSYM_RESOURCE |
833 | void |
838 | void |
834 | rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode, |
839 | rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode, |
835 | Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer)) |
840 | Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer)) |
836 | { |
841 | { |
837 | /* |
842 | /* |