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.63 by root, Sat Dec 31 16:06:48 2005 UTC vs.
Revision 1.77 by root, Wed Jan 11 00:59:58 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"),
… …
222 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"),
223#if ENABLE_XEMBED 220#if ENABLE_XEMBED
224 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"),
225#endif 222#endif
226#if ENABLE_FRILLS 223#if ENABLE_FRILLS
224 RSTRG (Rs_transient_for, "transient-for", "windowid"),
227 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"),
228 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 226 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
229 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
230 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
231 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
232 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
233 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"),
234 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"),
235#endif 234#endif
236#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
237 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
238#endif 237#endif
… …
253 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
254#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
255 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
256 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
257#endif 256#endif
258#if 0 && TODO 257#if ENABLE_PERL
259#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
260 INFO ("xrm", "string", "X resource"), 264 INFO ("xrm", "string", "X resource"),
261#endif
262#endif 265#endif
263 INFO ("e", "command arg ...", "command to execute") 266 INFO ("e", "command arg ...", "command to execute")
264 }; 267 };
265 268
266#undef INFO 269#undef INFO
… …
270#undef BOOL 273#undef BOOL
271/*}}} */ 274/*}}} */
272 275
273static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 276static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
274static const char optionsstring[] = "options: " 277static const char optionsstring[] = "options: "
278#if ENABLE_PERL
279 "perl,"
280#endif
275#if XFT 281#if XFT
276 "xft," 282 "xft,"
277#endif 283#endif
278#if ENABLE_STYLES 284#if ENABLE_STYLES
279 "styles," 285 "styles,"
… …
391#if defined(POINTER_BLANK) 397#if defined(POINTER_BLANK)
392 "pointerBlank," 398 "pointerBlank,"
393#endif 399#endif
394#if defined(NO_RESOURCES) 400#if defined(NO_RESOURCES)
395 "NoResources" 401 "NoResources"
396#else
397# if defined(USE_XGETDEFAULT)
398 "XGetDefaults"
399# else
400 ".Xdefaults"
401# endif
402#endif 402#endif
403 "\nUsage: "; /* Usage */ 403 "\nUsage: "; /* Usage */
404 404
405#define INDENT 18 405#define INDENT 18
406 406
… …
562 { /* boolean value */ 562 { /* boolean value */
563#ifdef DEBUG_RESOURCES 563#ifdef DEBUG_RESOURCES
564 fprintf (stderr, "boolean (%s,%s) = %s\n", 564 fprintf (stderr, "boolean (%s,%s) = %s\n",
565 optList[entry].opt, optList[entry].kw, flag); 565 optList[entry].opt, optList[entry].kw, flag);
566#endif 566#endif
567 if (flag == On) 567 set_option (optList[entry].flag & Optflag_mask, flag == On);
568 options |= optList[entry].flag;
569 else
570 options &= ~optList[entry].flag;
571 568
572 if (optList[entry].doff != -1) 569 if (optList[entry].doff != -1)
573 rs[optList[entry].doff] = flag; 570 rs[optList[entry].doff] = flag;
574 } 571 }
575 } 572 }
… …
684 { 681 {
685 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 682 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
686 return 0; 683 return 0;
687 684
688 str += n; /* skip `keysym.' */ 685 str += n; /* skip `keysym.' */
689 if ((pmodend = strchr (str, ':')) < str) 686 if (!(pmodend = strchr (str, ':')))
690 return -1; 687 return -1;
691 } 688 }
692 else 689 else
693 pmodend = str + strlen(str); 690 pmodend = str + strlen(str);
694 691
… …
772 keyboard->register_user_translation (sym, state, newarg); 769 keyboard->register_user_translation (sym, state, newarg);
773 return 1; 770 return 1;
774} 771}
775 772
776# endif /* KEYSYM_RESOURCE */ 773# endif /* KEYSYM_RESOURCE */
774#endif /* NO_RESOURCES */
777 775
778# ifndef USE_XGETDEFAULT 776char *get_res (XrmDatabase database, const char *program, const char *option)
779/*{{{ rxvt_get_xdefaults () */
780/*
781 * the matching algorithm used for memory-save fake resources
782 */
783void
784rxvt_term::get_xdefaults (FILE *stream, const char *name)
785{ 777{
786 unsigned int len; 778 char resource[512];
787 char *str, buffer[256]; 779 char *type;
780 XrmValue result;
788 781
789 if (stream == NULL) 782 snprintf (resource, sizeof (resource), "%s.%s", program, option);
790 return; 783 XrmGetResource (database, resource, resource, &type, &result);
791 784
792 len = strlen (name); 785 return result.addr;
793 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
794 {
795 unsigned int entry, n;
796
797 while (*str && isspace (*str))
798 str++; /* leading whitespace */
799
800 if ((str[len] != '*' && str[len] != '.')
801 || (len && strncmp (str, name, len)))
802 continue;
803 str += (len + 1); /* skip `name*' or `name.' */
804
805# ifdef KEYSYM_RESOURCE
806 if (!parse_keysym (str, NULL))
807# endif /* KEYSYM_RESOURCE */
808 for (entry = 0; entry < optList_size; entry++)
809 {
810 const char *kw = optList[entry].kw;
811
812 if (kw == NULL)
813 continue;
814
815 n = strlen (kw);
816 if (str[n] == ':' && rxvt_Str_match (str, kw))
817 {
818 /* skip `keyword:' */
819 str += n + 1;
820 rxvt_Str_trim (str);
821 n = strlen (str);
822
823 if (n && rs[optList[entry].doff] == NULL)
824 {
825 /* not already set */
826 int s;
827 char *p = 0;
828
829 for (int o = 0;;)
830 {
831 p = (char *)rxvt_realloc (p, o + n + 1);
832 memcpy (p + o, str, n);
833 o += n;
834 p[o] = 0;
835
836 if (o == 0 || p[o - 1] != '\\') // continuation line
837 break;
838
839 o--; // eat "\"
840
841 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
842 break;
843
844 rxvt_Str_trim (str);
845 n = strlen (str);
846 }
847
848 rs[optList[entry].doff] = p;
849 allocated.push_back (p);
850
851 if (optList_isBool (entry))
852 {
853 s = strcasecmp (str, "true") == 0
854 || strcasecmp (str, "yes") == 0
855 || strcasecmp (str, "on") == 0
856 || strcmp (str, "1") == 0;
857
858 if (optList_isReverse (entry))
859 s = !s;
860
861 if (s)
862 options |= optList[entry].flag;
863 else
864 options &= ~optList[entry].flag;
865 }
866 }
867
868 break;
869 }
870 }
871 }
872
873 rewind (stream);
874} 786}
875
876/*}}} */
877# endif /* ! USE_XGETDEFAULT */
878#endif /* NO_RESOURCES */
879 787
880/*{{{ read the resources files */ 788/*{{{ read the resources files */
881/* 789/*
882 * using XGetDefault () or the hand-rolled replacement 790 * using XGetDefault () or the hand-rolled replacement
883 */ 791 */
… …
886rxvt_term::extract_resources () 794rxvt_term::extract_resources ()
887{ 795{
888 dDisp; 796 dDisp;
889 797
890#ifndef NO_RESOURCES 798#ifndef NO_RESOURCES
891 799 XrmDatabase database = XrmGetDatabase (display->display);
892 char *homedir = (char *)getenv ("HOME");
893 char fname[1024];
894
895# if defined XAPPLOADDIR
896# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
897 /* Compute the path of the possibly available localized Rxvt file */
898 char localepath[1024];
899
900 if (locale)
901 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
902 else
903 localepath[0] = 0;
904# endif
905# endif
906
907# ifdef USE_XGETDEFAULT
908 /*
909 * get resources using the X library function
910 */
911 int entry;
912
913# ifdef XrmEnumOneLevel
914 char *displayResource, *xe;
915 XrmName name_prefix[3];
916 XrmClass class_prefix[3];
917 XrmDatabase database, rdb1;
918
919 XrmInitialize ();
920 database = NULL;
921
922 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
923
924 // 6. System wide per application default file.
925 /* Add in Rxvt file */
926# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
927 if (*localepath
928 && ((rdb1 = XrmGetFileDatabase (localepath))
929 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
930# endif
931 XrmMergeDatabases (rdb1, &database);
932
933 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
934 if ((xe = (char *)getenv ("XAPPLRESDIR")))
935 {
936 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
937
938 if ((rdb1 = XrmGetFileDatabase (fname)))
939 XrmMergeDatabases (rdb1, &database);
940 }
941
942 // 5. User's per application default file.
943 // none
944
945 // 4. User's defaults file.
946 /* Get any Xserver defaults */
947 displayResource = XResourceManagerString (disp);
948 if (displayResource != NULL)
949 {
950 if ((rdb1 = XrmGetStringDatabase (displayResource)))
951 XrmMergeDatabases (rdb1, &database);
952 }
953 else if (homedir)
954 {
955 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
956
957 if ((rdb1 = XrmGetFileDatabase (fname)))
958 XrmMergeDatabases (rdb1, &database);
959 }
960
961 /* Get screen specific resources */
962 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
963 if (displayResource != NULL)
964 {
965 if ((rdb1 = XrmGetStringDatabase (displayResource)))
966 /* Merge with screen-independent resources */
967 XrmMergeDatabases (rdb1, &database);
968
969 XFree (displayResource);
970 }
971
972 // 3. User's per host defaults file
973 /* Add in XENVIRONMENT file */
974 if ((xe = (char *)getenv ("XENVIRONMENT"))
975 && (rdb1 = XrmGetFileDatabase (xe)))
976 XrmMergeDatabases (rdb1, &database);
977 else if (homedir)
978 {
979 struct utsname un;
980
981 if (!uname (&un))
982 {
983 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
984
985 if ((rdb1 = XrmGetFileDatabase (fname)))
986 XrmMergeDatabases (rdb1, &database);
987 }
988 }
989
990 XrmSetDatabase (disp, database);
991# endif
992 800
993 /* 801 /*
994 * Query resources for options that affect us 802 * Query resources for options that affect us
995 */ 803 */
996 for (entry = 0; entry < optList_size; entry++) 804 for (int entry = 0; entry < optList_size; entry++)
997 { 805 {
998 int s; 806 int s;
999 char *p, *p0; 807 char *p, *p0;
1000 const char *kw = optList[entry].kw; 808 const char *kw = optList[entry].kw;
1001 809
1002 if (kw == NULL || rs[optList[entry].doff] != NULL) 810 if (kw == NULL || rs[optList[entry].doff] != NULL)
1003 continue; /* previously set */ 811 continue; // previously set
1004 812
1005 p = XGetDefault (disp, rs[Rs_name], kw); 813 p = get_res (database, rs[Rs_name], kw);
1006 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 814 p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1007 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 815 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1008 { 816 {
1009 p = XGetDefault (disp, RESCLASS, kw); 817 p = get_res (database, RESCLASS, kw);
1010#ifdef RESFALLBACK 818#ifdef RESFALLBACK
1011 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 819 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1012 p = XGetDefault (disp, RESFALLBACK, kw); 820 p = get_res (database, RESFALLBACK, kw);
1013#endif 821#endif
1014 } 822 }
1015 823
1016 if (p == NULL && p0) 824 if (p == NULL && p0)
1017 p = p0; 825 p = p0;
1018 826
1019 if (p) 827 if (p)
1020 { 828 {
829 p = strdup (p);
830 allocated.push_back (p);
1021 rs[optList[entry].doff] = p; 831 rs[optList[entry].doff] = p;
1022 832
1023 if (optList_isBool (entry)) 833 if (optList_isBool (entry))
1024 { 834 {
1025 s = strcasecmp (p, "TRUE") == 0 835 s = strcasecmp (p, "TRUE") == 0
… …
1028 || strcasecmp (p, "1") == 0; 838 || strcasecmp (p, "1") == 0;
1029 839
1030 if (optList_isReverse (entry)) 840 if (optList_isReverse (entry))
1031 s = !s; 841 s = !s;
1032 842
1033 if (s) 843 set_option (optList[entry].flag & Optflag_mask, s);
1034 options |= optList[entry].flag;
1035 else
1036 options &= ~optList[entry].flag;
1037 } 844 }
1038 } 845 }
1039 } 846 }
1040 847
1041 /* 848 /*
1042 * [R5 or later]: enumerate the resource database 849 * [R5 or later]: enumerate the resource database
1043 */ 850 */
1044# ifdef KEYSYM_RESOURCE 851# ifdef KEYSYM_RESOURCE
852 XrmName name_prefix[3];
853 XrmClass class_prefix[3];
854
1045 name_prefix[0] = XrmStringToName (rs[Rs_name]); 855 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1046 name_prefix[1] = XrmStringToName ("keysym"); 856 name_prefix[1] = XrmStringToName ("keysym");
1047 name_prefix[2] = NULLQUARK; 857 name_prefix[2] = NULLQUARK;
1048 class_prefix[0] = XrmStringToName (RESCLASS); 858 class_prefix[0] = XrmStringToName (RESCLASS);
1049 class_prefix[1] = XrmStringToName ("Keysym"); 859 class_prefix[1] = XrmStringToName ("Keysym");
1050 class_prefix[2] = NULLQUARK; 860 class_prefix[2] = NULLQUARK;
1051 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 861 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1052 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 862 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1053 XrmEnumOneLevel, rxvt_define_key, NULL); 863 XrmEnumOneLevel, rxvt_define_key, NULL);
1054# ifdef RESFALLBACK 864# ifdef RESFALLBACK
1055 name_prefix[0] = XrmStringToName (RESFALLBACK); 865 name_prefix[0] = XrmStringToName (RESFALLBACK);
1056 name_prefix[1] = XrmStringToName ("keysym"); 866 name_prefix[1] = XrmStringToName ("keysym");
1057 class_prefix[0] = XrmStringToName (RESFALLBACK); 867 class_prefix[0] = XrmStringToName (RESFALLBACK);
1058 class_prefix[1] = XrmStringToName ("Keysym"); 868 class_prefix[1] = XrmStringToName ("Keysym");
1059 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 869 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1060 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 870 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1061 XrmEnumOneLevel, rxvt_define_key, NULL); 871 XrmEnumOneLevel, rxvt_define_key, NULL);
1062# endif 872# endif
1063# endif 873# endif
1064 874
1065# else /* USE_XGETDEFAULT */
1066 /* get resources the hard way, but save lots of memory */
1067 FILE *fd = NULL;
1068
1069 if (homedir)
1070 {
1071 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1072
1073 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1074 {
1075 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1076
1077 if ((fd = fopen (fname, "r")) != NULL)
1078 break;
1079 }
1080 }
1081 /*
1082 * The normal order to match resources is the following:
1083 * @ global resources (partial match, ~/.Xdefaults)
1084 * @ application file resources (XAPPLOADDIR/Rxvt)
1085 * @ class resources (~/.Xdefaults)
1086 * @ private resources (~/.Xdefaults)
1087 *
1088 * However, for the hand-rolled resources, the matching algorithm
1089 * checks if a resource string value has already been allocated
1090 * and won't overwrite it with (in this case) a less specific
1091 * resource value.
1092 *
1093 * This avoids multiple allocation. Also, when we've called this
1094 * routine command-line string options have already been applied so we
1095 * needn't to allocate for those resources.
1096 *
1097 * So, search in resources from most to least specific.
1098 *
1099 * Also, use a special sub-class so that we can use either or both of
1100 * "XTerm" and "Rxvt" as class names.
1101 */
1102
1103 get_xdefaults (fd, rs[Rs_name]);
1104 get_xdefaults (fd, RESCLASS);
1105# ifdef RESFALLBACK
1106 get_xdefaults (fd, RESFALLBACK);
1107# endif
1108
1109# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1110 {
1111 FILE *ad = NULL;
1112
1113# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1114 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1115# endif
1116 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1117 if (ad != NULL)
1118 {
1119 get_xdefaults (ad, RESCLASS);
1120 get_xdefaults (ad, "");
1121 fclose (ad);
1122 }
1123 }
1124# endif /* XAPPLOADDIR */
1125
1126 get_xdefaults (fd, ""); /* partial match */
1127 if (fd != NULL)
1128 fclose (fd);
1129# endif /* USE_XGETDEFAULT */
1130
1131#endif /* NO_RESOURCES */ 875#endif /* NO_RESOURCES */
1132} 876}
1133 877
1134/*}}} */ 878/*}}} */
1135/*----------------------- end-of-file (C source) -----------------------*/ 879/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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