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.178 by root, Thu May 22 18:54:33 2014 UTC vs.
Revision 1.198 by root, Sat Jul 3 15:34:35 2021 UTC

5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
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,2015 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 3 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.
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 BG_IMAGE_FROM_ROOT
117 BOOL (Rs_transparent, "inheritPixmap", "ip", 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"),
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"),
122#endif
123#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
124 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
125 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
126#endif 121#endif
127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
139#endif 134#endif
140#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
141 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
142#endif 137#endif
143#if ENABLE_FRILLS 138#if ENABLE_FRILLS
139 BOOL (Rs_disablePasteBrackets, "disablePasteBrackets", "dpb", Opt_disablePasteBrackets, 0, "paste bracket suppression"),
144 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"), 140 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
145 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"), 141 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
146 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"), 142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
147#endif 143#endif
148#if CURSOR_BLINK 144#if CURSOR_BLINK
192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
193#endif /* NO_CURSORCOLOR */ 189#endif /* NO_CURSORCOLOR */
194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 191 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
197#if BG_IMAGE_FROM_FILE
198 RSTRG (Rs_path, "path", "search path"),
199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
200#endif
201#if ENABLE_EWMH 193#if ENABLE_EWMH
202 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 194 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
195#endif
196#ifdef HAVE_XMU
197 RSTRG (Rs_pointerShape, "pointerShape", "string"),
203#endif 198#endif
204 /* fonts: command-line option = resource name */ 199 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 201#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 202 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
228#endif 223#endif
229#if ENABLE_FRILLS 224#if ENABLE_FRILLS
230 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 225 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
231 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"), 226 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
232 RSTRG (Rs_transient_for, "transient-for", "windowid"), 227 RSTRG (Rs_transient_for, "transient-for", "windowid"),
233 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 228 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "override-redirect on the terminal window"),
234 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 229 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
235 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 230 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
236 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 231 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
237 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
238 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 233 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
240 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 235 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
241 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 236 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
242 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"), 237 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
243#endif 238#endif
244#ifdef BUILTIN_GLYPHS 239#ifdef BUILTIN_GLYPHS
245 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 240 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "using font glyphs instead of internal glyphs"),
246#endif 241#endif
247#ifdef POINTER_BLANK 242#ifdef POINTER_BLANK
248 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 243 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
249#endif 244#endif
250#ifndef NO_BACKSPACE_KEY 245#ifndef NO_BACKSPACE_KEY
258#endif 253#endif
259 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 254 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
260 RSTRG (Rs_cutchars, "cutchars", "string"), 255 RSTRG (Rs_cutchars, "cutchars", "string"),
261 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 256 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
262#ifndef NO_SECONDARY_SCREEN 257#ifndef NO_SECONDARY_SCREEN
263 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 258 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "secondary screen"),
264 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 259 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "secondary screen scroll"),
260#endif
261#if ENABLE_FRILLS
262 STRG (Rs_rewrapMode, "rewrapMode", "rm", "string", "rewrap mode (auto, always, never)"),
265#endif 263#endif
266#if ENABLE_PERL 264#if ENABLE_PERL
267 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 265 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
268 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 266 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
269 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 267 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
623 return 0; 621 return 0;
624} 622}
625 623
626/*}}} */ 624/*}}} */
627 625
628#ifndef NO_RESOURCES
629/*----------------------------------------------------------------------*/ 626/*----------------------------------------------------------------------*/
630 627
631# ifdef KEYSYM_RESOURCE 628#ifdef KEYSYM_RESOURCE
632static void 629static void
633rxvt_define_key (rxvt_term *term, const char *k, const char *v) 630rxvt_define_key (rxvt_term *term, const char *k, const char *v)
634{ 631{
635 term->bind_action (k, v); 632 term->bind_action (k, v);
636}
637
638/*
639 * Define key from XrmEnumerateDatabase.
640 * quarks will be something like
641 * "rxvt" "keysym" "0xFF01"
642 * value will be a string
643 */
644static int
645rxvt_keysym_enumerate_helper (
646 XrmDatabase *database ecb_unused,
647 XrmBindingList bindings ecb_unused,
648 XrmQuarkList quarks,
649 XrmRepresentation *type ecb_unused,
650 XrmValue *value,
651 XPointer closure
652)
653{
654 int last;
655
656 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
657 ;
658
659 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
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
666 return False;
667} 633}
668 634
669/* 635/*
670 * look for something like this (XK_Delete) 636 * look for something like this (XK_Delete)
671 * rxvt*keysym.0xFFFF: "\177" 637 * rxvt*keysym.0xFFFF: "\177"
705 { "4", 1, Mod4Mask }, 671 { "4", 1, Mod4Mask },
706 { "5", 1, Mod5Mask }, 672 { "5", 1, Mod5Mask },
707}; 673};
708 674
709int 675int
710rxvt_term::bind_action (const char *str, const char *arg) 676rxvt_term::parse_keysym (const char *str, unsigned int &state)
711{ 677{
712 int sym; 678 int sym;
713 unsigned int state = 0;
714 const char *key = strrchr (str, '-'); 679 const char *key = strrchr (str, '-');
680
681 state = 0;
715 682
716 if (!key) 683 if (!key)
717 key = str; 684 key = str;
718 else 685 else
719 key++; 686 key++;
720 687
721 // string or key is empty 688 // string or key is empty
722 if (*arg == '\0' || *key == '\0') 689 if (*key == '\0')
723 return -1; 690 return -1;
724 691
725 // parse modifiers 692 // parse modifiers
726 while (str < key) 693 while (str < key)
727 { 694 {
752 sym = strtol (str, &end, 16); 719 sym = strtol (str, &end, 16);
753 if (*end) 720 if (*end)
754 return -1; 721 return -1;
755 } 722 }
756 723
724 return sym;
725}
726
727int
728rxvt_term::bind_action (const char *str, const char *arg)
729{
730 int sym;
731 unsigned int state;
732
733 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
734 return -1;
735
757 wchar_t *ws = rxvt_mbstowcs (arg); 736 wchar_t *ws = rxvt_mbstowcs (arg);
758 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) 737 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
759 keyboard->register_action (sym, state, ws); 738 keyboard->register_action (sym, state, ws);
760 739
761 free (ws); 740 free (ws);
762 return 1; 741 return 1;
763} 742}
764 743
765# endif /* KEYSYM_RESOURCE */ 744#endif /* KEYSYM_RESOURCE */
766#endif /* NO_RESOURCES */
767 745
768static char * 746static char *
769get_res (XrmDatabase database, const char *program, const char *option) 747get_res (XrmDatabase database, const char *program, const char *option)
770{ 748{
771 char resource[512]; 749 char resource[512];
842 } 820 }
843 } 821 }
844#endif /* NO_RESOURCES */ 822#endif /* NO_RESOURCES */
845} 823}
846 824
825struct rxvt_enumerate_closure
826{
827 rxvt_term *term;
828 void (*cb)(rxvt_term *, const char *, const char *);
829 int specific; // iterate over only a specific subhierarchy
830};
831
832/*
833 * Define key from XrmEnumerateDatabase.
834 * quarks will be something like
835 * "rxvt" "keysym" "0xFF01"
836 * value will be a string
837 */
838static int
839rxvt_enumerate_helper (
840 XrmDatabase *database ecb_unused,
841 XrmBindingList bindings ecb_unused,
842 XrmQuarkList quarks,
843 XrmRepresentation *type ecb_unused,
844 XrmValue *value,
845 XPointer closure
846)
847{
848 const rxvt_enumerate_closure *data = (const rxvt_enumerate_closure *)closure;
849
850 if (*quarks == NULLQUARK) return False;
851
852 // if the quark list starts with a tightly bound quark, we skip it,
853 // as it exactly matched the prefix. Otherwise, it matched because
854 // it started with "*", in which case we assume the prefix is part
855 // of the "*".
856 if (*bindings == XrmBindTightly)
857 {
858 ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
859 if (*quarks == NULLQUARK) return False;
860 }
861
862 // specific, a bit misleadingly named, is used when a specific "subclass"
863 // is iterated over, e.g. "keysym", and is used to skip one more
864 // component, as well as all generic prefixes
865 // this is a bit of a hack, ideally, keysym (the only user) should use its
866 // own iteration function, but this ought to be less bloated
867 if (data->specific)
868 {
869 ++quarks, ++bindings;
870 if (*quarks == NULLQUARK) return False;
871 }
872
873 char *pattern;
874 if (quarks[1] == NULLQUARK)
875 pattern = XrmQuarkToString (quarks[0]); // single component, fast path
876 else
877 {
878 // multiple components, slow path - should be rare, don't optimize for speed
879 int size = 0;
880
881 for (int i = 0; quarks[i] != NULLQUARK; ++i)
882 size += strlen (XrmQuarkToString (quarks[i])) + 1;
883
884 pattern = rxvt_temp_buf<char> (size + 1);
885
886 // now print all components
887 {
888 char *cur = pattern;
889
890 for (int i = 0; quarks[i] != NULLQUARK; ++i)
891 cur += sprintf (cur, ".%s", XrmQuarkToString (quarks[i]));
892 }
893
894 ++pattern; // skip initial dot
895 }
896
897 data->cb (data->term, pattern, (char *)value->addr);
898
899 return False;
900}
901
847void 902void
848rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *)) 903rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
849{ 904{
850#ifndef NO_RESOURCES
851 /* 905 /*
852 * [R5 or later]: enumerate the resource database 906 * [R5 or later]: enumerate the resource database
853 */ 907 */
908 assert (!name_p == !class_p); // both must be specified, or missing
909
854# ifdef KEYSYM_RESOURCE 910#ifdef KEYSYM_RESOURCE
855 void *closure[2] = { 911 rxvt_enumerate_closure closure = { this, cb, name_p ? 1 : 0 };
856 (void *)this,
857 (void *)cb,
858 };
859 912
860 XrmDatabase database = XrmGetDatabase (dpy); 913 XrmDatabase database = XrmGetDatabase (dpy);
861 XrmName name_prefix[3]; 914 XrmName name_prefix[3];
862 XrmClass class_prefix[3]; 915 XrmClass class_prefix[3];
863 916
864 name_prefix[0] = XrmStringToName (rs[Rs_name]); 917 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
865 name_prefix[1] = XrmStringToName ("keysym");
866 name_prefix[2] = NULLQUARK; 918 name_prefix[2] = NULLQUARK;
867 class_prefix[0] = XrmStringToName (RESCLASS); 919 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
868 class_prefix[1] = XrmStringToName ("Keysym");
869 class_prefix[2] = NULLQUARK; 920 class_prefix[2] = NULLQUARK;
870 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 921
922# ifdef RESFALLBACK
923 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
871 XrmEnumerateDatabase (database, name_prefix, class_prefix, 924 XrmEnumerateDatabase (database, name_prefix, class_prefix,
872 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 925 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
873# ifdef RESFALLBACK 926# endif
927
874 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 928 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
875 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
876 XrmEnumerateDatabase (database, name_prefix, class_prefix, 929 XrmEnumerateDatabase (database, name_prefix, class_prefix,
877 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 930 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
878# endif 931
932 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
933 XrmEnumerateDatabase (database, name_prefix, class_prefix,
934 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
879# endif 935#endif
880
881#endif /* NO_RESOURCES */
882} 936}
883 937
884void 938void
885rxvt_term::extract_keysym_resources () 939rxvt_term::extract_keysym_resources ()
886{ 940{
941#ifdef KEYSYM_RESOURCE
887 enumerate_keysym_resources (rxvt_define_key); 942 enumerate_keysym_resources (rxvt_define_key);
943#endif
888} 944}
889 945
890/*----------------------- end-of-file (C source) -----------------------*/ 946/*----------------------- end-of-file (C source) -----------------------*/
891 947

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines