ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

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

Diff Legend

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