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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.74 by root, Sun Jan 8 01:02:15 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	"XGetDefaults"
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
…		…
692	{	681	{
693	if ((n = rxvt_Str_match (str, "keysym.")) == 0)	682	if ((n = rxvt_Str_match (str, "keysym.")) == 0)
694	return 0;	683	return 0;
695		684
696	str += n; /* skip `keysym.' */	685	str += n; /* skip `keysym.' */
697	if ((pmodend = strchr (str, ':')) < str)	686	if (!(pmodend = strchr (str, ':')))
698	return -1;	687	return -1;
699	}	688	}
700	else	689	else
701	pmodend = str + strlen(str);	690	pmodend = str + strlen(str);
702		691
…		…
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 */
		774	#endif /* NO_RESOURCES */
785		775
786	# ifndef USE_XGETDEFAULT	776	char get_res (XrmDatabase database, const char program, const char *option)
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	{	777	{
794	unsigned int len;	778	char resource[512];
795	char *str, buffer[256];	779	char *type;
		780	XrmValue result;
796		781
797	if (stream == NULL)	782	snprintf (resource, sizeof (resource), "%s.%s", program, option);
798	return;	783	XrmGetResource (database, resource, resource, &type, &result);
799		784
800	len = strlen (name);	785	return result.addr;
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	}	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	*/
…		…
891	rxvt_term::extract_resources ()	794	rxvt_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
…		…
1042		847
1043	/*	848	/*
1044	* [R5 or later]: enumerate the resource database	849	* [R5 or later]: enumerate the resource database
1045	*/	850	*/
1046	# ifdef KEYSYM_RESOURCE	851	# ifdef KEYSYM_RESOURCE
		852	XrmName name_prefix[3];
		853	XrmClass class_prefix[3];
		854
1047	name_prefix[0] = XrmStringToName (rs[Rs_name]);	855	name_prefix[0] = XrmStringToName (rs[Rs_name]);
1048	name_prefix[1] = XrmStringToName ("keysym");	856	name_prefix[1] = XrmStringToName ("keysym");
1049	name_prefix[2] = NULLQUARK;	857	name_prefix[2] = NULLQUARK;
1050	class_prefix[0] = XrmStringToName (RESCLASS);	858	class_prefix[0] = XrmStringToName (RESCLASS);
1051	class_prefix[1] = XrmStringToName ("Keysym");	859	class_prefix[1] = XrmStringToName ("Keysym");
1052	class_prefix[2] = NULLQUARK;	860	class_prefix[2] = NULLQUARK;
1053	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	861	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1054	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,	862	XrmEnumerateDatabase (database, name_prefix, class_prefix,
1055	XrmEnumOneLevel, rxvt_define_key, NULL);	863	XrmEnumOneLevel, rxvt_define_key, NULL);
1056	# ifdef RESFALLBACK	864	# ifdef RESFALLBACK
1057	name_prefix[0] = XrmStringToName (RESFALLBACK);	865	name_prefix[0] = XrmStringToName (RESFALLBACK);
1058	name_prefix[1] = XrmStringToName ("keysym");	866	name_prefix[1] = XrmStringToName ("keysym");
1059	class_prefix[0] = XrmStringToName (RESFALLBACK);	867	class_prefix[0] = XrmStringToName (RESFALLBACK);
1060	class_prefix[1] = XrmStringToName ("Keysym");	868	class_prefix[1] = XrmStringToName ("Keysym");
1061	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	869	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1062	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,	870	XrmEnumerateDatabase (database, name_prefix, class_prefix,
1063	XrmEnumOneLevel, rxvt_define_key, NULL);	871	XrmEnumOneLevel, rxvt_define_key, NULL);
1064	# endif	872	# endif
1065	# endif	873	# endif
1066		874
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 */	875	#endif /* NO_RESOURCES */
1134	}	876	}
1135		877
1136	/}}} /	878	/}}} /
1137	/----------------------- 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.74 by root, Sun Jan 8 01:02:15 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.74 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.77 by root, Wed Jan 11 00:59:58 2006 UTC