1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: xdefaults.C |
2 | * File: xdefaults.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
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> |
… | |
… | |
30 | #ifdef KEYSYM_RESOURCE |
30 | #ifdef KEYSYM_RESOURCE |
31 | # include "keyboard.h" |
31 | # include "keyboard.h" |
32 | #endif |
32 | #endif |
33 | |
33 | |
34 | /* place holders used for parsing command-line options */ |
34 | /* place holders used for parsing command-line options */ |
35 | #define Optflag_Reverse 0x40000000UL |
35 | #define Optflag_Reverse 1 |
36 | #define Optflag_Boolean 0x80000000UL |
36 | #define Optflag_Boolean 2 |
37 | #define Optflag_mask 0x3fffffffUL |
|
|
38 | |
37 | |
39 | /* monolithic option/resource structure: */ |
38 | /* monolithic option/resource structure: */ |
40 | /* |
39 | /* |
41 | * `string' options MUST have a usage argument |
40 | * `string' options MUST have a usage argument |
42 | * `switch' and `boolean' options have no argument |
41 | * `switch' and `boolean' options have no argument |
43 | * if there's no desc (ription), it won't appear in rxvt_usage () |
42 | * if there's no desc (ription), it won't appear in rxvt_usage () |
44 | */ |
43 | */ |
45 | |
44 | |
46 | /* INFO () - descriptive information only */ |
45 | /* INFO () - descriptive information only */ |
47 | #define INFO(opt, arg, desc) \ |
46 | #define INFO(opt, arg, desc) \ |
48 | {0, -1, NULL, (opt), (arg), (desc)} |
47 | {0, 0, -1, NULL, (opt), (arg), (desc)} |
49 | |
48 | |
50 | /* STRG () - command-line option, with/without resource */ |
49 | /* STRG () - command-line option, with/without resource */ |
51 | #define STRG(rsp, kw, opt, arg, desc) \ |
50 | #define STRG(rsp, kw, opt, arg, desc) \ |
52 | {0, (rsp), (kw), (opt), (arg), (desc)} |
51 | {0, 0, (rsp), (kw), (opt), (arg), (desc)} |
53 | |
52 | |
54 | /* RSTRG () - resource/long-option */ |
53 | /* RSTRG () - resource/long-option */ |
55 | #define RSTRG(rsp, kw, arg) \ |
54 | #define RSTRG(rsp, kw, arg) \ |
56 | {0, (rsp), (kw), NULL, (arg), NULL} |
55 | {0, 0, (rsp), (kw), NULL, (arg), NULL} |
57 | |
56 | |
58 | /* BOOL () - regular boolean `-/+' flag */ |
57 | /* BOOL () - regular boolean `-/+' flag */ |
59 | #define BOOL(rsp, kw, opt, flag, desc) \ |
58 | #define BOOL(rsp, kw, opt, option, flag, desc) \ |
60 | { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} |
59 | { option ## _idx, (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} |
61 | |
60 | |
62 | /* SWCH () - `-' flag */ |
61 | /* SWCH () - `-' flag */ |
63 | #define SWCH(opt, flag, desc) \ |
62 | #define SWCH(opt, option, flag, desc) \ |
64 | { (flag), -1, NULL, (opt), NULL, (desc)} |
63 | { option ## _idx, (flag), -1, NULL, (opt), NULL, (desc)} |
65 | |
64 | |
66 | /* convenient macros */ |
65 | /* convenient macros */ |
67 | #define optList_strlen(i) \ |
66 | #define optList_strlen(i) \ |
68 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
67 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
69 | #define optList_isBool(i) \ |
68 | #define optList_isBool(i) \ |
… | |
… | |
73 | #define optList_size \ |
72 | #define optList_size \ |
74 | (sizeof (optList) / sizeof (optList[0])) |
73 | (sizeof (optList) / sizeof (optList[0])) |
75 | |
74 | |
76 | static const struct |
75 | static const struct |
77 | { |
76 | { |
|
|
77 | const uint8_t index; /* Option index */ |
78 | const unsigned long flag; /* Option flag */ |
78 | const uint8_t flag; /* Option flag */ |
79 | const int doff; /* data offset */ |
79 | const int doff; /* data offset */ |
80 | const char *kw; /* keyword */ |
80 | const char *kw; /* keyword */ |
81 | const char *opt; /* option */ |
81 | const char *opt; /* option */ |
82 | const char *arg; /* argument */ |
82 | const char *arg; /* argument */ |
83 | const char *desc; /* description */ |
83 | const char *desc; /* description */ |
… | |
… | |
86 | STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ |
86 | STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ |
87 | STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), |
87 | STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), |
88 | STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), |
88 | STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), |
89 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
89 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
90 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
90 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
91 | SWCH ("C", Opt_console, "intercept console messages"), |
91 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
92 | SWCH ("iconic", Opt_iconic, "start iconic"), |
92 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
93 | SWCH ("ic", Opt_iconic, NULL), /* short form */ |
93 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
94 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), |
94 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
95 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), |
95 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
96 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), |
96 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
97 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), |
97 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
98 | #if HAVE_SCROLLBARS |
98 | #if HAVE_SCROLLBARS |
99 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
99 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
100 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), |
100 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
101 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), |
101 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
102 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), |
102 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), |
103 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
103 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
104 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
104 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
105 | #endif |
105 | #endif |
106 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), |
106 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
107 | BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), |
107 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
108 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), |
108 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
109 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), |
109 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
110 | #if TRANSPARENT |
110 | #if TRANSPARENT |
111 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), |
111 | BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), |
112 | SWCH ("tr", Opt_transparent, NULL), |
112 | SWCH ("tr", Opt_transparent, 0, NULL), |
113 | # if TINTING |
113 | # if TINTING |
114 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
114 | STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), |
115 | # endif |
115 | # endif |
116 | #endif |
116 | #endif |
117 | #if OFF_FOCUS_FADING |
117 | #if OFF_FOCUS_FADING |
118 | STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), |
118 | STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), |
119 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
119 | STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), |
120 | #endif |
120 | #endif |
121 | #if TINTING |
121 | #if TINTING |
122 | STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), |
122 | STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."), |
123 | #endif |
123 | #endif |
124 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), |
124 | BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), |
125 | #ifndef NO_BELL |
125 | #ifndef NO_BELL |
126 | BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), |
126 | BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"), |
127 | # if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) |
127 | # if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) |
128 | BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), |
128 | BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL), |
129 | # endif |
129 | # endif |
130 | #endif |
130 | #endif |
131 | #ifdef META8_OPTION |
131 | #ifdef META8_OPTION |
132 | BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), |
132 | BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL), |
133 | #endif |
133 | #endif |
134 | #ifdef MOUSE_WHEEL |
134 | #ifdef MOUSE_WHEEL |
135 | BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), |
135 | BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL), |
136 | #endif |
136 | #endif |
137 | #if ENABLE_FRILLS |
137 | #if ENABLE_FRILLS |
138 | BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), |
138 | BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"), |
139 | BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), |
139 | BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"), |
140 | BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), |
140 | BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"), |
141 | #endif |
141 | #endif |
142 | #if CURSOR_BLINK |
142 | #if CURSOR_BLINK |
143 | BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), |
143 | BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"), |
144 | #endif |
144 | #endif |
145 | #ifdef POINTER_BLANK |
145 | #ifdef POINTER_BLANK |
146 | BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), |
146 | BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, 0, "switch off pointer after delay"), |
147 | #endif |
147 | #endif |
148 | STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), |
148 | STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), |
149 | STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), |
149 | STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), |
150 | RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), |
150 | RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), |
151 | RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), |
151 | RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), |
… | |
… | |
195 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
195 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
196 | #if ENABLE_STYLES |
196 | #if ENABLE_STYLES |
197 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
197 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
198 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
198 | STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), |
199 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
199 | STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), |
200 | BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"), |
200 | BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), |
201 | #endif |
201 | #endif |
202 | #ifdef USE_XIM |
202 | #ifdef USE_XIM |
203 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
203 | STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), |
204 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
204 | STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), |
205 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
205 | STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), |
… | |
… | |
216 | #if XFT |
216 | #if XFT |
217 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
217 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
218 | #endif |
218 | #endif |
219 | #if ENABLE_FRILLS |
219 | #if ENABLE_FRILLS |
220 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
220 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
221 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"), |
221 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
222 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
222 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
223 | BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), |
223 | BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), |
224 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
224 | STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), |
225 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
225 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
226 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
226 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
227 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
227 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
228 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), |
228 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
229 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"), |
229 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
230 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
230 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
231 | #endif |
231 | #endif |
232 | #ifdef POINTER_BLANK |
232 | #ifdef POINTER_BLANK |
233 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
233 | RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), |
234 | #endif |
234 | #endif |
… | |
… | |
246 | #ifdef CUTCHAR_RESOURCE |
246 | #ifdef CUTCHAR_RESOURCE |
247 | RSTRG (Rs_cutchars, "cutchars", "string"), |
247 | RSTRG (Rs_cutchars, "cutchars", "string"), |
248 | #endif /* CUTCHAR_RESOURCE */ |
248 | #endif /* CUTCHAR_RESOURCE */ |
249 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
249 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
250 | #ifndef NO_SECONDARY_SCREEN |
250 | #ifndef NO_SECONDARY_SCREEN |
251 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), |
251 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
252 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), |
252 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
253 | #endif |
253 | #endif |
254 | #if ENABLE_PERL |
254 | #if ENABLE_PERL |
255 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO |
255 | RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO |
256 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
256 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
257 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
257 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
… | |
… | |
549 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
549 | rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; |
550 | } |
550 | } |
551 | } |
551 | } |
552 | else |
552 | else |
553 | { /* boolean value */ |
553 | { /* boolean value */ |
554 | set_option (optList[entry].flag & Optflag_mask, flag == resval_on); |
554 | set_option (1UL << optList[entry].index, flag == resval_on); |
555 | |
555 | |
556 | if (optList[entry].doff != -1) |
556 | if (optList[entry].doff != -1) |
557 | rs[optList[entry].doff] = flag; |
557 | rs[optList[entry].doff] = flag; |
558 | } |
558 | } |
559 | } |
559 | } |
… | |
… | |
774 | } |
774 | } |
775 | |
775 | |
776 | const char * |
776 | const char * |
777 | rxvt_term::x_resource (const char *name) |
777 | rxvt_term::x_resource (const char *name) |
778 | { |
778 | { |
779 | XrmDatabase database = XrmGetDatabase (xdisp); |
779 | XrmDatabase database = XrmGetDatabase (dpy); |
780 | |
780 | |
781 | const char *p = get_res (database, rs[Rs_name], name); |
781 | const char *p = get_res (database, rs[Rs_name], name); |
782 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
782 | const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name); |
783 | |
783 | |
784 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
784 | if (p == NULL || (p0 && strcmp (p, p0) == 0)) |
… | |
… | |
827 | || strcasecmp (p, "1") == 0; |
827 | || strcasecmp (p, "1") == 0; |
828 | |
828 | |
829 | if (optList_isReverse (entry)) |
829 | if (optList_isReverse (entry)) |
830 | s = !s; |
830 | s = !s; |
831 | |
831 | |
832 | set_option (optList[entry].flag & Optflag_mask, s); |
832 | set_option (1UL << optList[entry].index, s); |
833 | } |
833 | } |
834 | } |
834 | } |
835 | } |
835 | } |
836 | |
836 | |
837 | /* |
837 | /* |
838 | * [R5 or later]: enumerate the resource database |
838 | * [R5 or later]: enumerate the resource database |
839 | */ |
839 | */ |
840 | # ifdef KEYSYM_RESOURCE |
840 | # ifdef KEYSYM_RESOURCE |
841 | XrmDatabase database = XrmGetDatabase (xdisp); |
841 | XrmDatabase database = XrmGetDatabase (dpy); |
842 | XrmName name_prefix[3]; |
842 | XrmName name_prefix[3]; |
843 | XrmClass class_prefix[3]; |
843 | XrmClass class_prefix[3]; |
844 | |
844 | |
845 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
845 | name_prefix[0] = XrmStringToName (rs[Rs_name]); |
846 | name_prefix[1] = XrmStringToName ("keysym"); |
846 | name_prefix[1] = XrmStringToName ("keysym"); |