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.28 by root, Fri Jul 30 22:36:42 2004 UTC vs.
Revision 1.69 by root, Wed Jan 4 04:42:45 2006 UTC

… …
28 *----------------------------------------------------------------------*/ 28 *----------------------------------------------------------------------*/
29 29
30#include "../config.h" /* NECESSARY */ 30#include "../config.h" /* NECESSARY */
31#include "rxvt.h" /* NECESSARY */ 31#include "rxvt.h" /* NECESSARY */
32#include "version.h" 32#include "version.h"
33#include "xdefaults.intpro" /* PROTOS for internal routines */ 33
34#include <sys/utsname.h>
35
36#ifdef KEYSYM_RESOURCE
37#include "keyboard.h"
38#endif
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
34 44
35/* #define DEBUG_RESOURCES */ 45/* #define DEBUG_RESOURCES */
36
37static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
38 46
39/*{{{ monolithic option/resource structure: */ 47/*{{{ monolithic option/resource structure: */
40/* 48/*
41 * `string' options MUST have a usage argument 49 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 50 * `switch' and `boolean' options have no argument
… …
55#define RSTRG(rsp, kw, arg) \ 63#define RSTRG(rsp, kw, arg) \
56 {0, (rsp), (kw), NULL, (arg), NULL} 64 {0, (rsp), (kw), NULL, (arg), NULL}
57 65
58/* BOOL () - regular boolean `-/+' flag */ 66/* BOOL () - regular boolean `-/+' flag */
59#define BOOL(rsp, kw, opt, flag, desc) \ 67#define BOOL(rsp, kw, opt, flag, desc) \
60 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 68 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
61 69
62/* SWCH () - `-' flag */ 70/* SWCH () - `-' flag */
63#define SWCH(opt, flag, desc) \ 71#define SWCH(opt, flag, desc) \
64 { (flag), -1, NULL, (opt), NULL, (desc)} 72 { (flag), -1, NULL, (opt), NULL, (desc)}
65 73
66/* convenient macros */ 74/* convenient macros */
67#define optList_strlen(i) \ 75#define optList_strlen(i) \
68 (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))
69#define optList_isBool(i) \ 77#define optList_isBool(i) \
70 (optList[i].flag & Opt_Boolean) 78 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 79#define optList_isReverse(i) \
72 (optList[i].flag & Opt_Reverse) 80 (optList[i].flag & Optflag_Reverse)
73#define optList_size() \ 81#define optList_size \
74 (sizeof (optList) / sizeof (optList[0])) 82 (sizeof (optList) / sizeof (optList[0]))
75 83
76static const struct 84static const struct
77 { 85 {
78 const unsigned long flag; /* Option flag */ 86 const unsigned long flag; /* Option flag */
… …
92 SWCH ("iconic", Opt_iconic, "start iconic"), 100 SWCH ("iconic", Opt_iconic, "start iconic"),
93 SWCH ("ic", Opt_iconic, NULL), /* short form */ 101 SWCH ("ic", Opt_iconic, NULL), /* short form */
94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 104 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
97#ifdef HAVE_SCROLLBARS 106#if HAVE_SCROLLBARS
107 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
98 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 108 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
99 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), 109 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
100 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"),
111 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
112 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
101#endif 113#endif
102 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
103 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"),
104 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
105 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
106#ifdef TRANSPARENT 118#if TRANSPARENT
107 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
108 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
109 SWCH ("tr", Opt_transparent, NULL), 120 SWCH ("tr", Opt_transparent, NULL),
121# if TINTING
122 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
123# endif
124#endif
125#if OFF_FOCUS_FADING
126 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"),
128#endif
110#if TINTING 129#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
112#endif
113#endif
114#ifdef OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."),
116#endif
117#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), 130 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
119#endif 131#endif
120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 132 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
121#ifndef NO_BELL 133#ifndef NO_BELL
122 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 134 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
… …
128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 140 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
129#endif 141#endif
130#ifdef MOUSE_WHEEL 142#ifdef MOUSE_WHEEL
131 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), 143 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
132#endif 144#endif
133#ifndef NO_FRILLS 145#if ENABLE_FRILLS
134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), 146 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
135 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), 147 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
148 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"),
136#endif 149#endif
137#ifdef CURSOR_BLINK 150#if CURSOR_BLINK
138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 151 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
139#endif 152#endif
140#ifdef POINTER_BLANK 153#ifdef POINTER_BLANK
141 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), 154 BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
142#endif 155#endif
… …
159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 172 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 173 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 174 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
162#endif /* NO_BRIGHTCOLOR */ 175#endif /* NO_BRIGHTCOLOR */
163#ifndef NO_BOLD_UNDERLINE_REVERSE 176#ifndef NO_BOLD_UNDERLINE_REVERSE
164 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
165 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 177 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
178 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
166 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 179 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
167 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 180 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 181#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
182#if ENABLE_FRILLS
183 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
184#endif
169#ifdef KEEP_SCROLLCOLOR 185#ifdef KEEP_SCROLLCOLOR
170 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 186 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
171 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 187 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
172#endif /* KEEP_SCROLLCOLOR */ 188#endif /* KEEP_SCROLLCOLOR */
173#ifdef OPTION_HC 189#ifdef OPTION_HC
174 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 190 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
175#endif 191#endif
192#ifndef NO_CURSORCOLOR
193 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
194 /* command-line option = resource name */
195 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
196#endif /* NO_CURSORCOLOR */
197 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
198 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
199 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
176#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 200#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
177 RSTRG (Rs_path, "path", "search path"), 201 RSTRG (Rs_path, "path", "search path"),
178#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 202#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
179#ifdef XPM_BACKGROUND 203#ifdef XPM_BACKGROUND
180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 204 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
181#endif /* XPM_BACKGROUND */ 205#endif /* XPM_BACKGROUND */
182#if (MENUBAR_MAX) 206#if (MENUBAR_MAX)
183 RSTRG (Rs_menu, "menu", "name[;tag]"), 207 RSTRG (Rs_menu, "menu", "name[;tag]"),
184#endif 208#endif
209 /* fonts: command-line option = resource name */
185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 210 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
186 /* fonts: command-line option = resource name */ 211#if ENABLE_STYLES
212 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
213 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
214 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
215 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"),
216#endif
187#ifdef USE_XIM 217#ifdef USE_XIM
188 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 218 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
189 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 219 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
190#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
191 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 220 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
192#endif 221 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
193#endif /* USE_XIM */ 222#endif /* USE_XIM */
194 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"), 223 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
195 STRG (Rs_title, "title", "title", "string", "title name for window"), 224 STRG (Rs_title, "title", "title", "string", "title name for window"),
196 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 225 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
197 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 226 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
198#ifndef NO_CURSORCOLOR
199 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
200 /* command-line option = resource name */
201 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
202#endif /* NO_CURSORCOLOR */
203 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
204 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
205 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
206 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 227 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
207#ifndef NO_FRILLS 228#if ENABLE_XEMBED
229 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
230#endif
231#if ENABLE_FRILLS
232 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
233 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
208 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 234 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 235 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 236 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 237 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
212#endif 238 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
213#ifndef NO_LINESPACE
214 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"),
215#endif 240#endif
216 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
217#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
218 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
219#endif 243#endif
220#ifndef NO_BACKSPACE_KEY 244#ifndef NO_BACKSPACE_KEY
221 RSTRG (Rs_backspace_key, "backspacekey", "string"), 245 RSTRG (Rs_backspace_key, "backspacekey", "string"),
222#endif 246#endif
223#ifndef NO_DELETE_KEY 247#ifndef NO_DELETE_KEY
224 RSTRG (Rs_delete_key, "deletekey", "string"), 248 RSTRG (Rs_delete_key, "deletekey", "string"),
225#endif 249#endif
226 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 250 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
227 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
228#ifdef HAVE_SCROLLBARS
229 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
230#endif
231#ifdef PRINTPIPE 251#ifdef PRINTPIPE
232 RSTRG (Rs_print_pipe, "print-pipe", "string"), 252 RSTRG (Rs_print_pipe, "print-pipe", "string"),
233#endif 253#endif
234 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"),
235 INFO ("xrm", "string", "X resource"),
236#ifdef CUTCHAR_RESOURCE 255#ifdef CUTCHAR_RESOURCE
237 RSTRG (Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
238#endif /* CUTCHAR_RESOURCE */ 257#endif /* CUTCHAR_RESOURCE */
239 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 258 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
240#ifndef NO_SECONDARY_SCREEN 259#ifndef NO_SECONDARY_SCREEN
241 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
242 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
243#endif 262#endif
263#if ENABLE_PERL
264 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),
265 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),
266 STRG (Rs_perl_ext, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable"),
267#endif
268#if 0 && TODO
269#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
270 INFO ("xrm", "string", "X resource"),
271#endif
272#endif
244 INFO ("e", "command arg ...", "command to execute") 273 INFO ("e", "command arg ...", "command to execute")
245 }; 274 };
246 275
247#undef INFO 276#undef INFO
248#undef STRG 277#undef STRG
249#undef RSTRG 278#undef RSTRG
250#undef SWCH 279#undef SWCH
251#undef BOOL 280#undef BOOL
252/*}}} */ 281/*}}} */
253 282
254static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; 283static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
255static const char optionsstring[] = "Options: " 284static const char optionsstring[] = "options: "
285#if XFT
286 "xft,"
287#endif
288#if ENABLE_STYLES
289 "styles,"
290#endif
291#if ENABLE_COMBINING
292 "combining,"
293#endif
294#if TEXT_BLINK
295 "blink,"
296#endif
297#if ISO_14755
298 "iso14755,"
299#endif
300#if UNICODE_3
301 "unicode3,"
302#endif
303 "encodings=eu+vn"
304#if ENCODING_JP
305 "+jp"
306#endif
307#if ENCODING_JP_EXT
308 "+jp-ext"
309#endif
310#if ENCODING_KR
311 "+kr"
312#endif
313#if ENCODING_ZH
314 "+zh"
315#endif
316#if ENCODING_ZH_EXT
317 "+zh-ext"
318#endif
319 ","
320#if OFF_FOCUS_FADING
321 "fade,"
322#endif
256#if defined(XPM_BACKGROUND) 323#if defined(XPM_BACKGROUND)
257 "XPM," 324 "XPM,"
258#endif 325#endif
259#if defined(TRANSPARENT) 326#if defined(TRANSPARENT)
260 "transparent," 327 "transparent,"
261#endif 328#endif
329#if TINTING
330 "tint,"
331#endif
262#if defined(UTMP_SUPPORT) 332#if defined(UTMP_SUPPORT)
263 "utmp," 333 "utmp,"
264#endif 334#endif
265#if defined(MENUBAR) 335#if defined(MENUBAR)
266 "menubar," 336 "menubar,"
267#endif
268#if !defined(NO_FRILLS)
269 "frills,"
270#endif
271#if !defined(NO_LINESPACE)
272 "linespace,"
273#endif
274#if defined(PREFER_24BIT)
275 "24bit,"
276#endif 337#endif
277#if defined(USE_XIM) 338#if defined(USE_XIM)
278 "XIM," 339 "XIM,"
279#endif 340#endif
280 "scrollbars=" 341 "scrollbars="
… …
308 "no_backspace," 369 "no_backspace,"
309#endif 370#endif
310#if defined(NO_DELETE_KEY) 371#if defined(NO_DELETE_KEY)
311 "no_delete," 372 "no_delete,"
312#endif 373#endif
374#if EIGHT_BIT_CONTROLS
375 "8bitctrls,"
376#endif
313#if !defined(NO_STRINGS) 377#if !defined(NO_STRINGS)
314 "strings," 378 "strings,"
315#endif 379#endif
316#if defined(TTY_256COLOR) 380#if defined(ENABLE_FRILLS)
381 "frills,"
382#endif
383#if defined(PREFER_24BIT)
317 "256colour," 384 "24bit,"
385#endif
386#if defined(SELECTION_SCROLLING)
387 "selectionscrolling,"
388#endif
389#if MOUSE_WHEEL
390 "wheel,"
391#endif
392#if MOUSE_SLIP_WHEELING
393 "slipwheel,"
394#endif
395#if defined(SMART_RESIZE)
396 "smart-resize,"
397#endif
398#if defined(CURSOR_BLINK)
399 "cursorBlink,"
400#endif
401#if defined(POINTER_BLANK)
402 "pointerBlank,"
318#endif 403#endif
319#if defined(NO_RESOURCES) 404#if defined(NO_RESOURCES)
320 "NoResources" 405 "NoResources"
321#else 406#else
322# if defined(USE_XGETDEFAULT) 407# if defined(USE_XGETDEFAULT)
… …
341 switch (type) 426 switch (type)
342 { 427 {
343 case 0: /* brief listing */ 428 case 0: /* brief listing */
344 rxvt_log (" [-help] [--help]\n"); 429 rxvt_log (" [-help] [--help]\n");
345 430
346 for (col = 1, i = 0; i < optList_size (); i++) 431 for (col = 1, i = 0; i < optList_size; i++)
347 if (optList[i].desc != NULL) 432 if (optList[i].desc != NULL)
348 { 433 {
349 int len = 0; 434 int len = 0;
350 435
351 if (!optList_isBool (i)) 436 if (!optList_isBool (i))
… …
355 len++; /* account for space */ 440 len++; /* account for space */
356 } 441 }
357#ifdef DEBUG_STRICT 442#ifdef DEBUG_STRICT
358 assert (optList[i].opt != NULL); 443 assert (optList[i].opt != NULL);
359#endif 444#endif
360 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 445 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
361 col += len; 446 col += len;
362 if (col > 79) 447 if (col > 79)
363 { /* assume regular width */ 448 { /* assume regular width */
364 rxvt_log ("\n"); 449 rxvt_log ("\n");
365 col = 1 + len; 450 col = 1 + len;
… …
374 break; 459 break;
375 460
376 case 1: /* full command-line listing */ 461 case 1: /* full command-line listing */
377 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 462 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
378 463
379 for (i = 0; i < optList_size (); i++) 464 for (i = 0; i < optList_size; i++)
380 if (optList[i].desc != NULL) 465 if (optList[i].desc != NULL)
381 { 466 {
382#ifdef DEBUG_STRICT 467#ifdef DEBUG_STRICT
383 assert (optList[i].opt != NULL); 468 assert (optList[i].opt != NULL);
384#endif 469#endif
385 rxvt_log (" %s%s %-*s%s%s\n", 470 rxvt_log (" %s%s %-*s%s%s\n",
386 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 471 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
387 (INDENT - STRLEN (optList[i].opt) 472 (INDENT - strlen (optList[i].opt)
388 + (optList_isBool (i) ? 0 : 2)), 473 + (optList_isBool (i) ? 0 : 2)),
389 (optList[i].arg ? optList[i].arg : ""), 474 (optList[i].arg ? optList[i].arg : ""),
390 (optList_isBool (i) ? "turn on/off " : ""), 475 (optList_isBool (i) ? "turn on/off " : ""),
391 optList[i].desc); 476 optList[i].desc);
392 } 477 }
… …
395 480
396 case 2: /* full resource listing */ 481 case 2: /* full resource listing */
397 rxvt_log (" [options] [-e command args]\n\n" 482 rxvt_log (" [options] [-e command args]\n\n"
398 "where resources (long-options) include:\n"); 483 "where resources (long-options) include:\n");
399 484
400 for (i = 0; i < optList_size (); i++) 485 for (i = 0; i < optList_size; i++)
401 if (optList[i].kw != NULL) 486 if (optList[i].kw != NULL)
402 rxvt_log (" %s: %*s%s\n", 487 rxvt_log (" %s: %*s%s\n",
403 optList[i].kw, 488 optList[i].kw,
404 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 489 (INDENT - strlen (optList[i].kw)), "", /* XXX */
405 (optList_isBool (i) ? "boolean" : optList[i].arg)); 490 (optList_isBool (i) ? "boolean" : optList[i].arg));
406#ifdef KEYSYM_RESOURCE 491#ifdef KEYSYM_RESOURCE
407 rxvt_log (" " "keysym.sym" ": %*s%s\n", 492 rxvt_log (" " "keysym.sym" ": %*s%s\n",
408 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 493 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
409 "keysym"); 494 "keysym");
… …
426 int i, bad_option = 0; 511 int i, bad_option = 0;
427 static const char On[3] = "ON", Off[4] = "OFF"; 512 static const char On[3] = "ON", Off[4] = "OFF";
428 513
429 for (i = 1; i < argc; i++) 514 for (i = 1; i < argc; i++)
430 { 515 {
431 unsigned int entry, longopt = 0; 516 unsigned int entry, longopt = 0;
432 const char *flag, *opt; 517 const char *flag, *opt;
433 518
434 opt = argv[i]; 519 opt = argv[i];
435#ifdef DEBUG_RESOURCES 520#ifdef DEBUG_RESOURCES
436 fprintf (stderr, "argv[%d] = %s: ", i, opt); 521 fprintf (stderr, "argv[%d] = %s: ", i, opt);
437#endif 522#endif
… …
452 bad_option = 1; 537 bad_option = 1;
453 rxvt_warn ("\"%s\": malformed option.\n", opt); 538 rxvt_warn ("\"%s\": malformed option.\n", opt);
454 continue; 539 continue;
455 } 540 }
456 541
457 if (!STRCMP (opt, "help")) 542 if (!strcmp (opt, "help"))
458 rxvt_usage (longopt ? 2 : 1); 543 rxvt_usage (longopt ? 2 : 1);
459 if (!STRCMP (opt, "h")) 544 if (!strcmp (opt, "h"))
460 rxvt_usage (0); 545 rxvt_usage (0);
461 546
462 /* feature: always try to match long-options */ 547 /* feature: always try to match long-options */
463 for (entry = 0; entry < optList_size (); entry++) 548 for (entry = 0; entry < optList_size; entry++)
464 if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw)) 549 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
465 || (!longopt 550 || (!longopt
466 && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) 551 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
467 break; 552 break;
468 553
469 if (entry < optList_size ()) 554 if (entry < optList_size)
470 { 555 {
471 if (optList_isReverse (entry)) 556 if (optList_isReverse (entry))
472 flag = flag == On ? Off : On; 557 flag = flag == On ? Off : On;
473 558
474 if (optList_strlen (entry)) 559 if (optList_strlen (entry))
… …
488#ifdef DEBUG_RESOURCES 573#ifdef DEBUG_RESOURCES
489 fprintf (stderr, "boolean (%s,%s) = %s\n", 574 fprintf (stderr, "boolean (%s,%s) = %s\n",
490 optList[entry].opt, optList[entry].kw, flag); 575 optList[entry].opt, optList[entry].kw, flag);
491#endif 576#endif
492 if (flag == On) 577 if (flag == On)
493 Options |= (optList[entry].flag); 578 SET_OPTION (optList[entry].flag & Optflag_mask);
494 else 579 else
495 Options &= ~ (optList[entry].flag); 580 CLR_OPTION (optList[entry].flag & Optflag_mask);
496 581
497 if (optList[entry].doff != -1) 582 if (optList[entry].doff != -1)
498 rs[optList[entry].doff] = flag; 583 rs[optList[entry].doff] = flag;
499 } 584 }
500 } 585 }
501 else 586 else
502#ifdef KEYSYM_RESOURCE 587#ifdef KEYSYM_RESOURCE
503 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 588 /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
504 if (rxvt_Str_match (opt, "keysym.")) 589 if (rxvt_Str_match (opt, "keysym."))
505 { 590 {
506 const char *str = argv[++i]; 591 const char *str = argv[++i];
507 592
508 if (str != NULL) 593 if (str != NULL)
… …
539 XrmQuarkList quarks, 624 XrmQuarkList quarks,
540 XrmRepresentation *type __attribute__((unused)), 625 XrmRepresentation *type __attribute__((unused)),
541 XrmValue *value, 626 XrmValue *value,
542 XPointer closure __attribute__((unused))) 627 XPointer closure __attribute__((unused)))
543{ 628{
544 int last; 629 int last;
545 630
546 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 631 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
547 ; 632 ;
633
548 last--; 634 last--;
549 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 635 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
550 return False; 636 return False;
551} 637}
552 638
… …
557 * arg will be 643 * arg will be
558 * NULL for ~/.Xdefaults and 644 * NULL for ~/.Xdefaults and
559 * non-NULL for command-line options (need to allocate) 645 * non-NULL for command-line options (need to allocate)
560 */ 646 */
561#define NEWARGLIM 500 /* `reasonable' size */ 647#define NEWARGLIM 500 /* `reasonable' size */
648
649struct keysym_vocabulary_t
650{
651 const char *name;
652 unsigned short len;
653 unsigned short value;
654};
655keysym_vocabulary_t keysym_vocabulary[] =
656{
657 { "ISOLevel3", 9, Level3Mask },
658 { "AppKeypad", 9, AppKeypadMask },
659 { "Control", 7, ControlMask },
660 { "NumLock", 7, NumLockMask },
661 { "Shift", 5, ShiftMask },
662 { "Meta", 4, MetaMask },
663 { "Lock", 4, LockMask },
664 { "Mod1", 4, Mod1Mask },
665 { "Mod2", 4, Mod2Mask },
666 { "Mod3", 4, Mod3Mask },
667 { "Mod4", 4, Mod4Mask },
668 { "Mod5", 4, Mod5Mask },
669 { "I", 1, Level3Mask },
670 { "K", 1, AppKeypadMask },
671 { "C", 1, ControlMask },
672 { "N", 1, NumLockMask },
673 { "S", 1, ShiftMask },
674 { "M", 1, MetaMask },
675 { "A", 1, MetaMask },
676 { "L", 1, LockMask },
677 { "1", 1, Mod1Mask },
678 { "2", 1, Mod2Mask },
679 { "3", 1, Mod3Mask },
680 { "4", 1, Mod4Mask },
681 { "5", 1, Mod5Mask },
682};
683
562int 684int
563rxvt_term::parse_keysym (const char *str, const char *arg) 685rxvt_term::parse_keysym (const char *str, const char *arg)
564{ 686{
565 int n, sym; 687 int n, sym;
566 char *key_string, *newarg = NULL; 688 unsigned int state = 0;
689 const char *pmodend = NULL;
690 char *newarg = NULL;
567 char newargstr[NEWARGLIM]; 691 char newargstr[NEWARGLIM];
568 692
569 if (arg == NULL) 693 if (arg == NULL)
570 { 694 {
571 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 695 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
572 return 0; 696 return 0;
697
573 str += n; /* skip `keysym.' */ 698 str += n; /* skip `keysym.' */
699 if ((pmodend = strchr (str, ':')) < str)
700 return -1;
701 }
702 else
703 pmodend = str + strlen(str);
704
705 for (--pmodend; str < pmodend; --pmodend)
706 if (*pmodend == '-')
707 break;
708
709 while (str < pmodend)
574 } 710 {
711 unsigned int i;
712
713 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
714 {
715 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
716 {
717 state |= keysym_vocabulary[i].value;
718 str += keysym_vocabulary[i].len;
719 break;
720 }
721 }
722
723 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
724 return -1;
725
726 if (*str == '-')
727 ++str;
728 }
729
575 /* some scanf () have trouble with a 0x prefix */ 730 /* some scanf () have trouble with a 0x prefix */
576 if (isdigit (str[0]))
577 {
578 if (str[0] == '0' && toupper (str[1]) == 'X') 731 if (str[0] == '0' && toupper (str[1]) == 'X')
732 {
579 str += 2; 733 str += 2;
734
580 if (arg) 735 if (arg)
581 { 736 {
582 if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) 737 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
583 return -1; 738 return -1;
584 } 739 }
585 else 740 else
586 { 741 {
587 if (sscanf (str, "%x:", &sym) != 1) 742 if (sscanf (str, "%x:", &sym) != 1)
588 return -1; 743 return -1;
589 744
590 /* cue to ':', it's there since sscanf () worked */ 745 /* cue to ':', it's there since sscanf () worked */
591 STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); 746 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
592 newargstr[NEWARGLIM - 1] = '\0'; 747 newargstr[NEWARGLIM - 1] = '\0';
593 newarg = newargstr; 748 newarg = newargstr;
594 } 749 }
595 } 750 }
596 else 751 else
597 { 752 {
598 /* 753 /*
599 * convert keysym name to keysym number 754 * convert keysym name to keysym number
600 */ 755 */
601 STRNCPY (newargstr, str, NEWARGLIM - 1); 756 strncpy (newargstr, str, NEWARGLIM - 1);
602 newargstr[NEWARGLIM - 1] = '\0'; 757 newargstr[NEWARGLIM - 1] = '\0';
758
603 if (arg == NULL) 759 if (arg == NULL)
604 { 760 {
605 if ((newarg = STRCHR (newargstr, ':')) == NULL) 761 if ((newarg = strchr (newargstr, ':')) == NULL)
606 return -1; 762 return -1;
763
607 *newarg++ = '\0'; /* terminate keysym name */ 764 *newarg++ = '\0'; /* terminate keysym name */
608 } 765 }
766
609 if ((sym = XStringToKeysym (newargstr)) == None) 767 if ((sym = XStringToKeysym (newargstr)) == None)
610 return -1; 768 return -1;
611 } 769 }
612 770
613 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
614 return -1;
615 sym &= 0xFF;
616 if (Keysym_map[sym] != NULL) /* already set ? */
617 return -1;
618
619 if (newarg == NULL) 771 if (newarg == NULL)
620 { 772 {
621 STRNCPY (newargstr, arg, NEWARGLIM - 1); 773 strncpy (newargstr, arg, NEWARGLIM - 1);
622 newargstr[NEWARGLIM - 1] = '\0'; 774 newargstr[NEWARGLIM - 1] = '\0';
623 newarg = newargstr; 775 newarg = newargstr;
624 } 776 }
777
625 rxvt_Str_trim (newarg); 778 rxvt_Str_trim (newarg);
626 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 779 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
627 return -1; 780 return -1;
628 MIN_IT (n, 255);
629 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
630 781
631 key_string[0] = n; 782 keyboard->register_user_translation (sym, state, newarg);
632 STRNCPY (key_string + 1, newarg, n);
633 Keysym_map[sym] = (unsigned char *)key_string;
634
635 return 1; 783 return 1;
636} 784}
637 785
638# endif /* KEYSYM_RESOURCE */ 786# endif /* KEYSYM_RESOURCE */
639 787
… …
649 char *str, buffer[256]; 797 char *str, buffer[256];
650 798
651 if (stream == NULL) 799 if (stream == NULL)
652 return; 800 return;
653 801
654 len = STRLEN (name); 802 len = strlen (name);
655 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 803 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
656 { 804 {
657 unsigned int entry, n; 805 unsigned int entry, n;
658 806
659 while (*str && isspace (*str)) 807 while (*str && isspace (*str))
660 str++; /* leading whitespace */ 808 str++; /* leading whitespace */
661 809
662 if ((str[len] != '*' && str[len] != '.') 810 if ((str[len] != '*' && str[len] != '.')
663 || (len && STRNCMP (str, name, len))) 811 || (len && strncmp (str, name, len)))
664 continue; 812 continue;
665 str += (len + 1); /* skip `name*' or `name.' */ 813 str += (len + 1); /* skip `name*' or `name.' */
666 814
667# ifdef KEYSYM_RESOURCE 815# ifdef KEYSYM_RESOURCE
668 if (!parse_keysym (str, NULL)) 816 if (!parse_keysym (str, NULL))
669# endif /* KEYSYM_RESOURCE */ 817# endif /* KEYSYM_RESOURCE */
670 for (entry = 0; entry < optList_size (); entry++) 818 for (entry = 0; entry < optList_size; entry++)
671 { 819 {
672 const char *kw = optList[entry].kw; 820 const char *kw = optList[entry].kw;
673 821
674 if (kw == NULL) 822 if (kw == NULL)
675 continue; 823 continue;
676 824
677 n = STRLEN (kw); 825 n = strlen (kw);
678 if (str[n] == ':' && rxvt_Str_match (str, kw)) 826 if (str[n] == ':' && rxvt_Str_match (str, kw))
679 { 827 {
680 /* skip `keyword:' */ 828 /* skip `keyword:' */
681 str += n + 1; 829 str += n + 1;
682 rxvt_Str_trim (str); 830 rxvt_Str_trim (str);
683 n = STRLEN (str); 831 n = strlen (str);
832
684 if (n && rs[optList[entry].doff] == NULL) 833 if (n && rs[optList[entry].doff] == NULL)
685 { 834 {
686 /* not already set */ 835 /* not already set */
687 int s; 836 int s;
688 char *p = 0; 837 char *p = 0;
689 838
690 for (int o = 0;;) 839 for (int o = 0;;)
691 { 840 {
692 p = (char *)rxvt_realloc (p, o + n + 1); 841 p = (char *)rxvt_realloc (p, o + n + 1);
693 MEMCPY (p + o, str, n); 842 memcpy (p + o, str, n);
694 o += n; 843 o += n;
695 p[o] = 0; 844 p[o] = 0;
696 845
697 if (o == 0 || p[o - 1] != '\\') // continuation line 846 if (o == 0 || p[o - 1] != '\\') // continuation line
698 break; 847 break;
… …
701 850
702 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) 851 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
703 break; 852 break;
704 853
705 rxvt_Str_trim (str); 854 rxvt_Str_trim (str);
706 n = STRLEN (str); 855 n = strlen (str);
707 } 856 }
708 857
709 rs[optList[entry].doff] = p; 858 rs[optList[entry].doff] = p;
710 allocated.push_back (p); 859 allocated.push_back (p);
711 860
712 if (optList_isBool (entry)) 861 if (optList_isBool (entry))
713 { 862 {
714 s = STRCASECMP (str, "TRUE") == 0 863 s = strcasecmp (str, "true") == 0
715 || STRCASECMP (str, "YES") == 0 864 || strcasecmp (str, "yes") == 0
716 || STRCASECMP (str, "ON") == 0 865 || strcasecmp (str, "on") == 0
717 || STRCASECMP (str, "1") == 0; 866 || strcmp (str, "1") == 0;
718 867
719 if (optList_isReverse (entry)) 868 if (optList_isReverse (entry))
720 s = !s; 869 s = !s;
721 870
722 if (s) 871 if (s)
723 Options |= optList[entry].flag; 872 SET_OPTION (optList[entry].flag & Optflag_mask);
724 else 873 else
725 Options &= ~optList[entry].flag; 874 CLR_OPTION (optList[entry].flag & Optflag_mask);
726 } 875 }
727 } 876 }
728 877
729 break; 878 break;
730 } 879 }
… …
742/* 891/*
743 * using XGetDefault () or the hand-rolled replacement 892 * using XGetDefault () or the hand-rolled replacement
744 */ 893 */
745/* ARGSUSED */ 894/* ARGSUSED */
746void 895void
747rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 896rxvt_term::extract_resources ()
748{ 897{
898 dDisp;
899
749#ifndef NO_RESOURCES 900#ifndef NO_RESOURCES
901
902 char *homedir = (char *)getenv ("HOME");
903 char fname[1024];
750 904
751# if defined XAPPLOADDIR 905# if defined XAPPLOADDIR
752# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 906# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
753 /* Compute the path of the possibly available localized Rxvt file */ 907 /* Compute the path of the possibly available localized Rxvt file */
754 char *localepath = NULL; 908 char localepath[1024];
755 909
756 if (locale != NULL) 910 if (locale)
757 { /* XXX: must limit length of string */
758 localepath = (char *)rxvt_malloc (256);
759 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, 911 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
760 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), 912 else
761 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 913 localepath[0] = 0;
762 }
763
764 {
765# endif 914# endif
766# endif 915# endif
767 916
768# ifdef USE_XGETDEFAULT 917# ifdef USE_XGETDEFAULT
769 /* 918 /*
770 * get resources using the X library function 919 * get resources using the X library function
771 */ 920 */
772 int entry; 921 int entry;
773 922
774# ifdef XrmEnumOneLevel 923# ifdef XrmEnumOneLevel
775 int i;
776 char *displayResource, *xe; 924 char *displayResource, *xe;
777 XrmName name_prefix[3]; 925 XrmName name_prefix[3];
778 XrmClass class_prefix[3]; 926 XrmClass class_prefix[3];
779 XrmDatabase database, rdb1; 927 XrmDatabase database, rdb1;
780 char fname[1024];
781 928
782 XrmInitialize (); 929 XrmInitialize ();
783 database = NULL; 930 database = NULL;
784 931
932 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
933
934 // 6. System wide per application default file.
935 /* Add in Rxvt file */
936# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
937 if (*localepath
938 && ((rdb1 = XrmGetFileDatabase (localepath))
939 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
940# endif
941 XrmMergeDatabases (rdb1, &database);
942
943 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
944 if ((xe = (char *)getenv ("XAPPLRESDIR")))
945 {
946 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
947
948 if ((rdb1 = XrmGetFileDatabase (fname)))
949 XrmMergeDatabases (rdb1, &database);
950 }
951
952 // 5. User's per application default file.
953 // none
954
955 // 4. User's defaults file.
785 /* Get any Xserver defaults */ 956 /* Get any Xserver defaults */
786
787 displayResource = XResourceManagerString (display); 957 displayResource = XResourceManagerString (disp);
788 if (displayResource != NULL) 958 if (displayResource != NULL)
959 {
789 database = XrmGetStringDatabase (displayResource); 960 if ((rdb1 = XrmGetStringDatabase (displayResource)))
790 961 XrmMergeDatabases (rdb1, &database);
791# ifdef HAVE_EXTRA_XRESOURCE_FILES
792 /* Add in ~/.Xdefaults or ~/.Xresources */
793 { 962 }
794 char *ptr; 963 else if (homedir)
964 {
965 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
795 966
796 if ((ptr = (char *)getenv ("HOME")) == NULL) 967 if ((rdb1 = XrmGetFileDatabase (fname)))
797 ptr = "."; 968 XrmMergeDatabases (rdb1, &database);
969 }
798 970
799 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 971 /* Get screen specific resources */
972 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
973 if (displayResource != NULL)
974 {
975 if ((rdb1 = XrmGetStringDatabase (displayResource)))
976 /* Merge with screen-independent resources */
977 XrmMergeDatabases (rdb1, &database);
978
979 XFree (displayResource);
980 }
981
982 // 3. User's per host defaults file
983 /* Add in XENVIRONMENT file */
984 if ((xe = (char *)getenv ("XENVIRONMENT"))
985 && (rdb1 = XrmGetFileDatabase (xe)))
986 XrmMergeDatabases (rdb1, &database);
987 else if (homedir)
988 {
989 struct utsname un;
990
991 if (!uname (&un))
800 { 992 {
801 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 993 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
802 ptr, xnames[i]); 994
803 if ((rdb1 = XrmGetFileDatabase (fname))) 995 if ((rdb1 = XrmGetFileDatabase (fname)))
996 XrmMergeDatabases (rdb1, &database);
997 }
998 }
999
1000 XrmSetDatabase (disp, database);
1001# endif
1002
1003 /*
1004 * Query resources for options that affect us
1005 */
1006 for (entry = 0; entry < optList_size; entry++)
1007 {
1008 int s;
1009 char *p, *p0;
1010 const char *kw = optList[entry].kw;
1011
1012 if (kw == NULL || rs[optList[entry].doff] != NULL)
1013 continue; /* previously set */
1014
1015 p = XGetDefault (disp, rs[Rs_name], kw);
1016 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1017 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1018 {
1019 p = XGetDefault (disp, RESCLASS, kw);
1020#ifdef RESFALLBACK
1021 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1022 p = XGetDefault (disp, RESFALLBACK, kw);
1023#endif
1024 }
1025
1026 if (p == NULL && p0)
1027 p = p0;
1028
1029 if (p)
1030 {
1031 rs[optList[entry].doff] = p;
1032
1033 if (optList_isBool (entry))
804 { 1034 {
805 XrmMergeDatabases (rdb1, &database); 1035 s = strcasecmp (p, "TRUE") == 0
806# ifndef HAVE_BOTH_XRESOURCE_FILES 1036 || strcasecmp (p, "YES") == 0
1037 || strcasecmp (p, "ON") == 0
1038 || strcasecmp (p, "1") == 0;
1039
1040 if (optList_isReverse (entry))
1041 s = !s;
1042
1043 if (s)
1044 SET_OPTION (optList[entry].flag & Optflag_mask);
807 break; 1045 else
808# endif 1046 CLR_OPTION (optList[entry].flag & Optflag_mask);
809
810 } 1047 }
811 } 1048 }
812 } 1049 }
813# endif
814 1050
815 /* Add in XENVIRONMENT file */
816
817 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
818 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
819 XrmMergeDatabases (rdb1, &database);
820
821 /* Add in Rxvt file */
822# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
823 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
824# endif
825 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
826
827 if (rdb1 != NULL)
828 XrmMergeDatabases (rdb1, &database);
829
830 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
831 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
832 {
833 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
834 - sizeof (RESCLASS) - 2, xe);
835 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
836 XrmMergeDatabases (rdb1, &database);
837 }
838
839 XrmSetDatabase (display, database);
840# endif
841
842 /* 1051 /*
843 * Query resources for options that affect us
844 */
845 for (entry = 0; entry < optList_size (); entry++)
846 {
847 int s;
848 char *p, *p0;
849 const char *kw = optList[entry].kw;
850
851 if (kw == NULL || rs[optList[entry].doff] != NULL)
852 continue; /* previously set */
853
854 p = XGetDefault (display, name, kw);
855 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
856 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
857 {
858 p = XGetDefault (display, RESCLASS, kw);
859#ifdef RESFALLBACK
860 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
861 p = XGetDefault (display, RESFALLBACK, kw);
862#endif
863 }
864
865 if (p == NULL && p0)
866 p = p0;
867
868 if (p)
869 {
870 rs[optList[entry].doff] = p;
871
872 if (optList_isBool (entry))
873 {
874 s = STRCASECMP (p, "TRUE") == 0
875 || STRCASECMP (p, "YES") == 0
876 || STRCASECMP (p, "ON") == 0
877 || STRCASECMP (p, "1") == 0;
878 if (optList_isReverse (entry))
879 s = !s;
880 if (s)
881 Options |= (optList[entry].flag);
882 else
883 Options &= ~ (optList[entry].flag);
884 }
885 }
886 }
887
888 /*
889 * [R5 or later]: enumerate the resource database 1052 * [R5 or later]: enumerate the resource database
890 */ 1053 */
891# ifdef XrmEnumOneLevel
892# ifdef KEYSYM_RESOURCE 1054# ifdef KEYSYM_RESOURCE
893 name_prefix[0] = XrmStringToName (name); 1055 name_prefix[0] = XrmStringToName (rs[Rs_name]);
894 name_prefix[1] = XrmStringToName ("keysym"); 1056 name_prefix[1] = XrmStringToName ("keysym");
895 name_prefix[2] = NULLQUARK; 1057 name_prefix[2] = NULLQUARK;
896 class_prefix[0] = XrmStringToName (RESCLASS); 1058 class_prefix[0] = XrmStringToName (RESCLASS);
897 class_prefix[1] = XrmStringToName ("Keysym"); 1059 class_prefix[1] = XrmStringToName ("Keysym");
898 class_prefix[2] = NULLQUARK; 1060 class_prefix[2] = NULLQUARK;
899 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1061 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
900 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1062 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
901 XrmEnumOneLevel, rxvt_define_key, NULL); 1063 XrmEnumOneLevel, rxvt_define_key, NULL);
902# ifdef RESFALLBACK 1064# ifdef RESFALLBACK
903 name_prefix[0] = XrmStringToName (RESFALLBACK); 1065 name_prefix[0] = XrmStringToName (RESFALLBACK);
904 name_prefix[1] = XrmStringToName ("keysym"); 1066 name_prefix[1] = XrmStringToName ("keysym");
905 class_prefix[0] = XrmStringToName (RESFALLBACK); 1067 class_prefix[0] = XrmStringToName (RESFALLBACK);
906 class_prefix[1] = XrmStringToName ("Keysym"); 1068 class_prefix[1] = XrmStringToName ("Keysym");
907 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1069 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
908 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1070 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
909 XrmEnumOneLevel, rxvt_define_key, NULL); 1071 XrmEnumOneLevel, rxvt_define_key, NULL);
910# endif
911# endif 1072# endif
912# endif 1073# endif
913 1074
914# else /* USE_XGETDEFAULT */ 1075# else /* USE_XGETDEFAULT */
915 /* get resources the hard way, but save lots of memory */ 1076 /* get resources the hard way, but save lots of memory */
1077 FILE *fd = NULL;
1078
1079 if (homedir)
1080 {
1081 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1082
1083 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1084 {
1085 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1086
1087 if ((fd = fopen (fname, "r")) != NULL)
1088 break;
1089 }
1090 }
1091 /*
1092 * The normal order to match resources is the following:
1093 * @ global resources (partial match, ~/.Xdefaults)
1094 * @ application file resources (XAPPLOADDIR/Rxvt)
1095 * @ class resources (~/.Xdefaults)
1096 * @ private resources (~/.Xdefaults)
1097 *
1098 * However, for the hand-rolled resources, the matching algorithm
1099 * checks if a resource string value has already been allocated
1100 * and won't overwrite it with (in this case) a less specific
1101 * resource value.
1102 *
1103 * This avoids multiple allocation. Also, when we've called this
1104 * routine command-line string options have already been applied so we
1105 * needn't to allocate for those resources.
1106 *
1107 * So, search in resources from most to least specific.
1108 *
1109 * Also, use a special sub-class so that we can use either or both of
1110 * "XTerm" and "Rxvt" as class names.
1111 */
1112
1113 get_xdefaults (fd, rs[Rs_name]);
1114 get_xdefaults (fd, RESCLASS);
1115# ifdef RESFALLBACK
1116 get_xdefaults (fd, RESFALLBACK);
1117# endif
1118
1119# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1120 {
916 FILE *fd = NULL; 1121 FILE *ad = NULL;
917 char *home;
918 1122
919 if ((home = getenv ("HOME")) != NULL) 1123# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1124 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1125# endif
1126 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1127 if (ad != NULL)
920 { 1128 {
921 unsigned int i, len = STRLEN (home) + 2; 1129 get_xdefaults (ad, RESCLASS);
922 char *f = NULL; 1130 get_xdefaults (ad, "");
923
924 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
925 {
926 f = (char *)rxvt_realloc (f, (len + STRLEN (xnames[i])) * sizeof (char));
927
928 sprintf (f, "%s/%s", home, xnames[i]);
929
930 if ((fd = fopen (f, "r")) != NULL)
931 break;
932 }
933 free (f); 1131 fclose (ad);
934 } 1132 }
935 /*
936 * The normal order to match resources is the following:
937 * @ global resources (partial match, ~/.Xdefaults)
938 * @ application file resources (XAPPLOADDIR/Rxvt)
939 * @ class resources (~/.Xdefaults)
940 * @ private resources (~/.Xdefaults)
941 *
942 * However, for the hand-rolled resources, the matching algorithm
943 * checks if a resource string value has already been allocated
944 * and won't overwrite it with (in this case) a less specific
945 * resource value.
946 *
947 * This avoids multiple allocation. Also, when we've called this
948 * routine command-line string options have already been applied so we
949 * needn't to allocate for those resources.
950 *
951 * So, search in resources from most to least specific.
952 *
953 * Also, use a special sub-class so that we can use either or both of
954 * "XTerm" and "Rxvt" as class names.
955 */
956
957 get_xdefaults (fd, name);
958 get_xdefaults (fd, RESCLASS);
959# ifdef RESFALLBACK
960 get_xdefaults (fd, RESFALLBACK);
961# endif
962
963# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
964 {
965 FILE *ad = NULL;
966
967# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
968 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
969# endif
970 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
971 if (ad != NULL)
972 {
973 get_xdefaults (ad, RESCLASS);
974 get_xdefaults (ad, "");
975 fclose (ad);
976 }
977 } 1133 }
978# endif /* XAPPLOADDIR */ 1134# endif /* XAPPLOADDIR */
979 1135
980 get_xdefaults (fd, ""); /* partial match */ 1136 get_xdefaults (fd, ""); /* partial match */
981 if (fd != NULL) 1137 if (fd != NULL)
982 fclose (fd); 1138 fclose (fd);
983# endif /* USE_XGETDEFAULT */ 1139# endif /* USE_XGETDEFAULT */
984
985# if defined XAPPLOADDIR
986# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
987
988 }
989
990 /* Free the path of the possibly available localized Rxvt file */
991 free (localepath);
992# endif
993# endif
994 1140
995#endif /* NO_RESOURCES */ 1141#endif /* NO_RESOURCES */
996} 1142}
997 1143
998/*}}} */ 1144/*}}} */

Diff Legend

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