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

Diff Legend

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