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.54 by root, Fri Feb 11 17:19:30 2005 UTC

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

Diff Legend

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