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.34 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.62 by root, Thu Dec 22 16:44:10 2005 UTC

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

Diff Legend

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