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.64 by root, Sat Dec 31 17:16:17 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
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
… …
161 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), 155 RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
162 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), 156 RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
163 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), 157 RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
164 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), 158 RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
165 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), 159 RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
166#ifndef NO_BRIGHTCOLOR
167 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
169 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), 162 RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
170 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), 163 RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
171 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), 164 RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
172 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 165 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
173 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 166 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
174 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 167 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
175#endif /* NO_BRIGHTCOLOR */
176#ifndef NO_BOLD_UNDERLINE_REVERSE 168#ifndef NO_BOLD_UNDERLINE_REVERSE
177 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 169 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
178 RSTRG (Rs_color + Color_IT, "colorIT", "color"), 170 RSTRG (Rs_color + Color_IT, "colorIT", "color"),
179 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 171 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
180 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 172 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
… …
227 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"),
228#if ENABLE_XEMBED 220#if ENABLE_XEMBED
229 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"),
230#endif 222#endif
231#if ENABLE_FRILLS 223#if ENABLE_FRILLS
224 RSTRG (Rs_transient_for, "transient-for", "windowid"),
232 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"),
233 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"),
234 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 227 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
235 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 228 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
236 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 229 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
237 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 230 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
238 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"),
239 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"),
240#endif 234#endif
241#ifdef POINTER_BLANK 235#ifdef POINTER_BLANK
242 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 236 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
243#endif 237#endif
… …
258 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 252 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
259#ifndef NO_SECONDARY_SCREEN 253#ifndef NO_SECONDARY_SCREEN
260 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), 254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
261 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), 255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
262#endif 256#endif
263#if 0 && TODO 257#if ENABLE_PERL
264#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
265 INFO ("xrm", "string", "X resource"), 264 INFO ("xrm", "string", "X resource"),
266#endif
267#endif 265#endif
268 INFO ("e", "command arg ...", "command to execute") 266 INFO ("e", "command arg ...", "command to execute")
269 }; 267 };
270 268
271#undef INFO 269#undef INFO
… …
275#undef BOOL 273#undef BOOL
276/*}}} */ 274/*}}} */
277 275
278static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; 276static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
279static const char optionsstring[] = "options: " 277static const char optionsstring[] = "options: "
278#if ENABLE_PERL
279 "perl,"
280#endif
280#if XFT 281#if XFT
281 "xft," 282 "xft,"
282#endif 283#endif
283#if ENABLE_STYLES 284#if ENABLE_STYLES
284 "styles," 285 "styles,"
… …
396#if defined(POINTER_BLANK) 397#if defined(POINTER_BLANK)
397 "pointerBlank," 398 "pointerBlank,"
398#endif 399#endif
399#if defined(NO_RESOURCES) 400#if defined(NO_RESOURCES)
400 "NoResources" 401 "NoResources"
401#else
402# if defined(USE_XGETDEFAULT)
403 "XGetDefaults"
404# else
405 ".Xdefaults"
406# endif
407#endif 402#endif
408 "\nUsage: "; /* Usage */ 403 "\nUsage: "; /* Usage */
409 404
410#define INDENT 18 405#define INDENT 18
411 406
… …
567 { /* boolean value */ 562 { /* boolean value */
568#ifdef DEBUG_RESOURCES 563#ifdef DEBUG_RESOURCES
569 fprintf (stderr, "boolean (%s,%s) = %s\n", 564 fprintf (stderr, "boolean (%s,%s) = %s\n",
570 optList[entry].opt, optList[entry].kw, flag); 565 optList[entry].opt, optList[entry].kw, flag);
571#endif 566#endif
572 if (flag == On)
573 SET_OPTION (optList[entry].flag & Optflag_mask); 567 set_option (optList[entry].flag & Optflag_mask, flag == On);
574 else
575 CLR_OPTION (optList[entry].flag & Optflag_mask);
576 568
577 if (optList[entry].doff != -1) 569 if (optList[entry].doff != -1)
578 rs[optList[entry].doff] = flag; 570 rs[optList[entry].doff] = flag;
579 } 571 }
580 } 572 }
… …
689 { 681 {
690 if ((n = rxvt_Str_match (str, "keysym.")) == 0) 682 if ((n = rxvt_Str_match (str, "keysym.")) == 0)
691 return 0; 683 return 0;
692 684
693 str += n; /* skip `keysym.' */ 685 str += n; /* skip `keysym.' */
694 if ((pmodend = strchr (str, ':')) < str) 686 if (!(pmodend = strchr (str, ':')))
695 return -1; 687 return -1;
696 } 688 }
697 else 689 else
698 pmodend = str + strlen(str); 690 pmodend = str + strlen(str);
699 691
… …
777 keyboard->register_user_translation (sym, state, newarg); 769 keyboard->register_user_translation (sym, state, newarg);
778 return 1; 770 return 1;
779} 771}
780 772
781# endif /* KEYSYM_RESOURCE */ 773# endif /* KEYSYM_RESOURCE */
774#endif /* NO_RESOURCES */
782 775
783# ifndef USE_XGETDEFAULT 776char *get_res (XrmDatabase database, const char *program, const char *option)
784/*{{{ rxvt_get_xdefaults () */
785/*
786 * the matching algorithm used for memory-save fake resources
787 */
788void
789rxvt_term::get_xdefaults (FILE *stream, const char *name)
790{ 777{
791 unsigned int len; 778 char resource[512];
792 char *str, buffer[256]; 779 char *type;
780 XrmValue result;
793 781
794 if (stream == NULL) 782 snprintf (resource, sizeof (resource), "%s.%s", program, option);
795 return; 783 XrmGetResource (database, resource, resource, &type, &result);
796 784
797 len = strlen (name); 785 return result.addr;
798 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
799 {
800 unsigned int entry, n;
801
802 while (*str && isspace (*str))
803 str++; /* leading whitespace */
804
805 if ((str[len] != '*' && str[len] != '.')
806 || (len && strncmp (str, name, len)))
807 continue;
808 str += (len + 1); /* skip `name*' or `name.' */
809
810# ifdef KEYSYM_RESOURCE
811 if (!parse_keysym (str, NULL))
812# endif /* KEYSYM_RESOURCE */
813 for (entry = 0; entry < optList_size; entry++)
814 {
815 const char *kw = optList[entry].kw;
816
817 if (kw == NULL)
818 continue;
819
820 n = strlen (kw);
821 if (str[n] == ':' && rxvt_Str_match (str, kw))
822 {
823 /* skip `keyword:' */
824 str += n + 1;
825 rxvt_Str_trim (str);
826 n = strlen (str);
827
828 if (n && rs[optList[entry].doff] == NULL)
829 {
830 /* not already set */
831 int s;
832 char *p = 0;
833
834 for (int o = 0;;)
835 {
836 p = (char *)rxvt_realloc (p, o + n + 1);
837 memcpy (p + o, str, n);
838 o += n;
839 p[o] = 0;
840
841 if (o == 0 || p[o - 1] != '\\') // continuation line
842 break;
843
844 o--; // eat "\"
845
846 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
847 break;
848
849 rxvt_Str_trim (str);
850 n = strlen (str);
851 }
852
853 rs[optList[entry].doff] = p;
854 allocated.push_back (p);
855
856 if (optList_isBool (entry))
857 {
858 s = strcasecmp (str, "true") == 0
859 || strcasecmp (str, "yes") == 0
860 || strcasecmp (str, "on") == 0
861 || strcmp (str, "1") == 0;
862
863 if (optList_isReverse (entry))
864 s = !s;
865
866 if (s)
867 SET_OPTION (optList[entry].flag & Optflag_mask);
868 else
869 CLR_OPTION (optList[entry].flag & Optflag_mask);
870 }
871 }
872
873 break;
874 }
875 }
876 }
877
878 rewind (stream);
879} 786}
880
881/*}}} */
882# endif /* ! USE_XGETDEFAULT */
883#endif /* NO_RESOURCES */
884 787
885/*{{{ read the resources files */ 788/*{{{ read the resources files */
886/* 789/*
887 * using XGetDefault () or the hand-rolled replacement 790 * using XGetDefault () or the hand-rolled replacement
888 */ 791 */
… …
891rxvt_term::extract_resources () 794rxvt_term::extract_resources ()
892{ 795{
893 dDisp; 796 dDisp;
894 797
895#ifndef NO_RESOURCES 798#ifndef NO_RESOURCES
896 799 XrmDatabase database = XrmGetDatabase (display->display);
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 800
998 /* 801 /*
999 * Query resources for options that affect us 802 * Query resources for options that affect us
1000 */ 803 */
1001 for (entry = 0; entry < optList_size; entry++) 804 for (int entry = 0; entry < optList_size; entry++)
1002 { 805 {
1003 int s; 806 int s;
1004 char *p, *p0; 807 char *p, *p0;
1005 const char *kw = optList[entry].kw; 808 const char *kw = optList[entry].kw;
1006 809
1007 if (kw == NULL || rs[optList[entry].doff] != NULL) 810 if (kw == NULL || rs[optList[entry].doff] != NULL)
1008 continue; /* previously set */ 811 continue; // previously set
1009 812
1010 p = XGetDefault (disp, rs[Rs_name], kw); 813 p = get_res (database, rs[Rs_name], kw);
1011 p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 814 p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1012 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 815 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1013 { 816 {
1014 p = XGetDefault (disp, RESCLASS, kw); 817 p = get_res (database, RESCLASS, kw);
1015#ifdef RESFALLBACK 818#ifdef RESFALLBACK
1016 if (p == NULL || (p0 && strcmp (p, p0) == 0)) 819 if (p == NULL || (p0 && strcmp (p, p0) == 0))
1017 p = XGetDefault (disp, RESFALLBACK, kw); 820 p = get_res (database, RESFALLBACK, kw);
1018#endif 821#endif
1019 } 822 }
1020 823
1021 if (p == NULL && p0) 824 if (p == NULL && p0)
1022 p = p0; 825 p = p0;
1023 826
1024 if (p) 827 if (p)
1025 { 828 {
829 p = strdup (p);
830 allocated.push_back (p);
1026 rs[optList[entry].doff] = p; 831 rs[optList[entry].doff] = p;
1027 832
1028 if (optList_isBool (entry)) 833 if (optList_isBool (entry))
1029 { 834 {
1030 s = strcasecmp (p, "TRUE") == 0 835 s = strcasecmp (p, "TRUE") == 0
… …
1033 || strcasecmp (p, "1") == 0; 838 || strcasecmp (p, "1") == 0;
1034 839
1035 if (optList_isReverse (entry)) 840 if (optList_isReverse (entry))
1036 s = !s; 841 s = !s;
1037 842
1038 if (s)
1039 SET_OPTION (optList[entry].flag & Optflag_mask); 843 set_option (optList[entry].flag & Optflag_mask, s);
1040 else
1041 CLR_OPTION (optList[entry].flag & Optflag_mask);
1042 } 844 }
1043 } 845 }
1044 } 846 }
1045 847
1046 /* 848 /*
1047 * [R5 or later]: enumerate the resource database 849 * [R5 or later]: enumerate the resource database
1048 */ 850 */
1049# ifdef KEYSYM_RESOURCE 851# ifdef KEYSYM_RESOURCE
852 XrmName name_prefix[3];
853 XrmClass class_prefix[3];
854
1050 name_prefix[0] = XrmStringToName (rs[Rs_name]); 855 name_prefix[0] = XrmStringToName (rs[Rs_name]);
1051 name_prefix[1] = XrmStringToName ("keysym"); 856 name_prefix[1] = XrmStringToName ("keysym");
1052 name_prefix[2] = NULLQUARK; 857 name_prefix[2] = NULLQUARK;
1053 class_prefix[0] = XrmStringToName (RESCLASS); 858 class_prefix[0] = XrmStringToName (RESCLASS);
1054 class_prefix[1] = XrmStringToName ("Keysym"); 859 class_prefix[1] = XrmStringToName ("Keysym");
1055 class_prefix[2] = NULLQUARK; 860 class_prefix[2] = NULLQUARK;
1056 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 861 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1057 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 862 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1058 XrmEnumOneLevel, rxvt_define_key, NULL); 863 XrmEnumOneLevel, rxvt_define_key, NULL);
1059# ifdef RESFALLBACK 864# ifdef RESFALLBACK
1060 name_prefix[0] = XrmStringToName (RESFALLBACK); 865 name_prefix[0] = XrmStringToName (RESFALLBACK);
1061 name_prefix[1] = XrmStringToName ("keysym"); 866 name_prefix[1] = XrmStringToName ("keysym");
1062 class_prefix[0] = XrmStringToName (RESFALLBACK); 867 class_prefix[0] = XrmStringToName (RESFALLBACK);
1063 class_prefix[1] = XrmStringToName ("Keysym"); 868 class_prefix[1] = XrmStringToName ("Keysym");
1064 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 869 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1065 XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, 870 XrmEnumerateDatabase (database, name_prefix, class_prefix,
1066 XrmEnumOneLevel, rxvt_define_key, NULL); 871 XrmEnumOneLevel, rxvt_define_key, NULL);
1067# endif 872# endif
1068# endif 873# endif
1069 874
1070# else /* USE_XGETDEFAULT */
1071 /* get resources the hard way, but save lots of memory */
1072 FILE *fd = NULL;
1073
1074 if (homedir)
1075 {
1076 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1077
1078 for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1079 {
1080 snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1081
1082 if ((fd = fopen (fname, "r")) != NULL)
1083 break;
1084 }
1085 }
1086 /*
1087 * The normal order to match resources is the following:
1088 * @ global resources (partial match, ~/.Xdefaults)
1089 * @ application file resources (XAPPLOADDIR/Rxvt)
1090 * @ class resources (~/.Xdefaults)
1091 * @ private resources (~/.Xdefaults)
1092 *
1093 * However, for the hand-rolled resources, the matching algorithm
1094 * checks if a resource string value has already been allocated
1095 * and won't overwrite it with (in this case) a less specific
1096 * resource value.
1097 *
1098 * This avoids multiple allocation. Also, when we've called this
1099 * routine command-line string options have already been applied so we
1100 * needn't to allocate for those resources.
1101 *
1102 * So, search in resources from most to least specific.
1103 *
1104 * Also, use a special sub-class so that we can use either or both of
1105 * "XTerm" and "Rxvt" as class names.
1106 */
1107
1108 get_xdefaults (fd, rs[Rs_name]);
1109 get_xdefaults (fd, RESCLASS);
1110# ifdef RESFALLBACK
1111 get_xdefaults (fd, RESFALLBACK);
1112# endif
1113
1114# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1115 {
1116 FILE *ad = NULL;
1117
1118# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1119 if (!*localepath || (ad = fopen (localepath, "r")) == NULL)
1120# endif
1121 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1122 if (ad != NULL)
1123 {
1124 get_xdefaults (ad, RESCLASS);
1125 get_xdefaults (ad, "");
1126 fclose (ad);
1127 }
1128 }
1129# endif /* XAPPLOADDIR */
1130
1131 get_xdefaults (fd, ""); /* partial match */
1132 if (fd != NULL)
1133 fclose (fd);
1134# endif /* USE_XGETDEFAULT */
1135
1136#endif /* NO_RESOURCES */ 875#endif /* NO_RESOURCES */
1137} 876}
1138 877
1139/*}}} */ 878/*}}} */
1140/*----------------------- end-of-file (C source) -----------------------*/ 879/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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