ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.166 by root, Tue Jun 5 19:32:29 2012 UTC vs.
Revision 1.171 by sf-exg, Fri Jun 15 14:34:34 2012 UTC

… …
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
391const char rxvt_term::resval_undef [] = "<undef>"; 392const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on"; 393const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off"; 394const char rxvt_term::resval_off [] = "off";
394 395
… …
447 + (optList_isBool (i) ? 0 : 2)), 448 + (optList_isBool (i) ? 0 : 2)),
448 (optList[i].arg ? optList[i].arg : ""), 449 (optList[i].arg ? optList[i].arg : ""),
449 (optList_isBool (i) ? "turn on/off " : ""), 450 (optList_isBool (i) ? "turn on/off " : ""),
450 optList[i].desc); 451 optList[i].desc);
451 } 452 }
453
454#if ENABLE_PERL
455 rxvt_perl.init (this);
456 rxvt_perl.usage (this, 1);
457#endif
458
452 rxvt_log ("\n --help to list long-options"); 459 rxvt_log ("\n --help to list long-options");
453 break; 460 break;
454 461
455 case 2: /* full resource listing */ 462 case 2: /* full resource listing */
456 rxvt_log (" [options] [-e command args]\n\n" 463 rxvt_log (" [options] [-e command args]\n\n"
… …
458 465
459 for (i = 0; i < ecb_array_length (optList); i++) 466 for (i = 0; i < ecb_array_length (optList); i++)
460 if (optList[i].kw != NULL) 467 if (optList[i].kw != NULL)
461 rxvt_log (" %s: %*s%s\n", 468 rxvt_log (" %s: %*s%s\n",
462 optList[i].kw, 469 optList[i].kw,
463 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 470 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
464 (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
465 rxvt_log ("\n -help to list options"); 478 rxvt_log ("\n -help to list options");
466 break; 479 break;
467 } 480 }
468
469#if ENABLE_PERL
470 if (type) // do not initialise perl for type == 0, as perl does not have "short" options
471 {
472 rxvt_perl.init (this);
473 rxvt_perl.usage (type);
474 }
475#endif
476 481
477 rxvt_log ("\n\n"); 482 rxvt_log ("\n\n");
478 rxvt_exit_failure (); 483 rxvt_exit_failure ();
479} 484}
480 485
… …
542 * default values 547 * default values
543 */ 548 */
544 549
545 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
546 { 551 {
547 if (flag && i+1 == argc) 552 if (flag && i + 1 == argc)
548 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
549 554
550 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
551 } 556 }
552 } 557 }
… …
560 } 565 }
561 } 566 }
562#ifndef NO_RESOURCES 567#ifndef NO_RESOURCES
563 else if (!strcmp (opt, "xrm")) 568 else if (!strcmp (opt, "xrm"))
564 { 569 {
565 if (i+1 < argc) 570 if (i + 1 < argc)
566 XrmPutLineResource (&option_db, argv[++i]); 571 XrmPutLineResource (&option_db, argv[++i]);
567 } 572 }
568#endif 573#endif
569#ifdef KEYSYM_RESOURCE 574#ifdef KEYSYM_RESOURCE
570 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
571 { 576 {
572 if (i+1 < argc) 577 if (i + 1 < argc)
573 { 578 {
574 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);
575 sprintf (res, "*.%s: %s\n", opt, argv[i]); 580 sprintf (res, "*.%s: %s\n", opt, argv[i]);
576 XrmPutLineResource (&option_db, res); 581 XrmPutLineResource (&option_db, res);
577 } 582 }
578 } 583 }
579#endif 584#endif
580 else if (!strcmp (opt, "e")) 585 else if (!strcmp (opt, "e"))
581 { 586 {
582 if (i+1 == argc) 587 if (i + 1 < argc)
583 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
584
585 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;
586 } 592 }
587 else 593 else
588 { 594 {
589#if ENABLE_PERL 595#if ENABLE_PERL
590 rxvt_perl.init (this); 596 rxvt_perl.init (this);
591 597
592 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]))
593 { 599 {
594 if ((!flags & rxvt_perl.RESOURCE_BOOLEAN)) 600 if (flags & rxvt_perl.RESOURCE_ARG)
595 { 601 {
596 if (flag && i + 1 == argc) 602 if (i + 1 == argc)
603 {
597 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 604 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
598 605 bad_option = 1;
606 }
607 else
599 ++i; 608 ++i;
600 } 609 }
601 } 610 }
602 else 611 else
603#endif 612#endif
604 { 613 {
614 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
605 bad_option = 1; 615 bad_option = 1;
606 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
607 } 616 }
608 } 617 }
609 } 618 }
610 619
611 if (bad_option) 620 if (bad_option)
… …
788 /* 797 /*
789 * Query resources for options that affect us 798 * Query resources for options that affect us
790 */ 799 */
791 for (int entry = 0; entry < ecb_array_length (optList); entry++) 800 for (int entry = 0; entry < ecb_array_length (optList); entry++)
792 { 801 {
802 int s;
793 const char *kw = optList[entry].kw; 803 const char *kw = optList[entry].kw;
794 804
795 if (kw == NULL || rs[optList[entry].doff] != NULL) 805 if (kw == NULL || rs[optList[entry].doff] != NULL)
796 continue; // previously set 806 continue; // previously set
797 807
… …
803 allocated.push_back ((void *)p); 813 allocated.push_back ((void *)p);
804 rs[optList[entry].doff] = p; 814 rs[optList[entry].doff] = p;
805 815
806 if (optList_isBool (entry)) 816 if (optList_isBool (entry))
807 { 817 {
808 bool s = parse_bool_resource (p); 818 s = strcasecmp (p, "TRUE") == 0
819 || strcasecmp (p, "YES") == 0
820 || strcasecmp (p, "ON") == 0
821 || strcasecmp (p, "1") == 0;
809 822
810 if (optList_isReverse (entry)) 823 if (optList_isReverse (entry))
811 s = !s; 824 s = !s;
812 825
813 set_option (optList[entry].index, s); 826 set_option (optList[entry].index, s);
… …
818} 831}
819 832
820void 833void
821rxvt_term::extract_keysym_resources () 834rxvt_term::extract_keysym_resources ()
822{ 835{
823#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE 836#ifndef NO_RESOURCES
824 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
825#endif
826}
827
828#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
829void
830rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
831 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
832{
833 /* 837 /*
834 * [R5 or later]: enumerate the resource database 838 * [R5 or later]: enumerate the resource database
835 */ 839 */
840# ifdef KEYSYM_RESOURCE
836 XrmDatabase database = XrmGetDatabase (dpy); 841 XrmDatabase database = XrmGetDatabase (dpy);
837 XrmName name_prefix[3]; 842 XrmName name_prefix[3];
838 XrmClass class_prefix[3]; 843 XrmClass class_prefix[3];
839 844
840 name_prefix[0] = XrmStringToName (rs[Rs_name]); 845 name_prefix[0] = XrmStringToName (rs[Rs_name]);
841 name_prefix[1] = XrmStringToName (n_prefix); 846 name_prefix[1] = XrmStringToName ("keysym");
842 name_prefix[2] = NULLQUARK; 847 name_prefix[2] = NULLQUARK;
843 class_prefix[0] = XrmStringToName (RESCLASS); 848 class_prefix[0] = XrmStringToName (RESCLASS);
844 class_prefix[1] = XrmStringToName (c_prefix); 849 class_prefix[1] = XrmStringToName ("Keysym");
845 class_prefix[2] = NULLQUARK; 850 class_prefix[2] = NULLQUARK;
846 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
847 XrmEnumerateDatabase (database, name_prefix, class_prefix, 852 XrmEnumerateDatabase (database, name_prefix, class_prefix,
848 mode, proc, NULL); 853 XrmEnumOneLevel, rxvt_define_key, NULL);
849# ifdef RESFALLBACK 854# ifdef RESFALLBACK
850 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 855 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 856 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
852 XrmEnumerateDatabase (database, name_prefix, class_prefix, 857 XrmEnumerateDatabase (database, name_prefix, class_prefix,
853 mode, proc, NULL); 858 XrmEnumOneLevel, rxvt_define_key, NULL);
854# endif 859# endif
860# endif
861
862#endif /* NO_RESOURCES */
855} 863}
856#endif
857 864
858/*----------------------- end-of-file (C source) -----------------------*/ 865/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines