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.25 by root, Mon Jul 26 14:57:12 2004 UTC vs.
Revision 1.54 by root, Fri Feb 11 17:19:30 2005 UTC

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

Diff Legend

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