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.61 by root, Mon Nov 28 19:35:04 2005 UTC vs.
Revision 1.78 by root, Wed Jan 11 02:13:56 2006 UTC

4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
20 * 20 *
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25/*----------------------------------------------------------------------*
26 * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
27 * default or with XGetDefault() (#define USE_XGETDEFAULT)
28 *----------------------------------------------------------------------*/
29 25
30#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
31#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
32#include "version.h" 28#include "version.h"
33 29
34#include <sys/utsname.h>
35
36#ifdef KEYSYM_RESOURCE 30#ifdef KEYSYM_RESOURCE
37#include "keyboard.h" 31#include "keyboard.h"
38#endif 32#endif
33
34/* place holders used for parsing command-line options */
35#define Optflag_Reverse 0x40000000UL
36#define Optflag_Boolean 0x80000000UL
37#define Optflag_mask 0x3fffffffUL
39 38
40/* #define DEBUG_RESOURCES */ 39/* #define DEBUG_RESOURCES */
41 40
42/*{{{ monolithic option/resource structure: */ 41/*{{{ monolithic option/resource structure: */
43/* 42/*
58#define RSTRG(rsp, kw, arg) \ 57#define RSTRG(rsp, kw, arg) \
59 {0, (rsp), (kw), NULL, (arg), NULL} 58 {0, (rsp), (kw), NULL, (arg), NULL}
60 59
61/* BOOL () - regular boolean `-/+' flag */ 60/* BOOL () - regular boolean `-/+' flag */
62#define BOOL(rsp, kw, opt, flag, desc) \ 61#define BOOL(rsp, kw, opt, flag, desc) \
63 { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} 62 { (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
64 63
65/* SWCH () - `-' flag */ 64/* SWCH () - `-' flag */
66#define SWCH(opt, flag, desc) \ 65#define SWCH(opt, flag, desc) \
67 { (flag), -1, NULL, (opt), NULL, (desc)} 66 { (flag), -1, NULL, (opt), NULL, (desc)}
68 67
69/* convenient macros */ 68/* convenient macros */
70#define optList_strlen(i) \ 69#define optList_strlen(i) \
71 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 70 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
72#define optList_isBool(i) \ 71#define optList_isBool(i) \
73 (optList[i].flag & Opt_Boolean) 72 (optList[i].flag & Optflag_Boolean)
74#define optList_isReverse(i) \ 73#define optList_isReverse(i) \
75 (optList[i].flag & Opt_Reverse) 74 (optList[i].flag & Optflag_Reverse)
76#define optList_size \ 75#define optList_size \
77 (sizeof (optList) / sizeof (optList[0])) 76 (sizeof (optList) / sizeof (optList[0]))
78 77
79static const struct 78static const struct
80 { 79 {
105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), 104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108#endif 107#endif
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), 108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), 109 BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), 110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), 111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
113#if TRANSPARENT 112#if TRANSPARENT
114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), 113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
115 SWCH ("tr", Opt_transparent, NULL), 114 SWCH ("tr", Opt_transparent, NULL),
156 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 155 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
157 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 156 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
158 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 157 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
159 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 158 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
160 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 159 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
161#ifndef NO_BRIGHTCOLOR
162 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
163 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
164 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 162 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
165 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 163 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
166 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
167 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
169 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
170#endif /* NO_BRIGHTCOLOR */
171#ifndef NO_BOLD_UNDERLINE_REVERSE 168#ifndef NO_BOLD_UNDERLINE_REVERSE
172 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 169 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
173 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 170 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
174 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 171 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
175 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 203#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 205 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 206 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
207 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"),
210#endif 208#endif
211#ifdef USE_XIM 209#ifdef USE_XIM
212 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 210 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
213 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 211 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
214 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 212 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
221 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 219 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
222#if ENABLE_XEMBED 220#if ENABLE_XEMBED
223 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 221 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
224#endif 222#endif
225#if ENABLE_FRILLS 223#if ENABLE_FRILLS
224 RSTRG (Rs_transient_for, "transient-for", "windowid"),
226 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 225 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
226 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 231 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
232 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
232 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 233 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
233#endif 234#endif
234#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
235 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
236#endif 237#endif
251 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
252#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
253 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
254 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
255#endif 256#endif
256#if 0 && TODO 257#if ENABLE_PERL
257#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) 258 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif
263#ifndef NO_RESOURCES
258 INFO ("xrm", "string", "X resource"), 264 INFO ("xrm", "string", "X resource"),
259#endif
260#endif 265#endif
261 INFO ("e", "command arg ...", "command to execute") 266 INFO ("e", "command arg ...", "command to execute")
262 }; 267 };
263 268
264#undef INFO 269#undef INFO
268#undef BOOL 273#undef BOOL
269/*}}} */ 274/*}}} */
270 275
271static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 276static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
272static const char optionsstring[] = "options: " 277static const char optionsstring[] = "options: "
278#if ENABLE_PERL
279 "perl,"
280#endif
273#if XFT 281#if XFT
274 "xft," 282 "xft,"
275#endif 283#endif
276#if ENABLE_STYLES 284#if ENABLE_STYLES
277 "styles," 285 "styles,"
389#if defined(POINTER_BLANK) 397#if defined(POINTER_BLANK)
390 "pointerBlank," 398 "pointerBlank,"
391#endif 399#endif
392#if defined(NO_RESOURCES) 400#if defined(NO_RESOURCES)
393 "NoResources" 401 "NoResources"
394#else
395# if defined(USE_XGETDEFAULT)
396 "XGetDefaults"
397# else
398 ".Xdefaults"
399# endif
400#endif 402#endif
401 "\nUsage: "; /* Usage */ 403 "\nUsage: "; /* Usage */
402 404
403#define INDENT 18 405#define INDENT 18
404 406
560 { /* boolean value */ 562 { /* boolean value */
561#ifdef DEBUG_RESOURCES 563#ifdef DEBUG_RESOURCES
562 fprintf (stderr, "boolean (%s,%s) = %s\n", 564 fprintf (stderr, "boolean (%s,%s) = %s\n",
563 optList[entry].opt, optList[entry].kw, flag); 565 optList[entry].opt, optList[entry].kw, flag);
564#endif 566#endif
565 if (flag == On) 567 set_option (optList[entry].flag & Optflag_mask, flag == On);
566 options |= optList[entry].flag;
567 else
568 options &= ~optList[entry].flag;
569 568
570 if (optList[entry].doff != -1) 569 if (optList[entry].doff != -1)
571 rs[optList[entry].doff] = flag; 570 rs[optList[entry].doff] = flag;
572 } 571 }
573 } 572 }
682 { 681 {
683 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 682 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
684 return 0; 683 return 0;
685 684
686 str += n; /* skip `keysym.' */ 685 str += n; /* skip `keysym.' */
687 if ((pmodend = strchr (str, ':')) < str) 686 if (!(pmodend = strchr (str, ':')))
688 return -1; 687 return -1;
689 } 688 }
690 else 689 else
691 pmodend = str + strlen(str); 690 pmodend = str + strlen(str);
692 691
770 keyboard->register_user_translation (sym, state, newarg); 769 keyboard->register_user_translation (sym, state, newarg);
771 return 1; 770 return 1;
772} 771}
773 772
774# endif /* KEYSYM_RESOURCE */ 773# endif /* KEYSYM_RESOURCE */
774#endif /* NO_RESOURCES */
775 775
776# ifndef USE_XGETDEFAULT 776static char *
777/*{{{ rxvt_get_xdefaults () */ 777get_res (XrmDatabase database, const char *program, const char *option)
778/*
779 * the matching algorithm used for memory-save fake resources
780 */
781void
782rxvt_term::get_xdefaults (FILE *stream, const char *name)
783{ 778{
784 unsigned int len; 779 char resource[512];
785 char *str, buffer[256]; 780 char *type;
781 XrmValue result;
786 782
787 if (stream == NULL) 783 snprintf (resource, sizeof (resource), "%s.%s", program, option);
788 return; 784 XrmGetResource (database, resource, resource, &type, &result);
789 785
790 len = strlen (name); 786 return result.addr;
791 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 787}
788
789const char *
790rxvt_term::x_resource (const char *name)
791{
792 XrmDatabase database = XrmGetDatabase (display->display);
793
794 const char *p = get_res (database, rs[Rs_name], name);
795 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
796
797 if (p == NULL || (p0 && strcmp (p, p0) == 0))
792 { 798 {
793 unsigned int entry, n; 799 p = get_res (database, RESCLASS, name);
794 800#ifdef RESFALLBACK
795 while (*str && isspace (*str)) 801 if (p == NULL || (p0 && strcmp (p, p0) == 0))
796 str++; /* leading whitespace */ 802 p = get_res (database, RESFALLBACK, name);
797 803#endif
798 if ((str[len] != '*' && str[len] != '.')
799 || (len && strncmp (str, name, len)))
800 continue;
801 str += (len + 1); /* skip `name*' or `name.' */
802
803# ifdef KEYSYM_RESOURCE
804 if (!parse_keysym (str, NULL))
805# endif /* KEYSYM_RESOURCE */
806 for (entry = 0; entry < optList_size; entry++)
807 {
808 const char *kw = optList[entry].kw;
809
810 if (kw == NULL)
811 continue;
812
813 n = strlen (kw);
814 if (str[n] == ':' && rxvt_Str_match (str, kw))
815 {
816 /* skip `keyword:' */
817 str += n + 1;
818 rxvt_Str_trim (str);
819 n = strlen (str);
820
821 if (n && rs[optList[entry].doff] == NULL)
822 {
823 /* not already set */
824 int s;
825 char *p = 0;
826
827 for (int o = 0;;)
828 {
829 p = (char *)rxvt_realloc (p, o + n + 1);
830 memcpy (p + o, str, n);
831 o += n;
832 p[o] = 0;
833
834 if (o == 0 || p[o - 1] != '\\') // continuation line
835 break;
836
837 o--; // eat "\"
838
839 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
840 break;
841
842 rxvt_Str_trim (str);
843 n = strlen (str);
844 }
845
846 rs[optList[entry].doff] = p;
847 allocated.push_back (p);
848
849 if (optList_isBool (entry))
850 {
851 s = strcasecmp (str, "true") == 0
852 || strcasecmp (str, "yes") == 0
853 || strcasecmp (str, "on") == 0
854 || strcmp (str, "1") == 0;
855
856 if (optList_isReverse (entry))
857 s = !s;
858
859 if (s)
860 options |= optList[entry].flag;
861 else
862 options &= ~optList[entry].flag;
863 }
864 }
865
866 break;
867 }
868 }
869 } 804 }
870 805
871 rewind (stream); 806 if (p == NULL && p0)
807 p = p0;
808
809 return p;
872} 810}
873 811
874/*}}} */
875# endif /* ! USE_XGETDEFAULT */
876#endif /* NO_RESOURCES */
877
878/*{{{ read the resources files */
879/*
880 * using XGetDefault () or the hand-rolled replacement
881 */
882/* ARGSUSED */
883void 812void
884rxvt_term::extract_resources () 813rxvt_term::extract_resources ()
885{ 814{
886 dDisp;
887
888#ifndef NO_RESOURCES 815#ifndef NO_RESOURCES
889
890 char *homedir = (char *)getenv ("HOME");
891 char fname[1024];
892
893# if defined XAPPLOADDIR
894# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
895 /* Compute the path of the possibly available localized Rxvt file */
896 char localepath[1024];
897
898 if (locale)
899 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
900 else
901 localepath[0] = 0;
902# endif
903# endif
904
905# ifdef USE_XGETDEFAULT
906 /*
907 * get resources using the X library function
908 */
909 int entry;
910
911# ifdef XrmEnumOneLevel
912 char *displayResource, *xe;
913 XrmName name_prefix[3];
914 XrmClass class_prefix[3];
915 XrmDatabase database, rdb1;
916
917 XrmInitialize ();
918 database = NULL;
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.
944 /* Get any Xserver defaults */
945 displayResource = XResourceManagerString (disp);
946 if (displayResource != NULL)
947 {
948 if ((rdb1 = XrmGetStringDatabase (displayResource)))
949 XrmMergeDatabases (rdb1, &database);
950 }
951 else if (homedir)
952 {
953 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
954
955 if ((rdb1 = XrmGetFileDatabase (fname)))
956 XrmMergeDatabases (rdb1, &database);
957 }
958
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))
980 {
981 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
982
983 if ((rdb1 = XrmGetFileDatabase (fname)))
984 XrmMergeDatabases (rdb1, &database);
985 }
986 }
987
988 XrmSetDatabase (disp, database);
989# endif
990
991 /* 816 /*
992 * Query resources for options that affect us 817 * Query resources for options that affect us
993 */ 818 */
994 for (entry = 0; entry < optList_size; entry++) 819 for (int entry = 0; entry < optList_size; entry++)
995 { 820 {
996 int s; 821 int s;
997 char *p, *p0;
998 const char *kw = optList[entry].kw; 822 const char *kw = optList[entry].kw;
999 823
1000 if (kw == NULL || rs[optList[entry].doff] != NULL) 824 if (kw == NULL || rs[optList[entry].doff] != NULL)
1001 continue; /* previously set */ 825 continue; // previously set
1002 826
1003 p = XGetDefault (disp, rs[Rs_name], kw); 827 const char *p = x_resource (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 828
1017 if (p) 829 if (p)
1018 { 830 {
831 p = strdup (p);
832 allocated.push_back ((void *)p);
1019 rs[optList[entry].doff] = p; 833 rs[optList[entry].doff] = p;
1020 834
1021 if (optList_isBool (entry)) 835 if (optList_isBool (entry))
1022 { 836 {
1023 s = strcasecmp (p, "TRUE") == 0 837 s = strcasecmp (p, "TRUE") == 0
1026 || strcasecmp (p, "1") == 0; 840 || strcasecmp (p, "1") == 0;
1027 841
1028 if (optList_isReverse (entry)) 842 if (optList_isReverse (entry))
1029 s = !s; 843 s = !s;
1030 844
1031 if (s) 845 set_option (optList[entry].flag & Optflag_mask, s);
1032 options |= optList[entry].flag;
1033 else
1034 options &= ~optList[entry].flag;
1035 } 846 }
1036 } 847 }
1037 } 848 }
1038 849
1039 /* 850 /*
1040 * [R5 or later]: enumerate the resource database 851 * [R5 or later]: enumerate the resource database
1041 */ 852 */
1042# ifdef KEYSYM_RESOURCE 853# ifdef KEYSYM_RESOURCE
854 XrmDatabase database = XrmGetDatabase (display->display);
855 XrmName name_prefix[3];
856 XrmClass class_prefix[3];
857
1043 name_prefix[0] = XrmStringToName (rs[Rs_name]); 858 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1044 name_prefix[1] = XrmStringToName ("keysym"); 859 name_prefix[1] = XrmStringToName ("keysym");
1045 name_prefix[2] = NULLQUARK; 860 name_prefix[2] = NULLQUARK;
1046 class_prefix[0] = XrmStringToName (RESCLASS); 861 class_prefix[0] = XrmStringToName (RESCLASS);
1047 class_prefix[1] = XrmStringToName ("Keysym"); 862 class_prefix[1] = XrmStringToName ("Keysym");
1048 class_prefix[2] = NULLQUARK; 863 class_prefix[2] = NULLQUARK;
1049 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 864 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1050 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 865 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1051 XrmEnumOneLevel, rxvt_define_key, NULL); 866 XrmEnumOneLevel, rxvt_define_key, NULL);
1052# ifdef RESFALLBACK 867# ifdef RESFALLBACK
1053 name_prefix[0] = XrmStringToName (RESFALLBACK); 868 name_prefix[0] = XrmStringToName (RESFALLBACK);
1054 name_prefix[1] = XrmStringToName ("keysym"); 869 name_prefix[1] = XrmStringToName ("keysym");
1055 class_prefix[0] = XrmStringToName (RESFALLBACK); 870 class_prefix[0] = XrmStringToName (RESFALLBACK);
1056 class_prefix[1] = XrmStringToName ("Keysym"); 871 class_prefix[1] = XrmStringToName ("Keysym");
1057 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 872 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1058 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 873 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1059 XrmEnumOneLevel, rxvt_define_key, NULL); 874 XrmEnumOneLevel, rxvt_define_key, NULL);
1060# endif 875# endif
1061# endif 876# endif
1062 877
1063# else /* USE_XGETDEFAULT */
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 {
1109 FILE *ad = NULL;
1110
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)
1116 {
1117 get_xdefaults (ad, RESCLASS);
1118 get_xdefaults (ad, "");
1119 fclose (ad);
1120 }
1121 }
1122# endif /* XAPPLOADDIR */
1123
1124 get_xdefaults (fd, ""); /* partial match */
1125 if (fd != NULL)
1126 fclose (fd);
1127# endif /* USE_XGETDEFAULT */
1128
1129#endif /* NO_RESOURCES */ 878#endif /* NO_RESOURCES */
1130} 879}
1131 880
1132/*}}} */
1133/*----------------------- end-of-file (C source) -----------------------*/ 881/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines