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.187 by sf-exg, Mon May 11 22:05:58 2015 UTC

9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
11 * 11 *
12 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 3 of the License, or
15 * (at your option) any later version. 15 * (at your option) any later version.
16 * 16 *
17 * This program is distributed in the hope that it will be useful, 17 * This program is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of 18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
97 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
98 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
99 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 99 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"), 100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
101 SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
102 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104 STRG (Rs_multiClickTime, "multiClickTime", "mc", "number", "maximum time (in ms) between multi-click selections"),
103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 107 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
106 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
107 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 113 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
113 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 115 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"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
116#if ENABLE_TRANSPARENCY 118#if BG_IMAGE_FROM_ROOT
117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 120 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 121 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 122 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"), 123 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"), 197 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
197#if BG_IMAGE_FROM_FILE 199#if BG_IMAGE_FROM_FILE
198 RSTRG (Rs_path, "path", "search path"), 200 RSTRG (Rs_path, "path", "search path"),
199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 201 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
202#endif
200# if ENABLE_EWMH 203#if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 204 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif
203#endif 205#endif
204 /* fonts: command-line option = resource name */ 206 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 207 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 208#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 209 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 224 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
223#if ENABLE_XEMBED 225#if ENABLE_XEMBED
224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 226 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
225#endif 227#endif
226#if XFT 228#if XFT
229 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
230#endif
231#if ENABLE_FRILLS
227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 232 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 233 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
229#endif
230#if ENABLE_FRILLS
231 RSTRG (Rs_transient_for, "transient-for", "windowid"), 234 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"), 235 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"), 236 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"), 237 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"), 238 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
384#if defined(XTERM_SCROLLBAR) 387#if defined(XTERM_SCROLLBAR)
385 "+xterm" 388 "+xterm"
386#endif 389#endif
387 "\nUsage: "; /* Usage */ 390 "\nUsage: "; /* Usage */
388 391
389#define INDENT 18 392#define INDENT 28
390 393
391const char rxvt_term::resval_undef [] = "<undef>"; 394const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on"; 395const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off"; 396const char rxvt_term::resval_off [] = "off";
394 397
464 467
465 for (i = 0; i < ecb_array_length (optList); i++) 468 for (i = 0; i < ecb_array_length (optList); i++)
466 if (optList[i].kw != NULL) 469 if (optList[i].kw != NULL)
467 rxvt_log (" %s: %*s%s\n", 470 rxvt_log (" %s: %*s%s\n",
468 optList[i].kw, 471 optList[i].kw,
469 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 472 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
470 (optList_isBool (i) ? "boolean" : optList[i].arg)); 473 (optList_isBool (i) ? "boolean" : optList[i].arg));
471 474
472#if ENABLE_PERL 475#if ENABLE_PERL
473 rxvt_perl.init (this); 476 rxvt_perl.init (this);
474 rxvt_perl.usage (this, 2); 477 rxvt_perl.usage (this, 2);
546 * default values 549 * default values
547 */ 550 */
548 551
549 if (optList[entry].doff != -1) 552 if (optList[entry].doff != -1)
550 { 553 {
551 if (flag && i+1 == argc) 554 if (flag && i + 1 == argc)
552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 555 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
553 556
554 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 557 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
555 } 558 }
556 } 559 }
564 } 567 }
565 } 568 }
566#ifndef NO_RESOURCES 569#ifndef NO_RESOURCES
567 else if (!strcmp (opt, "xrm")) 570 else if (!strcmp (opt, "xrm"))
568 { 571 {
569 if (i+1 < argc) 572 if (i + 1 < argc)
570 XrmPutLineResource (&option_db, argv[++i]); 573 XrmPutLineResource (&option_db, argv[++i]);
571 } 574 }
572#endif 575#endif
573#ifdef KEYSYM_RESOURCE 576#ifdef KEYSYM_RESOURCE
574 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 577 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
575 { 578 {
576 if (i+1 < argc) 579 if (i + 1 < argc)
577 { 580 {
578 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 581 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
579 sprintf (res, "*.%s: %s\n", opt, argv[i]); 582 sprintf (res, "*.%s: %s\n", opt, argv[i]);
580 XrmPutLineResource (&option_db, res); 583 XrmPutLineResource (&option_db, res);
581 } 584 }
582 } 585 }
583#endif 586#endif
584 else if (!strcmp (opt, "e")) 587 else if (!strcmp (opt, "e"))
585 { 588 {
586 if (i+1 == argc) 589 if (i + 1 < argc)
587 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
588
589 return (const char **)argv + i + 1; 590 return (const char **)argv + i + 1;
591
592 rxvt_warn ("option '-e' requires an argument, aborting.\n");
593 bad_option = 1;
590 } 594 }
591 else 595 else
592 { 596 {
593#if ENABLE_PERL 597#if ENABLE_PERL
594 rxvt_perl.init (this); 598 rxvt_perl.init (this);
595 599
596 if (int flags = rxvt_perl.resource (this, opt, true, longopt, flag, argv [i + 1])) 600 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
597 { 601 {
598 if ((!flags & rxvt_perl.RESOURCE_BOOLEAN)) 602 if (flags & rxvt_perl.RESOURCE_ARG)
599 { 603 {
600 if (flag && i + 1 == argc) 604 if (i + 1 == argc)
605 {
601 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 606 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
602 607 bad_option = 1;
608 }
609 else
603 ++i; 610 ++i;
604 } 611 }
605 } 612 }
606 else 613 else
607#endif 614#endif
608 { 615 {
616 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
609 bad_option = 1; 617 bad_option = 1;
610 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
611 } 618 }
612 } 619 }
613 } 620 }
614 621
615 if (bad_option) 622 if (bad_option)
618 return 0; 625 return 0;
619} 626}
620 627
621/*}}} */ 628/*}}} */
622 629
623#ifndef NO_RESOURCES
624/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
625 631
626# ifdef KEYSYM_RESOURCE 632# ifdef KEYSYM_RESOURCE
633static void
634rxvt_define_key (rxvt_term *term, const char *k, const char *v)
635{
636 term->bind_action (k, v);
637}
638
627/* 639/*
628 * Define key from XrmEnumerateDatabase. 640 * Define key from XrmEnumerateDatabase.
629 * quarks will be something like 641 * quarks will be something like
630 * "rxvt" "keysym" "0xFF01" 642 * "rxvt" "keysym" "0xFF01"
631 * value will be a string 643 * value will be a string
632 */ 644 */
633static int 645static int
646rxvt_keysym_enumerate_helper (
634rxvt_define_key (XrmDatabase *database ecb_unused, 647 XrmDatabase *database ecb_unused,
635 XrmBindingList bindings ecb_unused, 648 XrmBindingList bindings ecb_unused,
636 XrmQuarkList quarks, 649 XrmQuarkList quarks,
637 XrmRepresentation *type ecb_unused, 650 XrmRepresentation *type ecb_unused,
638 XrmValue *value, 651 XrmValue *value,
639 XPointer closure ecb_unused) 652 XPointer closure
653)
640{ 654{
641 int last; 655 int last;
642 656
643 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 657 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
644 ; 658 ;
645 659
646 last--; 660 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
647 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 661 void (*cb)(rxvt_term *, const char *, const char *)
662 = (void (*)(rxvt_term *, const char *, const char *))
663 (((void **)closure)[1]);
664
665 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
666
648 return False; 667 return False;
649} 668}
650 669
651/* 670/*
652 * look for something like this (XK_Delete) 671 * look for something like this (XK_Delete)
687 { "4", 1, Mod4Mask }, 706 { "4", 1, Mod4Mask },
688 { "5", 1, Mod5Mask }, 707 { "5", 1, Mod5Mask },
689}; 708};
690 709
691int 710int
692rxvt_term::parse_keysym (const char *str, const char *arg) 711rxvt_term::parse_keysym (const char *str, unsigned int &state)
693{ 712{
694 int sym; 713 int sym;
695 unsigned int state = 0;
696 const char *key = strrchr (str, '-'); 714 const char *key = strrchr (str, '-');
715
716 state = 0;
697 717
698 if (!key) 718 if (!key)
699 key = str; 719 key = str;
700 else 720 else
701 key++; 721 key++;
702 722
703 // string or key is empty 723 // string or key is empty
704 if (*arg == '\0' || *key == '\0') 724 if (*key == '\0')
705 return -1; 725 return -1;
706 726
707 // parse modifiers 727 // parse modifiers
708 while (str < key) 728 while (str < key)
709 { 729 {
734 sym = strtol (str, &end, 16); 754 sym = strtol (str, &end, 16);
735 if (*end) 755 if (*end)
736 return -1; 756 return -1;
737 } 757 }
738 758
759 return sym;
760}
761
762int
763rxvt_term::bind_action (const char *str, const char *arg)
764{
765 int sym;
766 unsigned int state;
767
768 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
769 return -1;
770
739 wchar_t *ws = rxvt_mbstowcs (arg); 771 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))) 772 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); 773 keyboard->register_action (sym, state, ws);
774
742 free (ws); 775 free (ws);
743 return 1; 776 return 1;
744} 777}
745 778
746# endif /* KEYSYM_RESOURCE */ 779# endif /* KEYSYM_RESOURCE */
747#endif /* NO_RESOURCES */
748 780
749static char * 781static char *
750get_res (XrmDatabase database, const char *program, const char *option) 782get_res (XrmDatabase database, const char *program, const char *option)
751{ 783{
752 char resource[512]; 784 char resource[512];
792 /* 824 /*
793 * Query resources for options that affect us 825 * Query resources for options that affect us
794 */ 826 */
795 for (int entry = 0; entry < ecb_array_length (optList); entry++) 827 for (int entry = 0; entry < ecb_array_length (optList); entry++)
796 { 828 {
829 int s;
797 const char *kw = optList[entry].kw; 830 const char *kw = optList[entry].kw;
798 831
799 if (kw == NULL || rs[optList[entry].doff] != NULL) 832 if (kw == NULL || rs[optList[entry].doff] != NULL)
800 continue; // previously set 833 continue; // previously set
801 834
807 allocated.push_back ((void *)p); 840 allocated.push_back ((void *)p);
808 rs[optList[entry].doff] = p; 841 rs[optList[entry].doff] = p;
809 842
810 if (optList_isBool (entry)) 843 if (optList_isBool (entry))
811 { 844 {
812 bool s = parse_bool_resource (p); 845 s = strcasecmp (p, "TRUE") == 0
846 || strcasecmp (p, "YES") == 0
847 || strcasecmp (p, "ON") == 0
848 || strcasecmp (p, "1") == 0;
813 849
814 if (optList_isReverse (entry)) 850 if (optList_isReverse (entry))
815 s = !s; 851 s = !s;
816 852
817 set_option (optList[entry].index, s); 853 set_option (optList[entry].index, s);
820 } 856 }
821#endif /* NO_RESOURCES */ 857#endif /* NO_RESOURCES */
822} 858}
823 859
824void 860void
825rxvt_term::extract_keysym_resources () 861rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
826{
827#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
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{ 862{
837 /* 863 /*
838 * [R5 or later]: enumerate the resource database 864 * [R5 or later]: enumerate the resource database
839 */ 865 */
866# ifdef KEYSYM_RESOURCE
867 void *closure[2] = {
868 (void *)this,
869 (void *)cb,
870 };
871
840 XrmDatabase database = XrmGetDatabase (dpy); 872 XrmDatabase database = XrmGetDatabase (dpy);
841 XrmName name_prefix[3]; 873 XrmName name_prefix[3];
842 XrmClass class_prefix[3]; 874 XrmClass class_prefix[3];
843 875
844 name_prefix[0] = XrmStringToName (rs[Rs_name]);
845 name_prefix[1] = XrmStringToName (n_prefix); 876 name_prefix[1] = XrmStringToName ("keysym");
846 name_prefix[2] = NULLQUARK; 877 name_prefix[2] = NULLQUARK;
847 class_prefix[0] = XrmStringToName (RESCLASS);
848 class_prefix[1] = XrmStringToName (c_prefix); 878 class_prefix[1] = XrmStringToName ("Keysym");
849 class_prefix[2] = NULLQUARK; 879 class_prefix[2] = NULLQUARK;
850 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 880
851 XrmEnumerateDatabase (database, name_prefix, class_prefix,
852 mode, proc, NULL);
853# ifdef RESFALLBACK 881# ifdef RESFALLBACK
854 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 882 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
855 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 883 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
856 XrmEnumerateDatabase (database, name_prefix, class_prefix, 884 XrmEnumerateDatabase (database, name_prefix, class_prefix,
857 mode, proc, NULL); 885 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
858# endif 886# endif
859} 887
888 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
889 XrmEnumerateDatabase (database, name_prefix, class_prefix,
890 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
891
892 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
893 XrmEnumerateDatabase (database, name_prefix, class_prefix,
894 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
860#endif 895# endif
896}
897
898void
899rxvt_term::extract_keysym_resources ()
900{
901#ifdef KEYSYM_RESOURCE
902 enumerate_keysym_resources (rxvt_define_key);
903#endif
904}
861 905
862/*----------------------- end-of-file (C source) -----------------------*/ 906/*----------------------- end-of-file (C source) -----------------------*/
907

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines