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

Diff Legend

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