… | |
… | |
4 | * |
4 | * |
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-2004 Marc Lehmann <pcg@goof.com> |
9 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
10 | * |
10 | * |
11 | * This program is free software; you can redistribute it and/or modify |
11 | * This program is free software; you can redistribute it and/or modify |
12 | * it under the terms of the GNU General Public License as published by |
12 | * it under the terms of the GNU General Public License as published by |
13 | * the Free Software Foundation; either version 2 of the License, or |
13 | * the Free Software Foundation; either version 2 of the License, or |
14 | * (at your option) any later version. |
14 | * (at your option) any later version. |
… | |
… | |
35 | |
35 | |
36 | #ifdef KEYSYM_RESOURCE |
36 | #ifdef KEYSYM_RESOURCE |
37 | #include "keyboard.h" |
37 | #include "keyboard.h" |
38 | #endif |
38 | #endif |
39 | |
39 | |
|
|
40 | /* place holders used for parsing command-line options */ |
|
|
41 | #define Optflag_Reverse 0x40000000UL |
|
|
42 | #define Optflag_Boolean 0x80000000UL |
|
|
43 | #define Optflag_mask 0x3fffffffUL |
|
|
44 | |
40 | /* #define DEBUG_RESOURCES */ |
45 | /* #define DEBUG_RESOURCES */ |
41 | |
46 | |
42 | /*{{{ monolithic option/resource structure: */ |
47 | /*{{{ monolithic option/resource structure: */ |
43 | /* |
48 | /* |
44 | * `string' options MUST have a usage argument |
49 | * `string' options MUST have a usage argument |
… | |
… | |
58 | #define RSTRG(rsp, kw, arg) \ |
63 | #define RSTRG(rsp, kw, arg) \ |
59 | {0, (rsp), (kw), NULL, (arg), NULL} |
64 | {0, (rsp), (kw), NULL, (arg), NULL} |
60 | |
65 | |
61 | /* BOOL () - regular boolean `-/+' flag */ |
66 | /* BOOL () - regular boolean `-/+' flag */ |
62 | #define BOOL(rsp, kw, opt, flag, desc) \ |
67 | #define BOOL(rsp, kw, opt, flag, desc) \ |
63 | { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} |
68 | { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} |
64 | |
69 | |
65 | /* SWCH () - `-' flag */ |
70 | /* SWCH () - `-' flag */ |
66 | #define SWCH(opt, flag, desc) \ |
71 | #define SWCH(opt, flag, desc) \ |
67 | { (flag), -1, NULL, (opt), NULL, (desc)} |
72 | { (flag), -1, NULL, (opt), NULL, (desc)} |
68 | |
73 | |
69 | /* convenient macros */ |
74 | /* convenient macros */ |
70 | #define optList_strlen(i) \ |
75 | #define optList_strlen(i) \ |
71 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
76 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
72 | #define optList_isBool(i) \ |
77 | #define optList_isBool(i) \ |
73 | (optList[i].flag & Opt_Boolean) |
78 | (optList[i].flag & Optflag_Boolean) |
74 | #define optList_isReverse(i) \ |
79 | #define optList_isReverse(i) \ |
75 | (optList[i].flag & Opt_Reverse) |
80 | (optList[i].flag & Optflag_Reverse) |
76 | #define optList_size \ |
81 | #define optList_size \ |
77 | (sizeof (optList) / sizeof (optList[0])) |
82 | (sizeof (optList) / sizeof (optList[0])) |
78 | |
83 | |
79 | static const struct |
84 | static const struct |
80 | { |
85 | { |
… | |
… | |
105 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), |
110 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), |
106 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
111 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
107 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
112 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
108 | #endif |
113 | #endif |
109 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), |
114 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), |
110 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), |
115 | BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), |
111 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), |
116 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), |
112 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), |
117 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), |
113 | #if TRANSPARENT |
118 | #if TRANSPARENT |
114 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), |
119 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), |
115 | SWCH ("tr", Opt_transparent, NULL), |
120 | SWCH ("tr", Opt_transparent, NULL), |
… | |
… | |
156 | RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), |
161 | RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), |
157 | RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), |
162 | RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), |
158 | RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), |
163 | RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), |
159 | RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), |
164 | RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), |
160 | RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), |
165 | RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), |
161 | #ifndef NO_BRIGHTCOLOR |
|
|
162 | RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), |
166 | RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), |
163 | RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), |
167 | RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), |
164 | RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), |
168 | RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), |
165 | RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), |
169 | RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), |
166 | RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), |
170 | RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), |
167 | RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), |
171 | RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), |
168 | RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), |
172 | RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), |
169 | RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), |
173 | RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), |
170 | #endif /* NO_BRIGHTCOLOR */ |
|
|
171 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
174 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
172 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
175 | RSTRG (Rs_color + Color_BD, "colorBD", "color"), |
173 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
176 | RSTRG (Rs_color + Color_IT, "colorIT", "color"), |
174 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
177 | RSTRG (Rs_color + Color_UL, "colorUL", "color"), |
175 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
178 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
… | |
… | |
205 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
208 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
206 | #if ENABLE_STYLES |
209 | #if ENABLE_STYLES |
207 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
210 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
208 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
211 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
209 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
212 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
|
|
213 | BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), |
210 | #endif |
214 | #endif |
211 | #ifdef USE_XIM |
215 | #ifdef USE_XIM |
212 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
216 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
213 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
217 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
214 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
218 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
… | |
… | |
221 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
225 | STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), |
222 | #if ENABLE_XEMBED |
226 | #if ENABLE_XEMBED |
223 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
227 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
224 | #endif |
228 | #endif |
225 | #if ENABLE_FRILLS |
229 | #if ENABLE_FRILLS |
|
|
230 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
226 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
231 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
227 | BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), |
232 | BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), |
228 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
233 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
229 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
234 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
230 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
235 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
231 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
236 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
232 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
237 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
|
|
238 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"), |
233 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
239 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
234 | #endif |
240 | #endif |
235 | #ifdef POINTER_BLANK |
241 | #ifdef POINTER_BLANK |
236 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
242 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
237 | #endif |
243 | #endif |
… | |
… | |
251 | #endif /* CUTCHAR_RESOURCE */ |
257 | #endif /* CUTCHAR_RESOURCE */ |
252 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
258 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
253 | #ifndef NO_SECONDARY_SCREEN |
259 | #ifndef NO_SECONDARY_SCREEN |
254 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), |
260 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), |
255 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), |
261 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), |
|
|
262 | #endif |
|
|
263 | #if ENABLE_PERL |
|
|
264 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO |
|
|
265 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
|
|
266 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
|
|
267 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
256 | #endif |
268 | #endif |
257 | #if 0 && TODO |
269 | #if 0 && TODO |
258 | #if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) |
270 | #if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) |
259 | INFO ("xrm", "string", "X resource"), |
271 | INFO ("xrm", "string", "X resource"), |
260 | #endif |
272 | #endif |
… | |
… | |
392 | #endif |
404 | #endif |
393 | #if defined(NO_RESOURCES) |
405 | #if defined(NO_RESOURCES) |
394 | "NoResources" |
406 | "NoResources" |
395 | #else |
407 | #else |
396 | # if defined(USE_XGETDEFAULT) |
408 | # if defined(USE_XGETDEFAULT) |
397 | "XGetDefaults" |
409 | "XGetDefault" |
398 | # else |
410 | # else |
399 | ".Xdefaults" |
411 | ".Xdefaults" |
400 | # endif |
412 | # endif |
401 | #endif |
413 | #endif |
402 | "\nUsage: "; /* Usage */ |
414 | "\nUsage: "; /* Usage */ |
… | |
… | |
561 | { /* boolean value */ |
573 | { /* boolean value */ |
562 | #ifdef DEBUG_RESOURCES |
574 | #ifdef DEBUG_RESOURCES |
563 | fprintf (stderr, "boolean (%s,%s) = %s\n", |
575 | fprintf (stderr, "boolean (%s,%s) = %s\n", |
564 | optList[entry].opt, optList[entry].kw, flag); |
576 | optList[entry].opt, optList[entry].kw, flag); |
565 | #endif |
577 | #endif |
566 | if (flag == On) |
578 | set_option (optList[entry].flag & Optflag_mask, flag == On); |
567 | options |= optList[entry].flag; |
|
|
568 | else |
|
|
569 | options &= ~optList[entry].flag; |
|
|
570 | |
579 | |
571 | if (optList[entry].doff != -1) |
580 | if (optList[entry].doff != -1) |
572 | rs[optList[entry].doff] = flag; |
581 | rs[optList[entry].doff] = flag; |
573 | } |
582 | } |
574 | } |
583 | } |
… | |
… | |
683 | { |
692 | { |
684 | if ((n = rxvt_Str_match (str, "keysym.")) == 0) |
693 | if ((n = rxvt_Str_match (str, "keysym.")) == 0) |
685 | return 0; |
694 | return 0; |
686 | |
695 | |
687 | str += n; /* skip `keysym.' */ |
696 | str += n; /* skip `keysym.' */ |
688 | if ((pmodend = strchr (str, ':')) < str) |
697 | if (!(pmodend = strchr (str, ':'))) |
689 | return -1; |
698 | return -1; |
690 | } |
699 | } |
691 | else |
700 | else |
692 | pmodend = str + strlen(str); |
701 | pmodend = str + strlen(str); |
693 | |
702 | |
… | |
… | |
855 | || strcmp (str, "1") == 0; |
864 | || strcmp (str, "1") == 0; |
856 | |
865 | |
857 | if (optList_isReverse (entry)) |
866 | if (optList_isReverse (entry)) |
858 | s = !s; |
867 | s = !s; |
859 | |
868 | |
860 | if (s) |
|
|
861 | options |= optList[entry].flag; |
869 | set_option (optList[entry].flag & Optflag_mask, s); |
862 | else |
|
|
863 | options &= ~optList[entry].flag; |
|
|
864 | } |
870 | } |
865 | } |
871 | } |
866 | |
872 | |
867 | break; |
873 | break; |
868 | } |
874 | } |
… | |
… | |
873 | } |
879 | } |
874 | |
880 | |
875 | /*}}} */ |
881 | /*}}} */ |
876 | # endif /* ! USE_XGETDEFAULT */ |
882 | # endif /* ! USE_XGETDEFAULT */ |
877 | #endif /* NO_RESOURCES */ |
883 | #endif /* NO_RESOURCES */ |
|
|
884 | |
|
|
885 | #ifdef USE_XGETDEFAULT |
|
|
886 | char *get_res (XrmDatabase database, const char *program, const char *option) |
|
|
887 | { |
|
|
888 | char resource[512]; |
|
|
889 | char *type; |
|
|
890 | XrmValue result; |
|
|
891 | |
|
|
892 | snprintf (resource, sizeof (resource), "%s.%s", program, option); |
|
|
893 | XrmGetResource (database, resource, resource, &type, &result); |
|
|
894 | |
|
|
895 | return result.addr; |
|
|
896 | } |
|
|
897 | #endif |
878 | |
898 | |
879 | /*{{{ read the resources files */ |
899 | /*{{{ read the resources files */ |
880 | /* |
900 | /* |
881 | * using XGetDefault () or the hand-rolled replacement |
901 | * using XGetDefault () or the hand-rolled replacement |
882 | */ |
902 | */ |
… | |
… | |
907 | /* |
927 | /* |
908 | * get resources using the X library function |
928 | * get resources using the X library function |
909 | */ |
929 | */ |
910 | int entry; |
930 | int entry; |
911 | |
931 | |
912 | # ifdef XrmEnumOneLevel |
|
|
913 | char *displayResource, *xe; |
932 | char *displayResource, *xe; |
914 | XrmName name_prefix[3]; |
933 | XrmName name_prefix[3]; |
915 | XrmClass class_prefix[3]; |
934 | XrmClass class_prefix[3]; |
916 | XrmDatabase database, rdb1; |
935 | XrmDatabase database, rdb1; |
917 | |
936 | |
918 | XrmInitialize (); |
|
|
919 | database = NULL; |
937 | database = NULL; |
920 | |
938 | |
921 | // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 |
939 | // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 |
922 | |
940 | |
923 | // 6. System wide per application default file. |
941 | // 6. System wide per application default file. |
… | |
… | |
984 | if ((rdb1 = XrmGetFileDatabase (fname))) |
1002 | if ((rdb1 = XrmGetFileDatabase (fname))) |
985 | XrmMergeDatabases (rdb1, &database); |
1003 | XrmMergeDatabases (rdb1, &database); |
986 | } |
1004 | } |
987 | } |
1005 | } |
988 | |
1006 | |
989 | XrmSetDatabase (disp, database); |
1007 | xrmdatabase = database; |
990 | # endif |
|
|
991 | |
1008 | |
992 | /* |
1009 | /* |
993 | * Query resources for options that affect us |
1010 | * Query resources for options that affect us |
994 | */ |
1011 | */ |
995 | for (entry = 0; entry < optList_size; entry++) |
1012 | for (entry = 0; entry < optList_size; entry++) |
… | |
… | |
999 | const char *kw = optList[entry].kw; |
1016 | const char *kw = optList[entry].kw; |
1000 | |
1017 | |
1001 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
1018 | if (kw == NULL || rs[optList[entry].doff] != NULL) |
1002 | continue; /* previously set */ |
1019 | continue; /* previously set */ |
1003 | |
1020 | |
1004 | p = XGetDefault (disp, rs[Rs_name], kw); |
1021 | p = get_res (database, rs[Rs_name], kw); |
1005 | p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); |
1022 | p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); |
1006 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
1023 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
1007 | { |
1024 | { |
1008 | p = XGetDefault (disp, RESCLASS, kw); |
1025 | p = get_res (database, RESCLASS, kw); |
1009 | #ifdef RESFALLBACK |
1026 | #ifdef RESFALLBACK |
1010 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
1027 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
1011 | p = XGetDefault (disp, RESFALLBACK, kw); |
1028 | p = get_res (database, RESFALLBACK, kw); |
1012 | #endif |
1029 | #endif |
1013 | } |
1030 | } |
1014 | |
1031 | |
1015 | if (p == NULL && p0) |
1032 | if (p == NULL && p0) |
1016 | p = p0; |
1033 | p = p0; |
… | |
… | |
1027 | || strcasecmp (p, "1") == 0; |
1044 | || strcasecmp (p, "1") == 0; |
1028 | |
1045 | |
1029 | if (optList_isReverse (entry)) |
1046 | if (optList_isReverse (entry)) |
1030 | s = !s; |
1047 | s = !s; |
1031 | |
1048 | |
1032 | if (s) |
1049 | set_option (optList[entry].flag & Optflag_mask, s); |
1033 | options |= optList[entry].flag; |
|
|
1034 | else |
|
|
1035 | options &= ~optList[entry].flag; |
|
|
1036 | } |
1050 | } |
1037 | } |
1051 | } |
1038 | } |
1052 | } |
1039 | |
1053 | |
1040 | /* |
1054 | /* |
… | |
… | |
1046 | name_prefix[2] = NULLQUARK; |
1060 | name_prefix[2] = NULLQUARK; |
1047 | class_prefix[0] = XrmStringToName (RESCLASS); |
1061 | class_prefix[0] = XrmStringToName (RESCLASS); |
1048 | class_prefix[1] = XrmStringToName ("Keysym"); |
1062 | class_prefix[1] = XrmStringToName ("Keysym"); |
1049 | class_prefix[2] = NULLQUARK; |
1063 | class_prefix[2] = NULLQUARK; |
1050 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
1064 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
1051 | XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, |
1065 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
1052 | XrmEnumOneLevel, rxvt_define_key, NULL); |
1066 | XrmEnumOneLevel, rxvt_define_key, NULL); |
1053 | # ifdef RESFALLBACK |
1067 | # ifdef RESFALLBACK |
1054 | name_prefix[0] = XrmStringToName (RESFALLBACK); |
1068 | name_prefix[0] = XrmStringToName (RESFALLBACK); |
1055 | name_prefix[1] = XrmStringToName ("keysym"); |
1069 | name_prefix[1] = XrmStringToName ("keysym"); |
1056 | class_prefix[0] = XrmStringToName (RESFALLBACK); |
1070 | class_prefix[0] = XrmStringToName (RESFALLBACK); |
1057 | class_prefix[1] = XrmStringToName ("Keysym"); |
1071 | class_prefix[1] = XrmStringToName ("Keysym"); |
1058 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
1072 | /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ |
1059 | XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, |
1073 | XrmEnumerateDatabase (database, name_prefix, class_prefix, |
1060 | XrmEnumOneLevel, rxvt_define_key, NULL); |
1074 | XrmEnumOneLevel, rxvt_define_key, NULL); |
1061 | # endif |
1075 | # endif |
1062 | # endif |
1076 | # endif |
1063 | |
1077 | |
1064 | # else /* USE_XGETDEFAULT */ |
1078 | # else /* USE_XGETDEFAULT */ |