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

Diff Legend

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