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

Diff Legend

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