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.74 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.82 by root, Fri Jan 20 10:27:08 2006 UTC

… …
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
34#include <sys/utsname.h>
35 29
36#ifdef KEYSYM_RESOURCE 30#ifdef KEYSYM_RESOURCE
37#include "keyboard.h" 31#include "keyboard.h"
38#endif 32#endif
39 33
… …
193 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
194#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
195 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
196 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
197 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
198#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 192#ifdef XPM_BACKGROUND
199 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
200#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
201#ifdef XPM_BACKGROUND
202 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
203#endif /* XPM_BACKGROUND */
204#if (MENUBAR_MAX)
205 RSTRG (Rs_menu, "menu", "name[;tag]"),
206#endif 195#endif
207 /* fonts: command-line option = resource name */ 196 /* fonts: command-line option = resource name */
208 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
209#if ENABLE_STYLES 198#if ENABLE_STYLES
210 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
226#if ENABLE_XEMBED 215#if ENABLE_XEMBED
227 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
228#endif 217#endif
229#if ENABLE_FRILLS 218#if ENABLE_FRILLS
230 RSTRG (Rs_transient_for, "transient-for", "windowid"), 219 RSTRG (Rs_transient_for, "transient-for", "windowid"),
220 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
231 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 221 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
232 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 222 BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
233 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 223 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
234 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 224 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
235 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 225 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
… …
264 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 254 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
265 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 255 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
266 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 256 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
267 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 257 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
268#endif 258#endif
269#if 0 && TODO 259#ifndef NO_RESOURCES
270#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
271 INFO ("xrm", "string", "X resource"), 260 INFO ("xrm", "string", "X resource"),
272#endif
273#endif 261#endif
274 INFO ("e", "command arg ...", "command to execute") 262 INFO ("e", "command arg ...", "command to execute")
275 }; 263 };
276 264
277#undef INFO 265#undef INFO
… …
281#undef BOOL 269#undef BOOL
282/*}}} */ 270/*}}} */
283 271
284static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 272static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
285static const char optionsstring[] = "options: " 273static const char optionsstring[] = "options: "
274#if ENABLE_PERL
275 "perl,"
276#endif
286#if XFT 277#if XFT
287 "xft," 278 "xft,"
288#endif 279#endif
289#if ENABLE_STYLES 280#if ENABLE_STYLES
290 "styles," 281 "styles,"
… …
330#if TINTING 321#if TINTING
331 "tint," 322 "tint,"
332#endif 323#endif
333#if defined(UTMP_SUPPORT) 324#if defined(UTMP_SUPPORT)
334 "utmp," 325 "utmp,"
335#endif
336#if defined(MENUBAR)
337 "menubar,"
338#endif 326#endif
339#if defined(USE_XIM) 327#if defined(USE_XIM)
340 "XIM," 328 "XIM,"
341#endif 329#endif
342 "scrollbars=" 330 "scrollbars="
… …
373 "no_delete," 361 "no_delete,"
374#endif 362#endif
375#if EIGHT_BIT_CONTROLS 363#if EIGHT_BIT_CONTROLS
376 "8bitctrls," 364 "8bitctrls,"
377#endif 365#endif
378#if !defined(NO_STRINGS)
379 "strings,"
380#endif
381#if defined(ENABLE_FRILLS) 366#if defined(ENABLE_FRILLS)
382 "frills," 367 "frills,"
383#endif 368#endif
384#if defined(PREFER_24BIT) 369#if defined(PREFER_24BIT)
385 "24bit," 370 "24bit,"
… …
402#if defined(POINTER_BLANK) 387#if defined(POINTER_BLANK)
403 "pointerBlank," 388 "pointerBlank,"
404#endif 389#endif
405#if defined(NO_RESOURCES) 390#if defined(NO_RESOURCES)
406 "NoResources" 391 "NoResources"
407#else
408# if defined(USE_XGETDEFAULT)
409 "XGetDefaults"
410# else
411 ".Xdefaults"
412# endif
413#endif 392#endif
414 "\nUsage: "; /* Usage */ 393 "\nUsage: "; /* Usage */
415 394
416#define INDENT 18 395#define INDENT 18
417 396
… …
615 * "rxvt" "keysym" "0xFF01" 594 * "rxvt" "keysym" "0xFF01"
616 * value will be a string 595 * value will be a string
617 */ 596 */
618/* ARGSUSED */ 597/* ARGSUSED */
619int 598int
620rxvt_define_key (XrmDatabase *database __attribute__((unused)), 599rxvt_define_key (XrmDatabase *database UNUSED,
621 XrmBindingList bindings __attribute__((unused)), 600 XrmBindingList bindings UNUSED,
622 XrmQuarkList quarks, 601 XrmQuarkList quarks,
623 XrmRepresentation *type __attribute__((unused)), 602 XrmRepresentation *type UNUSED,
624 XrmValue *value, 603 XrmValue *value,
625 XPointer closure __attribute__((unused))) 604 XPointer closure UNUSED)
626{ 605{
627 int last; 606 int last;
628 607
629 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 608 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
630 ; 609 ;
… …
692 { 671 {
693 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 672 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
694 return 0; 673 return 0;
695 674
696 str += n; /* skip `keysym.' */ 675 str += n; /* skip `keysym.' */
697 if ((pmodend = strchr (str, ':')) < str) 676 if (!(pmodend = strchr (str, ':')))
698 return -1; 677 return -1;
699 } 678 }
700 else 679 else
701 pmodend = str + strlen(str); 680 pmodend = str + strlen(str);
702 681
… …
780 keyboard->register_user_translation (sym, state, newarg); 759 keyboard->register_user_translation (sym, state, newarg);
781 return 1; 760 return 1;
782} 761}
783 762
784# endif /* KEYSYM_RESOURCE */ 763# endif /* KEYSYM_RESOURCE */
764#endif /* NO_RESOURCES */
785 765
786# ifndef USE_XGETDEFAULT 766static char *
787/*{{{ rxvt_get_xdefaults () */ 767get_res (XrmDatabase database, const char *program, const char *option)
788/*
789 * the matching algorithm used for memory-save fake resources
790 */
791void
792rxvt_term::get_xdefaults (FILE *stream, const char *name)
793{ 768{
794 unsigned int len; 769 char resource[512];
795 char *str, buffer[256]; 770 char *type;
771 XrmValue result;
796 772
797 if (stream == NULL) 773 snprintf (resource, sizeof (resource), "%s.%s", program, option);
798 return; 774 XrmGetResource (database, resource, resource, &type, &result);
799 775
800 len = strlen (name); 776 return result.addr;
801 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 777}
778
779const char *
780rxvt_term::x_resource (const char *name)
781{
782 XrmDatabase database = XrmGetDatabase (display->display);
783
784 const char *p = get_res (database, rs[Rs_name], name);
785 const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
786
787 if (p == NULL || (p0 && strcmp (p, p0) == 0))
802 { 788 {
803 unsigned int entry, n; 789 p = get_res (database, RESCLASS, name);
804 790#ifdef RESFALLBACK
805 while (*str && isspace (*str)) 791 if (p == NULL || (p0 && strcmp (p, p0) == 0))
806 str++; /* leading whitespace */ 792 p = get_res (database, RESFALLBACK, name);
807 793#endif
808 if ((str[len] != '*' && str[len] != '.')
809 || (len && strncmp (str, name, len)))
810 continue;
811 str += (len + 1); /* skip `name*' or `name.' */
812
813# ifdef KEYSYM_RESOURCE
814 if (!parse_keysym (str, NULL))
815# endif /* KEYSYM_RESOURCE */
816 for (entry = 0; entry < optList_size; entry++)
817 {
818 const char *kw = optList[entry].kw;
819
820 if (kw == NULL)
821 continue;
822
823 n = strlen (kw);
824 if (str[n] == ':' && rxvt_Str_match (str, kw))
825 {
826 /* skip `keyword:' */
827 str += n + 1;
828 rxvt_Str_trim (str);
829 n = strlen (str);
830
831 if (n && rs[optList[entry].doff] == NULL)
832 {
833 /* not already set */
834 int s;
835 char *p = 0;
836
837 for (int o = 0;;)
838 {
839 p = (char *)rxvt_realloc (p, o + n + 1);
840 memcpy (p + o, str, n);
841 o += n;
842 p[o] = 0;
843
844 if (o == 0 || p[o - 1] != '\\') // continuation line
845 break;
846
847 o--; // eat "\"
848
849 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
850 break;
851
852 rxvt_Str_trim (str);
853 n = strlen (str);
854 }
855
856 rs[optList[entry].doff] = p;
857 allocated.push_back (p);
858
859 if (optList_isBool (entry))
860 {
861 s = strcasecmp (str, "true") == 0
862 || strcasecmp (str, "yes") == 0
863 || strcasecmp (str, "on") == 0
864 || strcmp (str, "1") == 0;
865
866 if (optList_isReverse (entry))
867 s = !s;
868
869 set_option (optList[entry].flag & Optflag_mask, s);
870 }
871 }
872
873 break;
874 }
875 }
876 } 794 }
877 795
878 rewind (stream); 796 if (p == NULL && p0)
797 p = p0;
798
799 return p;
879} 800}
880 801
881/*}}} */
882# endif /* ! USE_XGETDEFAULT */
883#endif /* NO_RESOURCES */
884
885/*{{{ read the resources files */
886/*
887 * using XGetDefault () or the hand-rolled replacement
888 */
889/* ARGSUSED */
890void 802void
891rxvt_term::extract_resources () 803rxvt_term::extract_resources ()
892{ 804{
893 dDisp;
894
895#ifndef NO_RESOURCES 805#ifndef NO_RESOURCES
896
897 char *homedir = (char *)getenv ("HOME");
898 char fname[1024];
899
900# if defined XAPPLOADDIR
901# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
902 /* Compute the path of the possibly available localized Rxvt file */
903 char localepath[1024];
904
905 if (locale)
906 snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
907 else
908 localepath[0] = 0;
909# endif
910# endif
911
912# ifdef USE_XGETDEFAULT
913 /*
914 * get resources using the X library function
915 */
916 int entry;
917
918# ifdef XrmEnumOneLevel
919 char *displayResource, *xe;
920 XrmName name_prefix[3];
921 XrmClass class_prefix[3];
922 XrmDatabase database, rdb1;
923
924 XrmInitialize ();
925 database = NULL;
926
927 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
928
929 // 6. System wide per application default file.
930 /* Add in Rxvt file */
931# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
932 if (*localepath
933 && ((rdb1 = XrmGetFileDatabase (localepath))
934 || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
935# endif
936 XrmMergeDatabases (rdb1, &database);
937
938 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
939 if ((xe = (char *)getenv ("XAPPLRESDIR")))
940 {
941 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
942
943 if ((rdb1 = XrmGetFileDatabase (fname)))
944 XrmMergeDatabases (rdb1, &database);
945 }
946
947 // 5. User's per application default file.
948 // none
949
950 // 4. User's defaults file.
951 /* Get any Xserver defaults */
952 displayResource = XResourceManagerString (disp);
953 if (displayResource != NULL)
954 {
955 if ((rdb1 = XrmGetStringDatabase (displayResource)))
956 XrmMergeDatabases (rdb1, &database);
957 }
958 else if (homedir)
959 {
960 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
961
962 if ((rdb1 = XrmGetFileDatabase (fname)))
963 XrmMergeDatabases (rdb1, &database);
964 }
965
966 /* Get screen specific resources */
967 displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
968 if (displayResource != NULL)
969 {
970 if ((rdb1 = XrmGetStringDatabase (displayResource)))
971 /* Merge with screen-independent resources */
972 XrmMergeDatabases (rdb1, &database);
973
974 XFree (displayResource);
975 }
976
977 // 3. User's per host defaults file
978 /* Add in XENVIRONMENT file */
979 if ((xe = (char *)getenv ("XENVIRONMENT"))
980 && (rdb1 = XrmGetFileDatabase (xe)))
981 XrmMergeDatabases (rdb1, &database);
982 else if (homedir)
983 {
984 struct utsname un;
985
986 if (!uname (&un))
987 {
988 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
989
990 if ((rdb1 = XrmGetFileDatabase (fname)))
991 XrmMergeDatabases (rdb1, &database);
992 }
993 }
994
995 XrmSetDatabase (disp, database);
996# endif
997
998 /* 806 /*
999 * Query resources for options that affect us 807 * Query resources for options that affect us
1000 */ 808 */
1001 for (entry = 0; entry < optList_size; entry++) 809 for (int entry = 0; entry < optList_size; entry++)
1002 { 810 {
1003 int s; 811 int s;
1004 char *p, *p0;
1005 const char *kw = optList[entry].kw; 812 const char *kw = optList[entry].kw;
1006 813
1007 if (kw == NULL || rs[optList[entry].doff] != NULL) 814 if (kw == NULL || rs[optList[entry].doff] != NULL)
1008 continue; /* previously set */ 815 continue; // previously set
1009 816
1010 p = XGetDefault (disp, rs[Rs_name], kw); 817 const char *p = x_resource (kw);
1011 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1012 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1013 {
1014 p = XGetDefault (disp, RESCLASS, kw);
1015#ifdef RESFALLBACK
1016 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1017 p = XGetDefault (disp, RESFALLBACK, kw);
1018#endif
1019 }
1020
1021 if (p == NULL && p0)
1022 p = p0;
1023 818
1024 if (p) 819 if (p)
1025 { 820 {
821 p = strdup (p);
822 allocated.push_back ((void *)p);
1026 rs[optList[entry].doff] = p; 823 rs[optList[entry].doff] = p;
1027 824
1028 if (optList_isBool (entry)) 825 if (optList_isBool (entry))
1029 { 826 {
1030 s = strcasecmp (p, "TRUE") == 0 827 s = strcasecmp (p, "TRUE") == 0
… …
1042 839
1043 /* 840 /*
1044 * [R5 or later]: enumerate the resource database 841 * [R5 or later]: enumerate the resource database
1045 */ 842 */
1046# ifdef KEYSYM_RESOURCE 843# ifdef KEYSYM_RESOURCE
844 XrmDatabase database = XrmGetDatabase (display->display);
845 XrmName name_prefix[3];
846 XrmClass class_prefix[3];
847
1047 name_prefix[0] = XrmStringToName (rs[Rs_name]); 848 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1048 name_prefix[1] = XrmStringToName ("keysym"); 849 name_prefix[1] = XrmStringToName ("keysym");
1049 name_prefix[2] = NULLQUARK; 850 name_prefix[2] = NULLQUARK;
1050 class_prefix[0] = XrmStringToName (RESCLASS); 851 class_prefix[0] = XrmStringToName (RESCLASS);
1051 class_prefix[1] = XrmStringToName ("Keysym"); 852 class_prefix[1] = XrmStringToName ("Keysym");
1052 class_prefix[2] = NULLQUARK; 853 class_prefix[2] = NULLQUARK;
1053 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 854 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1054 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 855 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1055 XrmEnumOneLevel, rxvt_define_key, NULL); 856 XrmEnumOneLevel, rxvt_define_key, NULL);
1056# ifdef RESFALLBACK 857# ifdef RESFALLBACK
1057 name_prefix[0] = XrmStringToName (RESFALLBACK); 858 name_prefix[0] = XrmStringToName (RESFALLBACK);
1058 name_prefix[1] = XrmStringToName ("keysym"); 859 name_prefix[1] = XrmStringToName ("keysym");
1059 class_prefix[0] = XrmStringToName (RESFALLBACK); 860 class_prefix[0] = XrmStringToName (RESFALLBACK);
1060 class_prefix[1] = XrmStringToName ("Keysym"); 861 class_prefix[1] = XrmStringToName ("Keysym");
1061 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 862 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1062 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 863 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1063 XrmEnumOneLevel, rxvt_define_key, NULL); 864 XrmEnumOneLevel, rxvt_define_key, NULL);
1064# endif 865# endif
1065# endif 866# endif
1066 867
1067# else /* USE_XGETDEFAULT */
1068 /* get resources the hard way, but save lots of memory */
1069 FILE *fd = NULL;
1070
1071 if (homedir)
1072 {
1073 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1074
1075 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1076 {
1077 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1078
1079 if ((fd = fopen (fname, "r")) != NULL)
1080 break;
1081 }
1082 }
1083 /*
1084 * The normal order to match resources is the following:
1085 * @ global resources (partial match, ~/.Xdefaults)
1086 * @ application file resources (XAPPLOADDIR/Rxvt)
1087 * @ class resources (~/.Xdefaults)
1088 * @ private resources (~/.Xdefaults)
1089 *
1090 * However, for the hand-rolled resources, the matching algorithm
1091 * checks if a resource string value has already been allocated
1092 * and won't overwrite it with (in this case) a less specific
1093 * resource value.
1094 *
1095 * This avoids multiple allocation. Also, when we've called this
1096 * routine command-line string options have already been applied so we
1097 * needn't to allocate for those resources.
1098 *
1099 * So, search in resources from most to least specific.
1100 *
1101 * Also, use a special sub-class so that we can use either or both of
1102 * "XTerm" and "Rxvt" as class names.
1103 */
1104
1105 get_xdefaults (fd, rs[Rs_name]);
1106 get_xdefaults (fd, RESCLASS);
1107# ifdef RESFALLBACK
1108 get_xdefaults (fd, RESFALLBACK);
1109# endif
1110
1111# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1112 {
1113 FILE *ad = NULL;
1114
1115# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1116 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1117# endif
1118 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1119 if (ad != NULL)
1120 {
1121 get_xdefaults (ad, RESCLASS);
1122 get_xdefaults (ad, "");
1123 fclose (ad);
1124 }
1125 }
1126# endif /* XAPPLOADDIR */
1127
1128 get_xdefaults (fd, ""); /* partial match */
1129 if (fd != NULL)
1130 fclose (fd);
1131# endif /* USE_XGETDEFAULT */
1132
1133#endif /* NO_RESOURCES */ 868#endif /* NO_RESOURCES */
1134} 869}
1135 870
1136/*}}} */
1137/*----------------------- end-of-file (C source) -----------------------*/ 871/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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