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.76 by root, Mon Jan 9 22:41:41 2006 UTC vs.
Revision 1.99 by ayin, Tue May 1 21:10:04 2007 UTC

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>
… …
20 * 20 *
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25/*----------------------------------------------------------------------*
26 * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
27 * default or with XGetDefault() (#define USE_XGETDEFAULT)
28 *----------------------------------------------------------------------*/
29 25
30#include "../config.h" /* NECESSARY */ 26#include "../config.h"
31#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h"
32#include "version.h" 28#include "version.h"
33 29
34#include <sys/utsname.h>
35
36#ifdef KEYSYM_RESOURCE 30#ifdef KEYSYM_RESOURCE
37#include "keyboard.h" 31# include "keyboard.h"
38#endif 32#endif
39 33
40/* place holders used for parsing command-line options */ 34/* place holders used for parsing command-line options */
41#define Optflag_Reverse 0x40000000UL 35#define Optflag_Reverse 1
42#define Optflag_Boolean 0x80000000UL 36#define Optflag_Boolean 2
43#define Optflag_mask 0x3fffffffUL
44 37
45/* #define DEBUG_RESOURCES */
46
47/*{{{ monolithic option/resource structure: */ 38/* monolithic option/resource structure: */
48/* 39/*
49 * `string' options MUST have a usage argument 40 * `string' options MUST have a usage argument
50 * `switch' and `boolean' options have no argument 41 * `switch' and `boolean' options have no argument
51 * 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 ()
52 */ 43 */
53 44
54/* INFO () - descriptive information only */ 45/* INFO () - descriptive information only */
55#define INFO(opt, arg, desc) \ 46#define INFO(opt, arg, desc) \
56 {0, -1, NULL, (opt), (arg), (desc)} 47 {0, 0, -1, NULL, (opt), (arg), (desc)}
57 48
58/* STRG () - command-line option, with/without resource */ 49/* STRG () - command-line option, with/without resource */
59#define STRG(rsp, kw, opt, arg, desc) \ 50#define STRG(rsp, kw, opt, arg, desc) \
60 {0, (rsp), (kw), (opt), (arg), (desc)} 51 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
61 52
62/* RSTRG () - resource/long-option */ 53/* RSTRG () - resource/long-option */
63#define RSTRG(rsp, kw, arg) \ 54#define RSTRG(rsp, kw, arg) \
64 {0, (rsp), (kw), NULL, (arg), NULL} 55 {0, 0, (rsp), (kw), NULL, (arg), NULL}
65 56
66/* BOOL () - regular boolean `-/+' flag */ 57/* BOOL () - regular boolean `-/+' flag */
67#define BOOL(rsp, kw, opt, flag, desc) \ 58#define BOOL(rsp, kw, opt, option, flag, desc) \
68 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)} 59 { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
69 60
70/* SWCH () - `-' flag */ 61/* SWCH () - `-' flag */
71#define SWCH(opt, flag, desc) \ 62#define SWCH(opt, option, flag, desc) \
72 { (flag), -1, NULL, (opt), NULL, (desc)} 63 { (option), (flag), -1, NULL, (opt), NULL, (desc)}
73 64
74/* convenient macros */ 65/* convenient macros */
75#define optList_strlen(i) \ 66#define optList_strlen(i) \
76 (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))
77#define optList_isBool(i) \ 68#define optList_isBool(i) \
… …
81#define optList_size \ 72#define optList_size \
82 (sizeof (optList) / sizeof (optList[0])) 73 (sizeof (optList) / sizeof (optList[0]))
83 74
84static const struct 75static const struct
85 { 76 {
77 const uint8_t index; /* Option index */
86 const unsigned long flag; /* Option flag */ 78 const uint8_t flag; /* Option flag */
87 const int doff; /* data offset */ 79 const int16_t doff; /* resource value index or -1 */
88 const char *kw; /* keyword */ 80 const char *kw; /* keyword */
89 const char *opt; /* option */ 81 const char *opt; /* option */
90 const char *arg; /* argument */ 82 const char *arg; /* argument */
91 const char *desc; /* description */ 83 const char *desc; /* description */
92 } 84 }
… …
94 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
95 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
96 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"),
97 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
98 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
99 SWCH ("C", Opt_console, "intercept console messages"), 91 SWCH ("C", Opt_console, 0, "intercept console messages"),
100 SWCH ("iconic", Opt_iconic, "start iconic"), 92 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
101 SWCH ("ic", Opt_iconic, NULL), /* short form */ 93 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 97 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
106#if HAVE_SCROLLBARS 98#if HAVE_SCROLLBARS
107 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 99 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
108 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 100 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
109 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"),
110 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"),
111 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 103 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
112 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"),
113#endif 105#endif
114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
115 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"),
116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
118#if TRANSPARENT 110#if TRANSPARENT
119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 112 SWCH ("tr", Opt_transparent, 0, NULL),
121# if TINTING 113# if TINTING
122 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
123# endif 115# endif
124#endif 116#endif
125#if OFF_FOCUS_FADING 117#if OFF_FOCUS_FADING
126 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"),
127 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"),
128#endif 120#endif
129#if TINTING 121#if TINTING
130 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 122 STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
131#endif 123#endif
132 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
133#ifndef NO_BELL 125#ifndef NO_BELL
134 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 126 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
135# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 127# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
136 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), 128 BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
137# endif 129# endif
138#endif 130#endif
139#ifdef META8_OPTION 131#ifdef META8_OPTION
140 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 132 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, 0, NULL),
141#endif 133#endif
142#ifdef MOUSE_WHEEL 134#ifdef MOUSE_WHEEL
143 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 135 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
144#endif 136#endif
145#if ENABLE_FRILLS 137#if ENABLE_FRILLS
146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 138 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
147 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"),
148 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), 140 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
149#endif 141#endif
150#if CURSOR_BLINK 142#if CURSOR_BLINK
151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 143 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, 0, "blinking cursor"),
152#endif 144#endif
153#ifdef POINTER_BLANK 145#ifdef POINTER_BLANK
154 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"),
155#endif 147#endif
156 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), 148 STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"),
157 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), 149 STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
158 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), 150 RSTRG (Rs_color + minCOLOR + 0, "color0", "color"),
159 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), 151 RSTRG (Rs_color + minCOLOR + 1, "color1", "color"),
… …
193 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
194#endif /* NO_CURSORCOLOR */ 186#endif /* NO_CURSORCOLOR */
195 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
196 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
197 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
198#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 190#ifdef XPM_BACKGROUND
199 RSTRG (Rs_path, "path", "search path"), 191 RSTRG (Rs_path, "path", "search path"),
200#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
201#ifdef XPM_BACKGROUND
202 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
203#endif /* XPM_BACKGROUND */
204#if (MENUBAR_MAX)
205 RSTRG (Rs_menu, "menu", "name[;tag]"),
206#endif 193#endif
207 /* fonts: command-line option = resource name */ 194 /* fonts: command-line option = resource name */
208 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
209#if ENABLE_STYLES 196#if ENABLE_STYLES
210 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
211 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
212 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
213 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"),
214#endif 201#endif
215#ifdef USE_XIM 202#ifdef USE_XIM
216 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
217 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"),
218 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"),
… …
224 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 211 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
225 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
226#if ENABLE_XEMBED 213#if ENABLE_XEMBED
227 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 214 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
228#endif 215#endif
216#if XFT
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218#endif
229#if ENABLE_FRILLS 219#if ENABLE_FRILLS
230 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, 0, "set override-redirect on the terminal window"),
231 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"),
232 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"),
233 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 224 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
234 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 225 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
235 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 226 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
236 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 227 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
237 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 228 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
238 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"),
239 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"),
240#endif 231#endif
241#ifdef POINTER_BLANK 232#ifdef POINTER_BLANK
242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
243#endif 234#endif
… …
255#ifdef CUTCHAR_RESOURCE 246#ifdef CUTCHAR_RESOURCE
256 RSTRG (Rs_cutchars, "cutchars", "string"), 247 RSTRG (Rs_cutchars, "cutchars", "string"),
257#endif /* CUTCHAR_RESOURCE */ 248#endif /* CUTCHAR_RESOURCE */
258 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 249 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
259#ifndef NO_SECONDARY_SCREEN 250#ifndef NO_SECONDARY_SCREEN
260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 251 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 252 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
262#endif 253#endif
263#if ENABLE_PERL 254#if ENABLE_PERL
264 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
265 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
266 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
267 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 258 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
268#endif 259#endif
269#if 0 && TODO 260#ifndef NO_RESOURCES
270#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
271 INFO ("xrm", "string", "X resource"), 261 INFO ("xrm", "string", "X resource"),
272#endif
273#endif 262#endif
274 INFO ("e", "command arg ...", "command to execute") 263 INFO ("e", "command arg ...", "command to execute")
275 }; 264 };
276 265
277#undef INFO 266#undef INFO
278#undef STRG 267#undef STRG
279#undef RSTRG 268#undef RSTRG
280#undef SWCH 269#undef SWCH
281#undef BOOL 270#undef BOOL
282/*}}} */
283 271
284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
285static const char optionsstring[] = "options: " 273static const char optionsstring[] = "options: "
274#if ENABLE_PERL
275 "perl,"
276#endif
286#if XFT 277#if XFT
287 "xft," 278 "xft,"
288#endif 279#endif
289#if ENABLE_STYLES 280#if ENABLE_STYLES
290 "styles," 281 "styles,"
… …
328 "transparent," 319 "transparent,"
329#endif 320#endif
330#if TINTING 321#if TINTING
331 "tint," 322 "tint,"
332#endif 323#endif
333#if defined(UTMP_SUPPORT)
334 "utmp,"
335#endif
336#if defined(MENUBAR)
337 "menubar,"
338#endif
339#if defined(USE_XIM) 324#if defined(USE_XIM)
340 "XIM," 325 "XIM,"
326#endif
327#if defined(NO_BACKSPACE_KEY)
328 "no_backspace,"
329#endif
330#if defined(NO_DELETE_KEY)
331 "no_delete,"
332#endif
333#if EIGHT_BIT_CONTROLS
334 "8bitctrls,"
335#endif
336#if defined(ENABLE_FRILLS)
337 "frills,"
338#endif
339#if defined(SELECTION_SCROLLING)
340 "selectionscrolling,"
341#endif
342#if MOUSE_WHEEL
343 "wheel,"
344#endif
345#if MOUSE_SLIP_WHEELING
346 "slipwheel,"
347#endif
348#if defined(SMART_RESIZE)
349 "smart-resize,"
350#endif
351#if defined(CURSOR_BLINK)
352 "cursorBlink,"
353#endif
354#if defined(POINTER_BLANK)
355 "pointerBlank,"
356#endif
357#if defined(NO_RESOURCES)
358 "NoResources,"
341#endif 359#endif
342 "scrollbars=" 360 "scrollbars="
343#if !defined(HAVE_SCROLLBARS) 361#if !defined(HAVE_SCROLLBARS)
344 "NONE" 362 "NONE"
345#else 363#else
… …
363# endif 381# endif
364# if defined(XTERM_SCROLLBAR) 382# if defined(XTERM_SCROLLBAR)
365 "xterm" 383 "xterm"
366# endif 384# endif
367#endif 385#endif
368 ","
369#if defined(NO_BACKSPACE_KEY)
370 "no_backspace,"
371#endif
372#if defined(NO_DELETE_KEY)
373 "no_delete,"
374#endif
375#if EIGHT_BIT_CONTROLS
376 "8bitctrls,"
377#endif
378#if !defined(NO_STRINGS)
379 "strings,"
380#endif
381#if defined(ENABLE_FRILLS)
382 "frills,"
383#endif
384#if defined(PREFER_24BIT)
385 "24bit,"
386#endif
387#if defined(SELECTION_SCROLLING)
388 "selectionscrolling,"
389#endif
390#if MOUSE_WHEEL
391 "wheel,"
392#endif
393#if MOUSE_SLIP_WHEELING
394 "slipwheel,"
395#endif
396#if defined(SMART_RESIZE)
397 "smart-resize,"
398#endif
399#if defined(CURSOR_BLINK)
400 "cursorBlink,"
401#endif
402#if defined(POINTER_BLANK)
403 "pointerBlank,"
404#endif
405#if defined(NO_RESOURCES)
406 "NoResources"
407#else
408# if defined(USE_XGETDEFAULT)
409 "XGetDefault"
410# else
411 ".Xdefaults"
412# endif
413#endif
414 "\nUsage: "; /* Usage */ 386 "\nUsage: "; /* Usage */
415 387
416#define INDENT 18 388#define INDENT 18
389
390const char rxvt_term::resval_undef [] = "<undef>";
391const char rxvt_term::resval_on [] = "on";
392const char rxvt_term::resval_off [] = "off";
417 393
418/*{{{ usage: */ 394/*{{{ usage: */
419/*----------------------------------------------------------------------*/ 395/*----------------------------------------------------------------------*/
420static void 396static void
421rxvt_usage (int type) 397rxvt_usage (int type)
… …
430 rxvt_log (" [-help] [--help]\n"); 406 rxvt_log (" [-help] [--help]\n");
431 407
432 for (col = 1, i = 0; i < optList_size; i++) 408 for (col = 1, i = 0; i < optList_size; i++)
433 if (optList[i].desc != NULL) 409 if (optList[i].desc != NULL)
434 { 410 {
435 int len = 0; 411 int len = 0;
436 412
437 if (!optList_isBool (i)) 413 if (!optList_isBool (i))
438 { 414 {
439 len = optList_strlen (i); 415 len = optList_strlen (i);
440 if (len > 0) 416 if (len > 0)
… …
507 483
508/*{{{ get command-line options before getting resources */ 484/*{{{ get command-line options before getting resources */
509void 485void
510rxvt_term::get_options (int argc, const char *const *argv) 486rxvt_term::get_options (int argc, const char *const *argv)
511{ 487{
512 int i, bad_option = 0; 488 int i, bad_option = 0;
513 static const char On[3] = "ON", Off[4] = "OFF";
514 489
515 for (i = 1; i < argc; i++) 490 for (i = 1; i < argc; i++)
516 { 491 {
517 unsigned int entry, longopt = 0; 492 unsigned int entry, longopt = 0;
518 const char *flag, *opt; 493 const char *flag, *opt;
519 494
520 opt = argv[i]; 495 opt = argv[i];
521#ifdef DEBUG_RESOURCES 496
522 fprintf (stderr, "argv[%d] = %s: ", i, opt);
523#endif
524 if (*opt == '-') 497 if (*opt == '-')
525 { 498 {
526 flag = On; 499 flag = resval_on;
500
527 if (*++opt == '-') 501 if (*++opt == '-')
528 longopt = *opt++; /* long option */ 502 longopt = *opt++; /* long option */
529 } 503 }
530 else if (*opt == '+') 504 else if (*opt == '+')
531 { 505 {
532 flag = Off; 506 flag = resval_off;
507
533 if (*++opt == '+') 508 if (*++opt == '+')
534 longopt = *opt++; /* long option */ 509 longopt = *opt++; /* long option */
535 } 510 }
536 else 511 else
537 { 512 {
… …
540 continue; 515 continue;
541 } 516 }
542 517
543 if (!strcmp (opt, "help")) 518 if (!strcmp (opt, "help"))
544 rxvt_usage (longopt ? 2 : 1); 519 rxvt_usage (longopt ? 2 : 1);
520
545 if (!strcmp (opt, "h")) 521 if (!strcmp (opt, "h"))
546 rxvt_usage (0); 522 rxvt_usage (0);
547 523
548 /* feature: always try to match long-options */ 524 /* feature: always try to match long-options */
549 for (entry = 0; entry < optList_size; entry++) 525 for (entry = 0; entry < optList_size; entry++)
… …
553 break; 529 break;
554 530
555 if (entry < optList_size) 531 if (entry < optList_size)
556 { 532 {
557 if (optList_isReverse (entry)) 533 if (optList_isReverse (entry))
558 flag = flag == On ? Off : On; 534 flag = flag == resval_on ? resval_off : resval_on;
559 535
560 if (optList_strlen (entry)) 536 if (optList_strlen (entry))
561 { 537 {
562 /* 538 /*
563 * special cases are handled in main.c:main () to allow 539 * special cases are handled in main.c:main () to allow
564 * X resources to set these values before we settle for 540 * X resources to set these values before we settle for
565 * default values 541 * default values
566 */ 542 */
567 543
568 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
545 {
546 if (flag == resval_on && !argv [i+1])
547 rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
548
569 rs[optList[entry].doff] = flag == On && argv[i+1] 549 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
570 ? argv[++i] : 0; 550 }
571 } 551 }
572 else 552 else
573 { /* boolean value */ 553 { /* boolean value */
574#ifdef DEBUG_RESOURCES 554 set_option (optList[entry].index, flag == resval_on);
575 fprintf (stderr, "boolean (%s,%s) = %s\n",
576 optList[entry].opt, optList[entry].kw, flag);
577#endif
578 set_option (optList[entry].flag & Optflag_mask, flag == On);
579 555
580 if (optList[entry].doff != -1) 556 if (optList[entry].doff != -1)
581 rs[optList[entry].doff] = flag; 557 rs[optList[entry].doff] = flag;
582 } 558 }
583 } 559 }
… …
615 * "rxvt" "keysym" "0xFF01" 591 * "rxvt" "keysym" "0xFF01"
616 * value will be a string 592 * value will be a string
617 */ 593 */
618/* ARGSUSED */ 594/* ARGSUSED */
619int 595int
620rxvt_define_key (XrmDatabase *database __attribute__((unused)), 596rxvt_define_key (XrmDatabase *database UNUSED,
621 XrmBindingList bindings __attribute__((unused)), 597 XrmBindingList bindings UNUSED,
622 XrmQuarkList quarks, 598 XrmQuarkList quarks,
623 XrmRepresentation *type __attribute__((unused)), 599 XrmRepresentation *type UNUSED,
624 XrmValue *value, 600 XrmValue *value,
625 XPointer closure __attribute__((unused))) 601 XPointer closure UNUSED)
626{ 602{
627 int last; 603 int last;
628 604
629 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 605 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
630 ; 606 ;
… …
780 keyboard->register_user_translation (sym, state, newarg); 756 keyboard->register_user_translation (sym, state, newarg);
781 return 1; 757 return 1;
782} 758}
783 759
784# endif /* KEYSYM_RESOURCE */ 760# endif /* KEYSYM_RESOURCE */
785
786# ifndef USE_XGETDEFAULT
787/*{{{ rxvt_get_xdefaults () */
788/*
789 * the matching algorithm used for memory-save fake resources
790 */
791void
792rxvt_term::get_xdefaults (FILE *stream, const char *name)
793{
794 unsigned int len;
795 char *str, buffer[256];
796
797 if (stream == NULL)
798 return;
799
800 len = strlen (name);
801 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
802 {
803 unsigned int entry, n;
804
805 while (*str && isspace (*str))
806 str++; /* leading whitespace */
807
808 if ((str[len] != '*' && str[len] != '.')
809 || (len && strncmp (str, name, len)))
810 continue;
811 str += (len + 1); /* skip `name*' or `name.' */
812
813# ifdef KEYSYM_RESOURCE
814 if (!parse_keysym (str, NULL))
815# endif /* KEYSYM_RESOURCE */
816 for (entry = 0; entry < optList_size; entry++)
817 {
818 const char *kw = optList[entry].kw;
819
820 if (kw == NULL)
821 continue;
822
823 n = strlen (kw);
824 if (str[n] == ':' && rxvt_Str_match (str, kw))
825 {
826 /* skip `keyword:' */
827 str += n + 1;
828 rxvt_Str_trim (str);
829 n = strlen (str);
830
831 if (n && rs[optList[entry].doff] == NULL)
832 {
833 /* not already set */
834 int s;
835 char *p = 0;
836
837 for (int o = 0;;)
838 {
839 p = (char *)rxvt_realloc (p, o + n + 1);
840 memcpy (p + o, str, n);
841 o += n;
842 p[o] = 0;
843
844 if (o == 0 || p[o - 1] != '\\') // continuation line
845 break;
846
847 o--; // eat "\"
848
849 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
850 break;
851
852 rxvt_Str_trim (str);
853 n = strlen (str);
854 }
855
856 rs[optList[entry].doff] = p;
857 allocated.push_back (p);
858
859 if (optList_isBool (entry))
860 {
861 s = strcasecmp (str, "true") == 0
862 || strcasecmp (str, "yes") == 0
863 || strcasecmp (str, "on") == 0
864 || strcmp (str, "1") == 0;
865
866 if (optList_isReverse (entry))
867 s = !s;
868
869 set_option (optList[entry].flag & Optflag_mask, s);
870 }
871 }
872
873 break;
874 }
875 }
876 }
877
878 rewind (stream);
879}
880
881/*}}} */
882# endif /* ! USE_XGETDEFAULT */
883#endif /* NO_RESOURCES */ 761#endif /* NO_RESOURCES */
884 762
885#ifdef USE_XGETDEFAULT 763static char *
886char *get_res (XrmDatabase database, const char *program, const char *option) 764get_res (XrmDatabase database, const char *program, const char *option)
887{ 765{
888 char resource[512]; 766 char resource[512];
889 char *type; 767 char *type;
890 XrmValue result; 768 XrmValue result;
891 769
892 snprintf (resource, sizeof (resource), "%s.%s", program, option); 770 snprintf (resource, sizeof (resource), "%s.%s", program, option);
893 XrmGetResource (database, resource, resource, &type, &result); 771 XrmGetResource (database, resource, resource, &type, &result);
894 772
895 return result.addr; 773 return result.addr;
896} 774}
897#endif
898 775
899/*{{{ read the resources files */ 776const char *
900/* 777rxvt_term::x_resource (const char *name)
901 * using XGetDefault () or the hand-rolled replacement 778{
902 */ 779 XrmDatabase database = XrmGetDatabase (dpy);
903/* ARGSUSED */ 780
781 const char *p = get_res (database, rs[Rs_name], name);
782 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
783
784 if (p == NULL || (p0 && strcmp (p, p0) == 0))
785 {
786 p = get_res (database, RESCLASS, name);
787#ifdef RESFALLBACK
788 if (p == NULL || (p0 && strcmp (p, p0) == 0))
789 p = get_res (database, RESFALLBACK, name);
790#endif
791 }
792
793 if (p == NULL && p0)
794 p = p0;
795
796 return p;
797}
798
904void 799void
905rxvt_term::extract_resources () 800rxvt_term::extract_resources ()
906{ 801{
907 dDisp;
908
909#ifndef NO_RESOURCES 802#ifndef NO_RESOURCES
910
911 char *homedir = (char *)getenv ("HOME");
912 char fname[1024];
913
914# if defined XAPPLOADDIR
915# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
916 /* Compute the path of the possibly available localized Rxvt file */
917 char localepath[1024];
918
919 if (locale)
920 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
921 else
922 localepath[0] = 0;
923# endif
924# endif
925
926# ifdef USE_XGETDEFAULT
927 /*
928 * get resources using the X library function
929 */
930 int entry;
931
932 char *displayResource, *xe;
933 XrmName name_prefix[3];
934 XrmClass class_prefix[3];
935 XrmDatabase database, rdb1;
936
937 database = NULL;
938
939 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
940
941 // 6. System wide per application default file.
942 /* Add in Rxvt file */
943# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
944 if (*localepath
945 && ((rdb1 = XrmGetFileDatabase (localepath))
946 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
947# endif
948 XrmMergeDatabases (rdb1, &database);
949
950 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
951 if ((xe = (char *)getenv ("XAPPLRESDIR")))
952 {
953 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
954
955 if ((rdb1 = XrmGetFileDatabase (fname)))
956 XrmMergeDatabases (rdb1, &database);
957 }
958
959 // 5. User's per application default file.
960 // none
961
962 // 4. User's defaults file.
963 /* Get any Xserver defaults */
964 displayResource = XResourceManagerString (disp);
965 if (displayResource != NULL)
966 {
967 if ((rdb1 = XrmGetStringDatabase (displayResource)))
968 XrmMergeDatabases (rdb1, &database);
969 }
970 else if (homedir)
971 {
972 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
973
974 if ((rdb1 = XrmGetFileDatabase (fname)))
975 XrmMergeDatabases (rdb1, &database);
976 }
977
978 /* Get screen specific resources */
979 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
980 if (displayResource != NULL)
981 {
982 if ((rdb1 = XrmGetStringDatabase (displayResource)))
983 /* Merge with screen-independent resources */
984 XrmMergeDatabases (rdb1, &database);
985
986 XFree (displayResource);
987 }
988
989 // 3. User's per host defaults file
990 /* Add in XENVIRONMENT file */
991 if ((xe = (char *)getenv ("XENVIRONMENT"))
992 && (rdb1 = XrmGetFileDatabase (xe)))
993 XrmMergeDatabases (rdb1, &database);
994 else if (homedir)
995 {
996 struct utsname un;
997
998 if (!uname (&un))
999 {
1000 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
1001
1002 if ((rdb1 = XrmGetFileDatabase (fname)))
1003 XrmMergeDatabases (rdb1, &database);
1004 }
1005 }
1006
1007 xrmdatabase = database;
1008
1009 /* 803 /*
1010 * Query resources for options that affect us 804 * Query resources for options that affect us
1011 */ 805 */
1012 for (entry = 0; entry < optList_size; entry++) 806 for (int entry = 0; entry < optList_size; entry++)
1013 { 807 {
1014 int s; 808 int s;
1015 char *p, *p0;
1016 const char *kw = optList[entry].kw; 809 const char *kw = optList[entry].kw;
1017 810
1018 if (kw == NULL || rs[optList[entry].doff] != NULL) 811 if (kw == NULL || rs[optList[entry].doff] != NULL)
1019 continue; /* previously set */ 812 continue; // previously set
1020 813
1021 p = get_res (database, rs[Rs_name], kw); 814 const char *p = x_resource (kw);
1022 p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1023 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1024 {
1025 p = get_res (database, RESCLASS, kw);
1026#ifdef RESFALLBACK
1027 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1028 p = get_res (database, RESFALLBACK, kw);
1029#endif
1030 }
1031
1032 if (p == NULL && p0)
1033 p = p0;
1034 815
1035 if (p) 816 if (p)
1036 { 817 {
818 p = strdup (p);
819 allocated.push_back ((void *)p);
1037 rs[optList[entry].doff] = p; 820 rs[optList[entry].doff] = p;
1038 821
1039 if (optList_isBool (entry)) 822 if (optList_isBool (entry))
1040 { 823 {
1041 s = strcasecmp (p, "TRUE") == 0 824 s = strcasecmp (p, "TRUE") == 0
… …
1044 || strcasecmp (p, "1") == 0; 827 || strcasecmp (p, "1") == 0;
1045 828
1046 if (optList_isReverse (entry)) 829 if (optList_isReverse (entry))
1047 s = !s; 830 s = !s;
1048 831
1049 set_option (optList[entry].flag & Optflag_mask, s); 832 set_option (optList[entry].index, s);
1050 } 833 }
1051 } 834 }
1052 } 835 }
1053 836
1054 /* 837 /*
1055 * [R5 or later]: enumerate the resource database 838 * [R5 or later]: enumerate the resource database
1056 */ 839 */
1057# ifdef KEYSYM_RESOURCE 840# ifdef KEYSYM_RESOURCE
841 XrmDatabase database = XrmGetDatabase (dpy);
842 XrmName name_prefix[3];
843 XrmClass class_prefix[3];
844
1058 name_prefix[0] = XrmStringToName (rs[Rs_name]); 845 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1059 name_prefix[1] = XrmStringToName ("keysym"); 846 name_prefix[1] = XrmStringToName ("keysym");
1060 name_prefix[2] = NULLQUARK; 847 name_prefix[2] = NULLQUARK;
1061 class_prefix[0] = XrmStringToName (RESCLASS); 848 class_prefix[0] = XrmStringToName (RESCLASS);
1062 class_prefix[1] = XrmStringToName ("Keysym"); 849 class_prefix[1] = XrmStringToName ("Keysym");
… …
1073 XrmEnumerateDatabase (database, name_prefix, class_prefix, 860 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1074 XrmEnumOneLevel, rxvt_define_key, NULL); 861 XrmEnumOneLevel, rxvt_define_key, NULL);
1075# endif 862# endif
1076# endif 863# endif
1077 864
1078# else /* USE_XGETDEFAULT */
1079 /* get resources the hard way, but save lots of memory */
1080 FILE *fd = NULL;
1081
1082 if (homedir)
1083 {
1084 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1085
1086 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1087 {
1088 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1089
1090 if ((fd = fopen (fname, "r")) != NULL)
1091 break;
1092 }
1093 }
1094 /*
1095 * The normal order to match resources is the following:
1096 * @ global resources (partial match, ~/.Xdefaults)
1097 * @ application file resources (XAPPLOADDIR/Rxvt)
1098 * @ class resources (~/.Xdefaults)
1099 * @ private resources (~/.Xdefaults)
1100 *
1101 * However, for the hand-rolled resources, the matching algorithm
1102 * checks if a resource string value has already been allocated
1103 * and won't overwrite it with (in this case) a less specific
1104 * resource value.
1105 *
1106 * This avoids multiple allocation. Also, when we've called this
1107 * routine command-line string options have already been applied so we
1108 * needn't to allocate for those resources.
1109 *
1110 * So, search in resources from most to least specific.
1111 *
1112 * Also, use a special sub-class so that we can use either or both of
1113 * "XTerm" and "Rxvt" as class names.
1114 */
1115
1116 get_xdefaults (fd, rs[Rs_name]);
1117 get_xdefaults (fd, RESCLASS);
1118# ifdef RESFALLBACK
1119 get_xdefaults (fd, RESFALLBACK);
1120# endif
1121
1122# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1123 {
1124 FILE *ad = NULL;
1125
1126# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1127 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1128# endif
1129 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1130 if (ad != NULL)
1131 {
1132 get_xdefaults (ad, RESCLASS);
1133 get_xdefaults (ad, "");
1134 fclose (ad);
1135 }
1136 }
1137# endif /* XAPPLOADDIR */
1138
1139 get_xdefaults (fd, ""); /* partial match */
1140 if (fd != NULL)
1141 fclose (fd);
1142# endif /* USE_XGETDEFAULT */
1143
1144#endif /* NO_RESOURCES */ 865#endif /* NO_RESOURCES */
1145} 866}
1146 867
1147/*}}} */
1148/*----------------------- end-of-file (C source) -----------------------*/ 868/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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