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.167 by root, Tue Jun 5 22:23:07 2012 UTC vs.
Revision 1.177 by root, Sun May 18 18:09:52 2014 UTC

… …
111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
113 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 113 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
116#if ENABLE_TRANSPARENCY 116#if BG_IMAGE_FROM_ROOT
117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
121 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), 121 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
… …
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
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
… …
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)
… …
622 627
623#ifndef NO_RESOURCES 628#ifndef NO_RESOURCES
624/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
625 630
626# ifdef KEYSYM_RESOURCE 631# ifdef KEYSYM_RESOURCE
632static void
633rxvt_define_key (rxvt_term *term, const char *k, const char *v)
634{
635 term->bind_action (k, v);
636}
637
627/* 638/*
628 * Define key from XrmEnumerateDatabase. 639 * Define key from XrmEnumerateDatabase.
629 * quarks will be something like 640 * quarks will be something like
630 * "rxvt" "keysym" "0xFF01" 641 * "rxvt" "keysym" "0xFF01"
631 * value will be a string 642 * value will be a string
632 */ 643 */
633static int 644static int
645rxvt_keysym_enumerate_helper (
634rxvt_define_key (XrmDatabase *database ecb_unused, 646 XrmDatabase *database ecb_unused,
635 XrmBindingList bindings ecb_unused, 647 XrmBindingList bindings ecb_unused,
636 XrmQuarkList quarks, 648 XrmQuarkList quarks,
637 XrmRepresentation *type ecb_unused, 649 XrmRepresentation *type ecb_unused,
638 XrmValue *value, 650 XrmValue *value,
639 XPointer closure ecb_unused) 651 XPointer closure
652)
640{ 653{
641 int last; 654 int last;
642 655
643 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 656 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
644 ; 657 ;
645 658
646 last--; 659 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
647 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 660 void (*cb)(rxvt_term *, const char *, const char *)
661 = (void (*)(rxvt_term *, const char *, const char *))
662 (((void **)closure)[1]);
663
664 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
665
648 return False; 666 return False;
649} 667}
650 668
651/* 669/*
652 * look for something like this (XK_Delete) 670 * look for something like this (XK_Delete)
… …
687 { "4", 1, Mod4Mask }, 705 { "4", 1, Mod4Mask },
688 { "5", 1, Mod5Mask }, 706 { "5", 1, Mod5Mask },
689}; 707};
690 708
691int 709int
692rxvt_term::parse_keysym (const char *str, const char *arg) 710rxvt_term::bind_action (const char *str, const char *arg)
693{ 711{
694 int sym; 712 int sym;
695 unsigned int state = 0; 713 unsigned int state = 0;
696 const char *key = strrchr (str, '-'); 714 const char *key = strrchr (str, '-');
697 715
… …
736 return -1; 754 return -1;
737 } 755 }
738 756
739 wchar_t *ws = rxvt_mbstowcs (arg); 757 wchar_t *ws = rxvt_mbstowcs (arg);
740 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) 758 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
741 keyboard->register_user_translation (sym, state, ws); 759 keyboard->register_action (sym, state, ws);
760
742 free (ws); 761 free (ws);
743 return 1; 762 return 1;
744} 763}
745 764
746# endif /* KEYSYM_RESOURCE */ 765# endif /* KEYSYM_RESOURCE */
… …
792 /* 811 /*
793 * Query resources for options that affect us 812 * Query resources for options that affect us
794 */ 813 */
795 for (int entry = 0; entry < ecb_array_length (optList); entry++) 814 for (int entry = 0; entry < ecb_array_length (optList); entry++)
796 { 815 {
816 int s;
797 const char *kw = optList[entry].kw; 817 const char *kw = optList[entry].kw;
798 818
799 if (kw == NULL || rs[optList[entry].doff] != NULL) 819 if (kw == NULL || rs[optList[entry].doff] != NULL)
800 continue; // previously set 820 continue; // previously set
801 821
… …
807 allocated.push_back ((void *)p); 827 allocated.push_back ((void *)p);
808 rs[optList[entry].doff] = p; 828 rs[optList[entry].doff] = p;
809 829
810 if (optList_isBool (entry)) 830 if (optList_isBool (entry))
811 { 831 {
812 bool s = parse_bool_resource (p); 832 s = strcasecmp (p, "TRUE") == 0
833 || strcasecmp (p, "YES") == 0
834 || strcasecmp (p, "ON") == 0
835 || strcasecmp (p, "1") == 0;
813 836
814 if (optList_isReverse (entry)) 837 if (optList_isReverse (entry))
815 s = !s; 838 s = !s;
816 839
817 set_option (optList[entry].index, s); 840 set_option (optList[entry].index, s);
… …
820 } 843 }
821#endif /* NO_RESOURCES */ 844#endif /* NO_RESOURCES */
822} 845}
823 846
824void 847void
825rxvt_term::extract_keysym_resources () 848rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
826{ 849{
827#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE 850#ifndef NO_RESOURCES
828 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
829#endif
830}
831
832#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
833void
834rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
835 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
836{
837 /* 851 /*
838 * [R5 or later]: enumerate the resource database 852 * [R5 or later]: enumerate the resource database
839 */ 853 */
854# ifdef KEYSYM_RESOURCE
855 void *closure[2] = {
856 (void *)this,
857 (void *)cb,
858 };
859
840 XrmDatabase database = XrmGetDatabase (dpy); 860 XrmDatabase database = XrmGetDatabase (dpy);
841 XrmName name_prefix[3]; 861 XrmName name_prefix[3];
842 XrmClass class_prefix[3]; 862 XrmClass class_prefix[3];
843 863
844 name_prefix[0] = XrmStringToName (rs[Rs_name]); 864 name_prefix[0] = XrmStringToName (rs[Rs_name]);
845 name_prefix[1] = XrmStringToName (n_prefix); 865 name_prefix[1] = XrmStringToName ("keysym");
846 name_prefix[2] = NULLQUARK; 866 name_prefix[2] = NULLQUARK;
847 class_prefix[0] = XrmStringToName (RESCLASS); 867 class_prefix[0] = XrmStringToName (RESCLASS);
848 class_prefix[1] = XrmStringToName (c_prefix); 868 class_prefix[1] = XrmStringToName ("Keysym");
849 class_prefix[2] = NULLQUARK; 869 class_prefix[2] = NULLQUARK;
850 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 870 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
851 XrmEnumerateDatabase (database, name_prefix, class_prefix, 871 XrmEnumerateDatabase (database, name_prefix, class_prefix,
852 mode, proc, NULL); 872 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
853# ifdef RESFALLBACK 873# ifdef RESFALLBACK
854 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 874 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
855 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 875 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
856 XrmEnumerateDatabase (database, name_prefix, class_prefix, 876 XrmEnumerateDatabase (database, name_prefix, class_prefix,
857 mode, proc, NULL); 877 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
858# endif 878# endif
859}
860#endif 879# endif
880
881#endif /* NO_RESOURCES */
882}
883
884void
885rxvt_term::extract_keysym_resources ()
886{
887 enumerate_keysym_resources (rxvt_define_key);
888}
861 889
862/*----------------------- end-of-file (C source) -----------------------*/ 890/*----------------------- end-of-file (C source) -----------------------*/
891

Diff Legend

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