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.55 by root, Mon Feb 14 18:47:54 2005 UTC

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

Diff Legend

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