[ViewVC] Diff of: cvs/rxvt-unicode/src/xdefaults.C

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.76 by root, Mon Jan 9 22:41:41 2006 UTC vs.
Revision 1.77 by root, Wed Jan 11 00:59:58 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
…		…
264	RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO	258	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	259	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	260	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"),	261	STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
268	#endif	262	#endif
269	#if 0 && TODO	263	#ifndef NO_RESOURCES
270	#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
271	INFO ("xrm", "string", "X resource"),	264	INFO ("xrm", "string", "X resource"),
272	#endif
273	#endif	265	#endif
274	INFO ("e", "command arg ...", "command to execute")	266	INFO ("e", "command arg ...", "command to execute")
275	};	267	};
276		268
277	#undef INFO	269	#undef INFO
…		…
281	#undef BOOL	273	#undef BOOL
282	/}}} /	274	/}}} /
283		275
284	static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";	276	static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
285	static const char optionsstring[] = "options: "	277	static const char optionsstring[] = "options: "
		278	#if ENABLE_PERL
		279	"perl,"
		280	#endif
286	#if XFT	281	#if XFT
287	"xft,"	282	"xft,"
288	#endif	283	#endif
289	#if ENABLE_STYLES	284	#if ENABLE_STYLES
290	"styles,"	285	"styles,"
…		…
402	#if defined(POINTER_BLANK)	397	#if defined(POINTER_BLANK)
403	"pointerBlank,"	398	"pointerBlank,"
404	#endif	399	#endif
405	#if defined(NO_RESOURCES)	400	#if defined(NO_RESOURCES)
406	"NoResources"	401	"NoResources"
407	#else
408	# if defined(USE_XGETDEFAULT)
409	"XGetDefault"
410	# else
411	".Xdefaults"
412	# endif
413	#endif	402	#endif
414	"\nUsage: "; /* Usage */	403	"\nUsage: "; /* Usage */
415		404
416	#define INDENT 18	405	#define INDENT 18
417		406
…		…
780	keyboard->register_user_translation (sym, state, newarg);	769	keyboard->register_user_translation (sym, state, newarg);
781	return 1;	770	return 1;
782	}	771	}
783		772
784	# endif /* KEYSYM_RESOURCE */	773	# endif /* KEYSYM_RESOURCE */
785
786	# ifndef USE_XGETDEFAULT
787	/{{{ rxvt_get_xdefaults () /
788	/*
789	* the matching algorithm used for memory-save fake resources
790	*/
791	void
792	rxvt_term::get_xdefaults (FILE stream, const char name)
793	{
794	unsigned int len;
795	char *str, buffer[256];
796
797	if (stream == NULL)
798	return;
799
800	len = strlen (name);
801	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
802	{
803	unsigned int entry, n;
804
805	while (str && isspace (str))
806	str++; /* leading whitespace */
807
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	}
877
878	rewind (stream);
879	}
880
881	/}}} /
882	# endif /* ! USE_XGETDEFAULT */
883	#endif /* NO_RESOURCES */	774	#endif /* NO_RESOURCES */
884		775
885	#ifdef USE_XGETDEFAULT
886	char get_res (XrmDatabase database, const char program, const char *option)	776	char get_res (XrmDatabase database, const char program, const char *option)
887	{	777	{
888	char resource[512];	778	char resource[512];
889	char *type;	779	char *type;
890	XrmValue result;	780	XrmValue result;
…		…
892	snprintf (resource, sizeof (resource), "%s.%s", program, option);	782	snprintf (resource, sizeof (resource), "%s.%s", program, option);
893	XrmGetResource (database, resource, resource, &type, &result);	783	XrmGetResource (database, resource, resource, &type, &result);
894		784
895	return result.addr;	785	return result.addr;
896	}	786	}
897	#endif
898		787
899	/{{{ read the resources files /	788	/{{{ read the resources files /
900	/*	789	/*
901	* using XGetDefault () or the hand-rolled replacement	790	* using XGetDefault () or the hand-rolled replacement
902	*/	791	*/
…		…
905	rxvt_term::extract_resources ()	794	rxvt_term::extract_resources ()
906	{	795	{
907	dDisp;	796	dDisp;
908		797
909	#ifndef NO_RESOURCES	798	#ifndef NO_RESOURCES
910		799	XrmDatabase database = XrmGetDatabase (display->display);
911	char homedir = (char )getenv ("HOME");
912	char fname[1024];
913
914	# if defined XAPPLOADDIR
915	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
916	/* Compute the path of the possibly available localized Rxvt file */
917	char localepath[1024];
918
919	if (locale)
920	snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
921	else
922	localepath[0] = 0;
923	# endif
924	# endif
925
926	# ifdef USE_XGETDEFAULT
927	/*
928	* get resources using the X library function
929	*/
930	int entry;
931
932	char displayResource, xe;
933	XrmName name_prefix[3];
934	XrmClass class_prefix[3];
935	XrmDatabase database, rdb1;
936
937	database = NULL;
938
939	// for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
940
941	// 6. System wide per application default file.
942	/* Add in Rxvt file */
943	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
944	if (*localepath
945	&& ((rdb1 = XrmGetFileDatabase (localepath))
946	\|\| (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
947	# endif
948	XrmMergeDatabases (rdb1, &database);
949
950	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
951	if ((xe = (char *)getenv ("XAPPLRESDIR")))
952	{
953	snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
954
955	if ((rdb1 = XrmGetFileDatabase (fname)))
956	XrmMergeDatabases (rdb1, &database);
957	}
958
959	// 5. User's per application default file.
960	// none
961
962	// 4. User's defaults file.
963	/* Get any Xserver defaults */
964	displayResource = XResourceManagerString (disp);
965	if (displayResource != NULL)
966	{
967	if ((rdb1 = XrmGetStringDatabase (displayResource)))
968	XrmMergeDatabases (rdb1, &database);
969	}
970	else if (homedir)
971	{
972	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
973
974	if ((rdb1 = XrmGetFileDatabase (fname)))
975	XrmMergeDatabases (rdb1, &database);
976	}
977
978	/* Get screen specific resources */
979	displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
980	if (displayResource != NULL)
981	{
982	if ((rdb1 = XrmGetStringDatabase (displayResource)))
983	/* Merge with screen-independent resources */
984	XrmMergeDatabases (rdb1, &database);
985
986	XFree (displayResource);
987	}
988
989	// 3. User's per host defaults file
990	/* Add in XENVIRONMENT file */
991	if ((xe = (char *)getenv ("XENVIRONMENT"))
992	&& (rdb1 = XrmGetFileDatabase (xe)))
993	XrmMergeDatabases (rdb1, &database);
994	else if (homedir)
995	{
996	struct utsname un;
997
998	if (!uname (&un))
999	{
1000	snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
1001
1002	if ((rdb1 = XrmGetFileDatabase (fname)))
1003	XrmMergeDatabases (rdb1, &database);
1004	}
1005	}
1006
1007	xrmdatabase = database;
1008		800
1009	/*	801	/*
1010	* Query resources for options that affect us	802	* Query resources for options that affect us
1011	*/	803	*/
1012	for (entry = 0; entry < optList_size; entry++)	804	for (int entry = 0; entry < optList_size; entry++)
1013	{	805	{
1014	int s;	806	int s;
1015	char p, p0;	807	char p, p0;
1016	const char *kw = optList[entry].kw;	808	const char *kw = optList[entry].kw;
1017		809
1018	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)	810	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
1019	continue; /* previously set */	811	continue; // previously set
1020		812
1021	p = get_res (database, rs[Rs_name], kw);	813	p = get_res (database, rs[Rs_name], kw);
1022	p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);	814	p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1023	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))	815	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
1024	{	816	{
…		…
1032	if (p == NULL && p0)	824	if (p == NULL && p0)
1033	p = p0;	825	p = p0;
1034		826
1035	if (p)	827	if (p)
1036	{	828	{
		829	p = strdup (p);
		830	allocated.push_back (p);
1037	rs[optList[entry].doff] = p;	831	rs[optList[entry].doff] = p;
1038		832
1039	if (optList_isBool (entry))	833	if (optList_isBool (entry))
1040	{	834	{
1041	s = strcasecmp (p, "TRUE") == 0	835	s = strcasecmp (p, "TRUE") == 0
…		…
1053		847
1054	/*	848	/*
1055	* [R5 or later]: enumerate the resource database	849	* [R5 or later]: enumerate the resource database
1056	*/	850	*/
1057	# ifdef KEYSYM_RESOURCE	851	# ifdef KEYSYM_RESOURCE
		852	XrmName name_prefix[3];
		853	XrmClass class_prefix[3];
		854
1058	name_prefix[0] = XrmStringToName (rs[Rs_name]);	855	name_prefix[0] = XrmStringToName (rs[Rs_name]);
1059	name_prefix[1] = XrmStringToName ("keysym");	856	name_prefix[1] = XrmStringToName ("keysym");
1060	name_prefix[2] = NULLQUARK;	857	name_prefix[2] = NULLQUARK;
1061	class_prefix[0] = XrmStringToName (RESCLASS);	858	class_prefix[0] = XrmStringToName (RESCLASS);
1062	class_prefix[1] = XrmStringToName ("Keysym");	859	class_prefix[1] = XrmStringToName ("Keysym");
…		…
1073	XrmEnumerateDatabase (database, name_prefix, class_prefix,	870	XrmEnumerateDatabase (database, name_prefix, class_prefix,
1074	XrmEnumOneLevel, rxvt_define_key, NULL);	871	XrmEnumOneLevel, rxvt_define_key, NULL);
1075	# endif	872	# endif
1076	# endif	873	# endif
1077		874
1078	# else /* USE_XGETDEFAULT */
1079	/* get resources the hard way, but save lots of memory */
1080	FILE *fd = NULL;
1081
1082	if (homedir)
1083	{
1084	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1085
1086	for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1087	{
1088	snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1089
1090	if ((fd = fopen (fname, "r")) != NULL)
1091	break;
1092	}
1093	}
1094	/*
1095	* The normal order to match resources is the following:
1096	* @ global resources (partial match, ~/.Xdefaults)
1097	* @ application file resources (XAPPLOADDIR/Rxvt)
1098	* @ class resources (~/.Xdefaults)
1099	* @ private resources (~/.Xdefaults)
1100	*
1101	* However, for the hand-rolled resources, the matching algorithm
1102	* checks if a resource string value has already been allocated
1103	* and won't overwrite it with (in this case) a less specific
1104	* resource value.
1105	*
1106	* This avoids multiple allocation. Also, when we've called this
1107	* routine command-line string options have already been applied so we
1108	* needn't to allocate for those resources.
1109	*
1110	* So, search in resources from most to least specific.
1111	*
1112	* Also, use a special sub-class so that we can use either or both of
1113	* "XTerm" and "Rxvt" as class names.
1114	*/
1115
1116	get_xdefaults (fd, rs[Rs_name]);
1117	get_xdefaults (fd, RESCLASS);
1118	# ifdef RESFALLBACK
1119	get_xdefaults (fd, RESFALLBACK);
1120	# endif
1121
1122	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1123	{
1124	FILE *ad = NULL;
1125
1126	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1127	if (!*localepath \|\| (ad = fopen (localepath, "r")) == NULL)
1128	# endif
1129	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1130	if (ad != NULL)
1131	{
1132	get_xdefaults (ad, RESCLASS);
1133	get_xdefaults (ad, "");
1134	fclose (ad);
1135	}
1136	}
1137	# endif /* XAPPLOADDIR */
1138
1139	get_xdefaults (fd, ""); /* partial match */
1140	if (fd != NULL)
1141	fclose (fd);
1142	# endif /* USE_XGETDEFAULT */
1143
1144	#endif /* NO_RESOURCES */	875	#endif /* NO_RESOURCES */
1145	}	876	}
1146		877
1147	/}}} /	878	/}}} /
1148	/----------------------- end-of-file (C source) -----------------------/	879	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.76 by root, Mon Jan 9 22:41:41 2006 UTC vs. Revision 1.77 by root, Wed Jan 11 00:59:58 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.76 by root, Mon Jan 9 22:41:41 2006 UTC vs.
Revision 1.77 by root, Wed Jan 11 00:59:58 2006 UTC