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.42 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.55 by root, Mon Feb 14 18:47:54 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 */
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"),
96 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), 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"),
164 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 171 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
165 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 172 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
166 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 173 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
167 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 174 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 175#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
176#if ENABLE_FRILLS
177 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
178#endif
169#ifdef KEEP_SCROLLCOLOR 179#ifdef KEEP_SCROLLCOLOR
170 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 180 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
171 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 181 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
172#endif /* KEEP_SCROLLCOLOR */ 182#endif /* KEEP_SCROLLCOLOR */
173#ifdef OPTION_HC 183#ifdef OPTION_HC
174 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 184 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
175#endif 185#endif
186#ifndef NO_CURSORCOLOR
187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
188 /* command-line option = resource name */
189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
190#endif /* NO_CURSORCOLOR */
191 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
192 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
176#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 194#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
177 RSTRG (Rs_path, "path", "search path"), 195 RSTRG (Rs_path, "path", "search path"),
178#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 196#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
179#ifdef XPM_BACKGROUND 197#ifdef XPM_BACKGROUND
180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 198 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
190 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 208 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
191#endif 209#endif
192#ifdef USE_XIM 210#ifdef USE_XIM
193 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 211 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
194 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"),
195#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
196 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"),
197#endif 214 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
198#endif /* USE_XIM */ 215#endif /* USE_XIM */
199 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"),
200 STRG (Rs_title, "title", "title", "string", "title name for window"), 217 STRG (Rs_title, "title", "title", "string", "title name for window"),
201 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 218 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
202 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 219 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
203#ifndef NO_CURSORCOLOR
204 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
205 /* command-line option = resource name */
206 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
207#endif /* NO_CURSORCOLOR */
208 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
209 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
210 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
211 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"),
212#if ENABLE_FRILLS 221#if ENABLE_FRILLS
222 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
213 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 223 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
214 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 224 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
215 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 225 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
216 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 226 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
217 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 227 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
218#endif
219#ifndef NO_LINESPACE
220 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 228 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
221#endif 229#endif
222 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
223#ifdef POINTER_BLANK 230#ifdef POINTER_BLANK
224 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 231 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
225#endif 232#endif
226#ifndef NO_BACKSPACE_KEY 233#ifndef NO_BACKSPACE_KEY
227 RSTRG (Rs_backspace_key, "backspacekey", "string"), 234 RSTRG (Rs_backspace_key, "backspacekey", "string"),
228#endif 235#endif
229#ifndef NO_DELETE_KEY 236#ifndef NO_DELETE_KEY
230 RSTRG (Rs_delete_key, "deletekey", "string"), 237 RSTRG (Rs_delete_key, "deletekey", "string"),
231#endif 238#endif
232 RSTRG (Rs_selectstyle, "selectstyle", "mode"), 239 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
233 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
234#ifdef HAVE_SCROLLBARS
235 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
236#endif
237#ifdef PRINTPIPE 240#ifdef PRINTPIPE
238 RSTRG (Rs_print_pipe, "print-pipe", "string"), 241 RSTRG (Rs_print_pipe, "print-pipe", "string"),
239#endif 242#endif
240 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 243 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
241 INFO ("xrm", "string", "X resource"),
242#ifdef CUTCHAR_RESOURCE 244#ifdef CUTCHAR_RESOURCE
243 RSTRG (Rs_cutchars, "cutchars", "string"), 245 RSTRG (Rs_cutchars, "cutchars", "string"),
244#endif /* CUTCHAR_RESOURCE */ 246#endif /* CUTCHAR_RESOURCE */
245 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 247 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
246#ifndef NO_SECONDARY_SCREEN 248#ifndef NO_SECONDARY_SCREEN
247 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 249 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
248 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 250 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
251#endif
252#if 0 && TODO
253#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
254 INFO ("xrm", "string", "X resource"),
255#endif
249#endif 256#endif
250 INFO ("e", "command arg ...", "command to execute") 257 INFO ("e", "command arg ...", "command to execute")
251 }; 258 };
252 259
253#undef INFO 260#undef INFO
355 "strings," 362 "strings,"
356#endif 363#endif
357#if defined(ENABLE_FRILLS) 364#if defined(ENABLE_FRILLS)
358 "frills," 365 "frills,"
359#endif 366#endif
360#if !defined(NO_LINESPACE)
361 "linespace,"
362#endif
363#if defined(PREFER_24BIT) 367#if defined(PREFER_24BIT)
364 "24bit," 368 "24bit,"
365#endif 369#endif
366#if defined(SELECTION_SCROLLING) 370#if defined(SELECTION_SCROLLING)
367 "selectionscrolling," 371 "selectionscrolling,"
406 switch (type) 410 switch (type)
407 { 411 {
408 case 0: /* brief listing */ 412 case 0: /* brief listing */
409 rxvt_log (" [-help] [--help]\n"); 413 rxvt_log (" [-help] [--help]\n");
410 414
411 for (col = 1, i = 0; i < optList_size (); i++) 415 for (col = 1, i = 0; i < optList_size; i++)
412 if (optList[i].desc != NULL) 416 if (optList[i].desc != NULL)
413 { 417 {
414 int len = 0; 418 int len = 0;
415 419
416 if (!optList_isBool (i)) 420 if (!optList_isBool (i))
439 break; 443 break;
440 444
441 case 1: /* full command-line listing */ 445 case 1: /* full command-line listing */
442 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 446 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
443 447
444 for (i = 0; i < optList_size (); i++) 448 for (i = 0; i < optList_size; i++)
445 if (optList[i].desc != NULL) 449 if (optList[i].desc != NULL)
446 { 450 {
447#ifdef DEBUG_STRICT 451#ifdef DEBUG_STRICT
448 assert (optList[i].opt != NULL); 452 assert (optList[i].opt != NULL);
449#endif 453#endif
460 464
461 case 2: /* full resource listing */ 465 case 2: /* full resource listing */
462 rxvt_log (" [options] [-e command args]\n\n" 466 rxvt_log (" [options] [-e command args]\n\n"
463 "where resources (long-options) include:\n"); 467 "where resources (long-options) include:\n");
464 468
465 for (i = 0; i < optList_size (); i++) 469 for (i = 0; i < optList_size; i++)
466 if (optList[i].kw != NULL) 470 if (optList[i].kw != NULL)
467 rxvt_log (" %s: %*s%s\n", 471 rxvt_log (" %s: %*s%s\n",
468 optList[i].kw, 472 optList[i].kw,
469 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 473 (INDENT - strlen (optList[i].kw)), "", /* XXX */
470 (optList_isBool (i) ? "boolean" : optList[i].arg)); 474 (optList_isBool (i) ? "boolean" : optList[i].arg));
491 int i, bad_option = 0; 495 int i, bad_option = 0;
492 static const char On[3] = "ON", Off[4] = "OFF"; 496 static const char On[3] = "ON", Off[4] = "OFF";
493 497
494 for (i = 1; i < argc; i++) 498 for (i = 1; i < argc; i++)
495 { 499 {
496 unsigned int entry, longopt = 0; 500 unsigned int entry, longopt = 0;
497 const char *flag, *opt; 501 const char *flag, *opt;
498 502
499 opt = argv[i]; 503 opt = argv[i];
500#ifdef DEBUG_RESOURCES 504#ifdef DEBUG_RESOURCES
501 fprintf (stderr, "argv[%d] = %s: ", i, opt); 505 fprintf (stderr, "argv[%d] = %s: ", i, opt);
502#endif 506#endif
523 rxvt_usage (longopt ? 2 : 1); 527 rxvt_usage (longopt ? 2 : 1);
524 if (!strcmp (opt, "h")) 528 if (!strcmp (opt, "h"))
525 rxvt_usage (0); 529 rxvt_usage (0);
526 530
527 /* feature: always try to match long-options */ 531 /* feature: always try to match long-options */
528 for (entry = 0; entry < optList_size (); entry++) 532 for (entry = 0; entry < optList_size; entry++)
529 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 533 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
530 || (!longopt 534 || (!longopt
531 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 535 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
532 break; 536 break;
533 537
534 if (entry < optList_size ()) 538 if (entry < optList_size)
535 { 539 {
536 if (optList_isReverse (entry)) 540 if (optList_isReverse (entry))
537 flag = flag == On ? Off : On; 541 flag = flag == On ? Off : On;
538 542
539 if (optList_strlen (entry)) 543 if (optList_strlen (entry))
553#ifdef DEBUG_RESOURCES 557#ifdef DEBUG_RESOURCES
554 fprintf (stderr, "boolean (%s,%s) = %s\n", 558 fprintf (stderr, "boolean (%s,%s) = %s\n",
555 optList[entry].opt, optList[entry].kw, flag); 559 optList[entry].opt, optList[entry].kw, flag);
556#endif 560#endif
557 if (flag == On) 561 if (flag == On)
558 options |= (optList[entry].flag); 562 options |= optList[entry].flag;
559 else 563 else
560 options &= ~ (optList[entry].flag); 564 options &= ~optList[entry].flag;
561 565
562 if (optList[entry].doff != -1) 566 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 567 rs[optList[entry].doff] = flag;
564 } 568 }
565 } 569 }
604 XrmQuarkList quarks, 608 XrmQuarkList quarks,
605 XrmRepresentation *type __attribute__((unused)), 609 XrmRepresentation *type __attribute__((unused)),
606 XrmValue *value, 610 XrmValue *value,
607 XPointer closure __attribute__((unused))) 611 XPointer closure __attribute__((unused)))
608{ 612{
609 int last; 613 int last;
610 614
611 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 615 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
612 ; 616 ;
617
613 last--; 618 last--;
614 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 619 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
615 return False; 620 return False;
616} 621}
617 622
622 * arg will be 627 * arg will be
623 * NULL for ~/.Xdefaults and 628 * NULL for ~/.Xdefaults and
624 * non-NULL for command-line options (need to allocate) 629 * non-NULL for command-line options (need to allocate)
625 */ 630 */
626#define NEWARGLIM 500 /* `reasonable' size */ 631#define NEWARGLIM 500 /* `reasonable' size */
632
633struct keysym_vocabulary_t
634{
635 const char *name;
636 unsigned short len;
637 unsigned short value;
638};
639keysym_vocabulary_t keysym_vocabulary[] =
640{
641 { "ISOLevel3", 9, Level3Mask },
642 { "AppKeypad", 9, AppKeypadMask },
643 { "Control", 7, ControlMask },
644 { "NumLock", 7, NumLockMask },
645 { "Shift", 5, ShiftMask },
646 { "Meta", 4, MetaMask },
647 { "Lock", 4, LockMask },
648 { "Mod1", 4, Mod1Mask },
649 { "Mod2", 4, Mod2Mask },
650 { "Mod3", 4, Mod3Mask },
651 { "Mod4", 4, Mod4Mask },
652 { "Mod5", 4, Mod5Mask },
653 { "I", 1, Level3Mask },
654 { "K", 1, AppKeypadMask },
655 { "C", 1, ControlMask },
656 { "N", 1, NumLockMask },
657 { "S", 1, ShiftMask },
658 { "M", 1, MetaMask },
659 { "A", 1, MetaMask },
660 { "L", 1, LockMask },
661 { "1", 1, Mod1Mask },
662 { "2", 1, Mod2Mask },
663 { "3", 1, Mod3Mask },
664 { "4", 1, Mod4Mask },
665 { "5", 1, Mod5Mask },
666};
667
627int 668int
628rxvt_term::parse_keysym (const char *str, const char *arg) 669rxvt_term::parse_keysym (const char *str, const char *arg)
629{ 670{
630 int n, sym; 671 int n, sym;
631 char *key_string, *newarg = NULL; 672 unsigned int state = 0;
673 const char *pmodend = NULL;
674 char *newarg = NULL;
632 char newargstr[NEWARGLIM]; 675 char newargstr[NEWARGLIM];
633 676
634 if (arg == NULL) 677 if (arg == NULL)
635 { 678 {
636 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 679 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
637 return 0; 680 return 0;
681
638 str += n; /* skip `keysym.' */ 682 str += n; /* skip `keysym.' */
683 if ((pmodend = strchr (str, ':')) < str)
684 return -1;
685 }
686 else
687 pmodend = str + strlen(str);
688
689 for (--pmodend; str < pmodend; --pmodend)
690 if (*pmodend == '-')
691 break;
692
693 while (str < pmodend)
639 } 694 {
695 unsigned int i;
696
697 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
698 {
699 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
700 {
701 state |= keysym_vocabulary[i].value;
702 str += keysym_vocabulary[i].len;
703 break;
704 }
705 }
706
707 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
708 return -1;
709
710 if (*str == '-')
711 ++str;
712 }
713
640 /* some scanf () have trouble with a 0x prefix */ 714 /* some scanf () have trouble with a 0x prefix */
641 if (isdigit (str[0]))
642 {
643 if (str[0] == '0' && toupper (str[1]) == 'X') 715 if (str[0] == '0' && toupper (str[1]) == 'X')
716 {
644 str += 2; 717 str += 2;
718
645 if (arg) 719 if (arg)
646 { 720 {
647 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) 721 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
648 return -1; 722 return -1;
649 } 723 }
663 /* 737 /*
664 * convert keysym name to keysym number 738 * convert keysym name to keysym number
665 */ 739 */
666 strncpy (newargstr, str, NEWARGLIM - 1); 740 strncpy (newargstr, str, NEWARGLIM - 1);
667 newargstr[NEWARGLIM - 1] = '\0'; 741 newargstr[NEWARGLIM - 1] = '\0';
742
668 if (arg == NULL) 743 if (arg == NULL)
669 { 744 {
670 if ((newarg = strchr (newargstr, ':')) == NULL) 745 if ((newarg = strchr (newargstr, ':')) == NULL)
671 return -1; 746 return -1;
747
672 *newarg++ = '\0'; /* terminate keysym name */ 748 *newarg++ = '\0'; /* terminate keysym name */
673 } 749 }
750
674 if ((sym = XStringToKeysym (newargstr)) == None) 751 if ((sym = XStringToKeysym (newargstr)) == None)
675 return -1; 752 return -1;
676 } 753 }
677
678 if (sym < 0xFF00 || sym > 0xFFFF) /* we only do extended keys */
679 return -1;
680 sym &= 0xFF;
681 if (Keysym_map[sym] != NULL) /* already set ? */
682 return -1;
683 754
684 if (newarg == NULL) 755 if (newarg == NULL)
685 { 756 {
686 strncpy (newargstr, arg, NEWARGLIM - 1); 757 strncpy (newargstr, arg, NEWARGLIM - 1);
687 newargstr[NEWARGLIM - 1] = '\0'; 758 newargstr[NEWARGLIM - 1] = '\0';
688 newarg = newargstr; 759 newarg = newargstr;
689 } 760 }
761
690 rxvt_Str_trim (newarg); 762 rxvt_Str_trim (newarg);
691 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0) 763 if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
692 return -1; 764 return -1;
693 MIN_IT (n, 255);
694 key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
695 765
696 key_string[0] = n; 766 keyboard->register_user_translation (sym, state, newarg);
697 strncpy (key_string + 1, newarg, n);
698 Keysym_map[sym] = (unsigned char *)key_string;
699
700 return 1; 767 return 1;
701} 768}
702 769
703# endif /* KEYSYM_RESOURCE */ 770# endif /* KEYSYM_RESOURCE */
704 771
717 return; 784 return;
718 785
719 len = strlen (name); 786 len = strlen (name);
720 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 787 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
721 { 788 {
722 unsigned int entry, n; 789 unsigned int entry, n;
723 790
724 while (*str && isspace (*str)) 791 while (*str && isspace (*str))
725 str++; /* leading whitespace */ 792 str++; /* leading whitespace */
726 793
727 if ((str[len] != '*' && str[len] != '.') 794 if ((str[len] != '*' && str[len] != '.')
730 str += (len + 1); /* skip `name*' or `name.' */ 797 str += (len + 1); /* skip `name*' or `name.' */
731 798
732# ifdef KEYSYM_RESOURCE 799# ifdef KEYSYM_RESOURCE
733 if (!parse_keysym (str, NULL)) 800 if (!parse_keysym (str, NULL))
734# endif /* KEYSYM_RESOURCE */ 801# endif /* KEYSYM_RESOURCE */
735 for (entry = 0; entry < optList_size (); entry++) 802 for (entry = 0; entry < optList_size; entry++)
736 { 803 {
737 const char *kw = optList[entry].kw; 804 const char *kw = optList[entry].kw;
738 805
739 if (kw == NULL) 806 if (kw == NULL)
740 continue; 807 continue;
744 { 811 {
745 /* skip `keyword:' */ 812 /* skip `keyword:' */
746 str += n + 1; 813 str += n + 1;
747 rxvt_Str_trim (str); 814 rxvt_Str_trim (str);
748 n = strlen (str); 815 n = strlen (str);
816
749 if (n && rs[optList[entry].doff] == NULL) 817 if (n && rs[optList[entry].doff] == NULL)
750 { 818 {
751 /* not already set */ 819 /* not already set */
752 int s; 820 int s;
753 char *p = 0; 821 char *p = 0;
774 rs[optList[entry].doff] = p; 842 rs[optList[entry].doff] = p;
775 allocated.push_back (p); 843 allocated.push_back (p);
776 844
777 if (optList_isBool (entry)) 845 if (optList_isBool (entry))
778 { 846 {
779 s = strcasecmp (str, "TRUE") == 0 847 s = strcasecmp (str, "true") == 0
780 || strcasecmp (str, "YES") == 0 848 || strcasecmp (str, "yes") == 0
781 || strcasecmp (str, "ON") == 0 849 || strcasecmp (str, "on") == 0
782 || strcasecmp (str, "1") == 0; 850 || strcmp (str, "1") == 0;
783 851
784 if (optList_isReverse (entry)) 852 if (optList_isReverse (entry))
785 s = !s; 853 s = !s;
786 854
787 if (s) 855 if (s)
807/* 875/*
808 * using XGetDefault () or the hand-rolled replacement 876 * using XGetDefault () or the hand-rolled replacement
809 */ 877 */
810/* ARGSUSED */ 878/* ARGSUSED */
811void 879void
812rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) 880rxvt_term::extract_resources ()
813{ 881{
882 dDisp;
883
814#ifndef NO_RESOURCES 884#ifndef NO_RESOURCES
885
886 char *homedir = (char *)getenv ("HOME");
887 char fname[1024];
815 888
816# if defined XAPPLOADDIR 889# if defined XAPPLOADDIR
817# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 890# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
818 /* Compute the path of the possibly available localized Rxvt file */ 891 /* Compute the path of the possibly available localized Rxvt file */
819 char *localepath = NULL; 892 char localepath[1024];
820 893
821 if (locale != NULL) 894 if (locale)
822 { /* XXX: must limit length of string */
823 localepath = (char *)rxvt_malloc (256);
824 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, 895 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
825 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), 896 else
826 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 897 localepath[0] = 0;
827 }
828
829 {
830# endif 898# endif
831# endif 899# endif
832 900
833# ifdef USE_XGETDEFAULT 901# ifdef USE_XGETDEFAULT
834 /* 902 /*
835 * get resources using the X library function 903 * get resources using the X library function
836 */ 904 */
837 int entry; 905 int entry;
838 906
839# ifdef XrmEnumOneLevel 907# ifdef XrmEnumOneLevel
840 int i; 908 int i;
841 char *displayResource, *xe; 909 char *displayResource, *xe;
842 XrmName name_prefix[3]; 910 XrmName name_prefix[3];
843 XrmClass class_prefix[3]; 911 XrmClass class_prefix[3];
844 XrmDatabase database, rdb1; 912 XrmDatabase database, rdb1;
845 char fname[1024];
846 913
847 XrmInitialize (); 914 XrmInitialize ();
848 database = NULL; 915 database = NULL;
849 916
917 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
918
919 // 6. System wide per application default file.
920 /* Add in Rxvt file */
921# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
922 if (*localepath
923 && ((rdb1 = XrmGetFileDatabase (localepath))
924 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
925# endif
926 XrmMergeDatabases (rdb1, &database);
927
928 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
929 if ((xe = (char *)getenv ("XAPPLRESDIR")))
930 {
931 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
932
933 if ((rdb1 = XrmGetFileDatabase (fname)))
934 XrmMergeDatabases (rdb1, &database);
935 }
936
937 // 5. User's per application default file.
938 // none
939
940 // 4. User's defaults file.
850 /* Get any Xserver defaults */ 941 /* Get any Xserver defaults */
851
852 displayResource = XResourceManagerString (display); 942 displayResource = XResourceManagerString (disp);
853 if (displayResource != NULL) 943 if (displayResource != NULL)
944 {
854 database = XrmGetStringDatabase (displayResource); 945 if ((rdb1 = XrmGetStringDatabase (displayResource)))
855 946 XrmMergeDatabases (rdb1, &database);
856# ifdef HAVE_EXTRA_XRESOURCE_FILES
857 /* Add in ~/.Xdefaults or ~/.Xresources */
858 { 947 }
859 char *ptr; 948 else if (homedir)
949 {
950 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
860 951
861 if ((ptr = (char *)getenv ("HOME")) == NULL) 952 if ((rdb1 = XrmGetFileDatabase (fname)))
862 ptr = "."; 953 XrmMergeDatabases (rdb1, &database);
954 }
863 955
864 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 956 /* Get screen specific resources */
957 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
958 if (displayResource != NULL)
959 {
960 if ((rdb1 = XrmGetStringDatabase (displayResource)))
961 /* Merge with screen-independent resources */
962 XrmMergeDatabases (rdb1, &database);
963
964 XFree (displayResource);
965 }
966
967 // 3. User's per host defaults file
968 /* Add in XENVIRONMENT file */
969 if ((xe = (char *)getenv ("XENVIRONMENT"))
970 && (rdb1 = XrmGetFileDatabase (xe)))
971 XrmMergeDatabases (rdb1, &database);
972 else if (homedir)
973 {
974 struct utsname un;
975
976 if (!uname (&un))
865 { 977 {
866 sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2, 978 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
867 ptr, xnames[i]); 979
868 if ((rdb1 = XrmGetFileDatabase (fname))) 980 if ((rdb1 = XrmGetFileDatabase (fname)))
981 XrmMergeDatabases (rdb1, &database);
982 }
983 }
984
985 XrmSetDatabase (disp, database);
986# endif
987
988 /*
989 * Query resources for options that affect us
990 */
991 for (entry = 0; entry < optList_size; entry++)
992 {
993 int s;
994 char *p, *p0;
995 const char *kw = optList[entry].kw;
996
997 if (kw == NULL || rs[optList[entry].doff] != NULL)
998 continue; /* previously set */
999
1000 p = XGetDefault (disp, rs[Rs_name], kw);
1001 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1002 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1003 {
1004 p = XGetDefault (disp, RESCLASS, kw);
1005#ifdef RESFALLBACK
1006 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1007 p = XGetDefault (disp, RESFALLBACK, kw);
1008#endif
1009 }
1010
1011 if (p == NULL && p0)
1012 p = p0;
1013
1014 if (p)
1015 {
1016 rs[optList[entry].doff] = p;
1017
1018 if (optList_isBool (entry))
869 { 1019 {
870 XrmMergeDatabases (rdb1, &database); 1020 s = strcasecmp (p, "TRUE") == 0
871# ifndef HAVE_BOTH_XRESOURCE_FILES 1021 || strcasecmp (p, "YES") == 0
1022 || strcasecmp (p, "ON") == 0
1023 || strcasecmp (p, "1") == 0;
1024
1025 if (optList_isReverse (entry))
1026 s = !s;
1027
1028 if (s)
1029 options |= optList[entry].flag;
872 break; 1030 else
873# endif 1031 options &= ~optList[entry].flag;
874
875 } 1032 }
876 } 1033 }
877 } 1034 }
878# endif
879 1035
880 /* Add in XENVIRONMENT file */
881
882 if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
883 && (rdb1 = XrmGetFileDatabase (xe)) != NULL)
884 XrmMergeDatabases (rdb1, &database);
885
886 /* Add in Rxvt file */
887# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
888 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
889# endif
890 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
891
892 if (rdb1 != NULL)
893 XrmMergeDatabases (rdb1, &database);
894
895 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
896 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
897 {
898 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
899 - sizeof (RESCLASS) - 2, xe);
900 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
901 XrmMergeDatabases (rdb1, &database);
902 }
903
904 XrmSetDatabase (display, database);
905# endif
906
907 /* 1036 /*
908 * Query resources for options that affect us
909 */
910 for (entry = 0; entry < optList_size (); entry++)
911 {
912 int s;
913 char *p, *p0;
914 const char *kw = optList[entry].kw;
915
916 if (kw == NULL || rs[optList[entry].doff] != NULL)
917 continue; /* previously set */
918
919 p = XGetDefault (display, name, kw);
920 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
921 if (p == NULL || (p0 && strcmp (p, p0) == 0))
922 {
923 p = XGetDefault (display, RESCLASS, kw);
924#ifdef RESFALLBACK
925 if (p == NULL || (p0 && strcmp (p, p0) == 0))
926 p = XGetDefault (display, RESFALLBACK, kw);
927#endif
928 }
929
930 if (p == NULL && p0)
931 p = p0;
932
933 if (p)
934 {
935 rs[optList[entry].doff] = p;
936
937 if (optList_isBool (entry))
938 {
939 s = strcasecmp (p, "TRUE") == 0
940 || strcasecmp (p, "YES") == 0
941 || strcasecmp (p, "ON") == 0
942 || strcasecmp (p, "1") == 0;
943 if (optList_isReverse (entry))
944 s = !s;
945 if (s)
946 options |= (optList[entry].flag);
947 else
948 options &= ~ (optList[entry].flag);
949 }
950 }
951 }
952
953 /*
954 * [R5 or later]: enumerate the resource database 1037 * [R5 or later]: enumerate the resource database
955 */ 1038 */
956# ifdef XrmEnumOneLevel
957# ifdef KEYSYM_RESOURCE 1039# ifdef KEYSYM_RESOURCE
958 name_prefix[0] = XrmStringToName (name); 1040 name_prefix[0] = XrmStringToName (rs[Rs_name]);
959 name_prefix[1] = XrmStringToName ("keysym"); 1041 name_prefix[1] = XrmStringToName ("keysym");
960 name_prefix[2] = NULLQUARK; 1042 name_prefix[2] = NULLQUARK;
961 class_prefix[0] = XrmStringToName (RESCLASS); 1043 class_prefix[0] = XrmStringToName (RESCLASS);
962 class_prefix[1] = XrmStringToName ("Keysym"); 1044 class_prefix[1] = XrmStringToName ("Keysym");
963 class_prefix[2] = NULLQUARK; 1045 class_prefix[2] = NULLQUARK;
964 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1046 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
965 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1047 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
966 XrmEnumOneLevel, rxvt_define_key, NULL); 1048 XrmEnumOneLevel, rxvt_define_key, NULL);
967# ifdef RESFALLBACK 1049# ifdef RESFALLBACK
968 name_prefix[0] = XrmStringToName (RESFALLBACK); 1050 name_prefix[0] = XrmStringToName (RESFALLBACK);
969 name_prefix[1] = XrmStringToName ("keysym"); 1051 name_prefix[1] = XrmStringToName ("keysym");
970 class_prefix[0] = XrmStringToName (RESFALLBACK); 1052 class_prefix[0] = XrmStringToName (RESFALLBACK);
971 class_prefix[1] = XrmStringToName ("Keysym"); 1053 class_prefix[1] = XrmStringToName ("Keysym");
972 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 1054 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
973 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 1055 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
974 XrmEnumOneLevel, rxvt_define_key, NULL); 1056 XrmEnumOneLevel, rxvt_define_key, NULL);
975# endif
976# endif 1057# endif
977# endif 1058# endif
978 1059
979# else /* USE_XGETDEFAULT */ 1060# else /* USE_XGETDEFAULT */
980 /* get resources the hard way, but save lots of memory */ 1061 /* get resources the hard way, but save lots of memory */
1062 FILE *fd = NULL;
1063
1064 if (homedir)
1065 {
1066 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1067
1068 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1069 {
1070 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1071
1072 if ((fd = fopen (fname, "r")) != NULL)
1073 break;
1074 }
1075 }
1076 /*
1077 * The normal order to match resources is the following:
1078 * @ global resources (partial match, ~/.Xdefaults)
1079 * @ application file resources (XAPPLOADDIR/Rxvt)
1080 * @ class resources (~/.Xdefaults)
1081 * @ private resources (~/.Xdefaults)
1082 *
1083 * However, for the hand-rolled resources, the matching algorithm
1084 * checks if a resource string value has already been allocated
1085 * and won't overwrite it with (in this case) a less specific
1086 * resource value.
1087 *
1088 * This avoids multiple allocation. Also, when we've called this
1089 * routine command-line string options have already been applied so we
1090 * needn't to allocate for those resources.
1091 *
1092 * So, search in resources from most to least specific.
1093 *
1094 * Also, use a special sub-class so that we can use either or both of
1095 * "XTerm" and "Rxvt" as class names.
1096 */
1097
1098 get_xdefaults (fd, rs[Rs_name]);
1099 get_xdefaults (fd, RESCLASS);
1100# ifdef RESFALLBACK
1101 get_xdefaults (fd, RESFALLBACK);
1102# endif
1103
1104# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1105 {
981 FILE *fd = NULL; 1106 FILE *ad = NULL;
982 char *home;
983 1107
984 if ((home = getenv ("HOME")) != NULL) 1108# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1109 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1110# endif
1111 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1112 if (ad != NULL)
985 { 1113 {
986 unsigned int i, len = strlen (home) + 2; 1114 get_xdefaults (ad, RESCLASS);
987 char *f = NULL; 1115 get_xdefaults (ad, "");
988
989 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
990 {
991 f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
992
993 sprintf (f, "%s/%s", home, xnames[i]);
994
995 if ((fd = fopen (f, "r")) != NULL)
996 break;
997 }
998 free (f); 1116 fclose (ad);
999 } 1117 }
1000 /*
1001 * The normal order to match resources is the following:
1002 * @ global resources (partial match, ~/.Xdefaults)
1003 * @ application file resources (XAPPLOADDIR/Rxvt)
1004 * @ class resources (~/.Xdefaults)
1005 * @ private resources (~/.Xdefaults)
1006 *
1007 * However, for the hand-rolled resources, the matching algorithm
1008 * checks if a resource string value has already been allocated
1009 * and won't overwrite it with (in this case) a less specific
1010 * resource value.
1011 *
1012 * This avoids multiple allocation. Also, when we've called this
1013 * routine command-line string options have already been applied so we
1014 * needn't to allocate for those resources.
1015 *
1016 * So, search in resources from most to least specific.
1017 *
1018 * Also, use a special sub-class so that we can use either or both of
1019 * "XTerm" and "Rxvt" as class names.
1020 */
1021
1022 get_xdefaults (fd, name);
1023 get_xdefaults (fd, RESCLASS);
1024# ifdef RESFALLBACK
1025 get_xdefaults (fd, RESFALLBACK);
1026# endif
1027
1028# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1029 {
1030 FILE *ad = NULL;
1031
1032# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1033 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
1034# endif
1035 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1036 if (ad != NULL)
1037 {
1038 get_xdefaults (ad, RESCLASS);
1039 get_xdefaults (ad, "");
1040 fclose (ad);
1041 }
1042 } 1118 }
1043# endif /* XAPPLOADDIR */ 1119# endif /* XAPPLOADDIR */
1044 1120
1045 get_xdefaults (fd, ""); /* partial match */ 1121 get_xdefaults (fd, ""); /* partial match */
1046 if (fd != NULL) 1122 if (fd != NULL)
1047 fclose (fd); 1123 fclose (fd);
1048# endif /* USE_XGETDEFAULT */ 1124# endif /* USE_XGETDEFAULT */
1049
1050# if defined XAPPLOADDIR
1051# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1052
1053 }
1054
1055 /* Free the path of the possibly available localized Rxvt file */
1056 free (localepath);
1057# endif
1058# endif
1059 1125
1060#endif /* NO_RESOURCES */ 1126#endif /* NO_RESOURCES */
1061} 1127}
1062 1128
1063/*}}} */ 1129/*}}} */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines