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

Diff Legend

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