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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.72 by root, Fri Jan 6 05:28:55 2006 UTC vs.
Revision 1.79 by root, Mon Jan 16 09:28:17 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
…		…
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,"
…		…
373	"no_delete,"	368	"no_delete,"
374	#endif	369	#endif
375	#if EIGHT_BIT_CONTROLS	370	#if EIGHT_BIT_CONTROLS
376	"8bitctrls,"	371	"8bitctrls,"
377	#endif	372	#endif
378	#if !defined(NO_STRINGS)
379	"strings,"
380	#endif
381	#if defined(ENABLE_FRILLS)	373	#if defined(ENABLE_FRILLS)
382	"frills,"	374	"frills,"
383	#endif	375	#endif
384	#if defined(PREFER_24BIT)	376	#if defined(PREFER_24BIT)
385	"24bit,"	377	"24bit,"
…		…
402	#if defined(POINTER_BLANK)	394	#if defined(POINTER_BLANK)
403	"pointerBlank,"	395	"pointerBlank,"
404	#endif	396	#endif
405	#if defined(NO_RESOURCES)	397	#if defined(NO_RESOURCES)
406	"NoResources"	398	"NoResources"
407	#else
408	# if defined(USE_XGETDEFAULT)
409	"XGetDefaults"
410	# else
411	".Xdefaults"
412	# endif
413	#endif	399	#endif
414	"\nUsage: "; /* Usage */	400	"\nUsage: "; /* Usage */
415		401
416	#define INDENT 18	402	#define INDENT 18
417		403
…		…
573	{ /* boolean value */	559	{ /* boolean value */
574	#ifdef DEBUG_RESOURCES	560	#ifdef DEBUG_RESOURCES
575	fprintf (stderr, "boolean (%s,%s) = %s\n",	561	fprintf (stderr, "boolean (%s,%s) = %s\n",
576	optList[entry].opt, optList[entry].kw, flag);	562	optList[entry].opt, optList[entry].kw, flag);
577	#endif	563	#endif
578	if (flag == On)
579	SET_OPTION (optList[entry].flag & Optflag_mask);	564	set_option (optList[entry].flag & Optflag_mask, flag == On);
580	else
581	CLR_OPTION (optList[entry].flag & Optflag_mask);
582		565
583	if (optList[entry].doff != -1)	566	if (optList[entry].doff != -1)
584	rs[optList[entry].doff] = flag;	567	rs[optList[entry].doff] = flag;
585	}	568	}
586	}	569	}
…		…
695	{	678	{
696	if ((n = rxvt_Str_match (str, "keysym.")) == 0)	679	if ((n = rxvt_Str_match (str, "keysym.")) == 0)
697	return 0;	680	return 0;
698		681
699	str += n; /* skip `keysym.' */	682	str += n; /* skip `keysym.' */
700	if ((pmodend = strchr (str, ':')) < str)	683	if (!(pmodend = strchr (str, ':')))
701	return -1;	684	return -1;
702	}	685	}
703	else	686	else
704	pmodend = str + strlen(str);	687	pmodend = str + strlen(str);
705		688
…		…
783	keyboard->register_user_translation (sym, state, newarg);	766	keyboard->register_user_translation (sym, state, newarg);
784	return 1;	767	return 1;
785	}	768	}
786		769
787	# endif /* KEYSYM_RESOURCE */	770	# endif /* KEYSYM_RESOURCE */
		771	#endif /* NO_RESOURCES */
788		772
789	# ifndef USE_XGETDEFAULT	773	static char *
790	/{{{ rxvt_get_xdefaults () /	774	get_res (XrmDatabase database, const char program, const char option)
791	/*
792	* the matching algorithm used for memory-save fake resources
793	*/
794	void
795	rxvt_term::get_xdefaults (FILE stream, const char name)
796	{	775	{
797	unsigned int len;	776	char resource[512];
798	char *str, buffer[256];	777	char *type;
		778	XrmValue result;
799		779
800	if (stream == NULL)	780	snprintf (resource, sizeof (resource), "%s.%s", program, option);
801	return;	781	XrmGetResource (database, resource, resource, &type, &result);
802		782
803	len = strlen (name);	783	return result.addr;
804	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)	784	}
		785
		786	const char *
		787	rxvt_term::x_resource (const char *name)
		788	{
		789	XrmDatabase database = XrmGetDatabase (display->display);
		790
		791	const char *p = get_res (database, rs[Rs_name], name);
		792	const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
		793
		794	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
805	{	795	{
806	unsigned int entry, n;	796	p = get_res (database, RESCLASS, name);
807		797	#ifdef RESFALLBACK
808	while (str && isspace (str))	798	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
809	str++; /* leading whitespace */	799	p = get_res (database, RESFALLBACK, name);
810		800	#endif
811	if ((str[len] != '*' && str[len] != '.')
812	\|\| (len && strncmp (str, name, len)))
813	continue;
814	str += (len + 1); /* skip `name' or `name.' /
815
816	# ifdef KEYSYM_RESOURCE
817	if (!parse_keysym (str, NULL))
818	# endif /* KEYSYM_RESOURCE */
819	for (entry = 0; entry < optList_size; entry++)
820	{
821	const char *kw = optList[entry].kw;
822
823	if (kw == NULL)
824	continue;
825
826	n = strlen (kw);
827	if (str[n] == ':' && rxvt_Str_match (str, kw))
828	{
829	/* skip `keyword:' */
830	str += n + 1;
831	rxvt_Str_trim (str);
832	n = strlen (str);
833
834	if (n && rs[optList[entry].doff] == NULL)
835	{
836	/* not already set */
837	int s;
838	char *p = 0;
839
840	for (int o = 0;;)
841	{
842	p = (char *)rxvt_realloc (p, o + n + 1);
843	memcpy (p + o, str, n);
844	o += n;
845	p[o] = 0;
846
847	if (o == 0 \|\| p[o - 1] != '\\') // continuation line
848	break;
849
850	o--; // eat "\"
851
852	if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
853	break;
854
855	rxvt_Str_trim (str);
856	n = strlen (str);
857	}
858
859	rs[optList[entry].doff] = p;
860	allocated.push_back (p);
861
862	if (optList_isBool (entry))
863	{
864	s = strcasecmp (str, "true") == 0
865	\|\| strcasecmp (str, "yes") == 0
866	\|\| strcasecmp (str, "on") == 0
867	\|\| strcmp (str, "1") == 0;
868
869	if (optList_isReverse (entry))
870	s = !s;
871
872	if (s)
873	SET_OPTION (optList[entry].flag & Optflag_mask);
874	else
875	CLR_OPTION (optList[entry].flag & Optflag_mask);
876	}
877	}
878
879	break;
880	}
881	}
882	}	801	}
883		802
884	rewind (stream);	803	if (p == NULL && p0)
		804	p = p0;
		805
		806	return p;
885	}	807	}
886		808
887	/}}} /
888	# endif /* ! USE_XGETDEFAULT */
889	#endif /* NO_RESOURCES */
890
891	/{{{ read the resources files /
892	/*
893	* using XGetDefault () or the hand-rolled replacement
894	*/
895	/* ARGSUSED */
896	void	809	void
897	rxvt_term::extract_resources ()	810	rxvt_term::extract_resources ()
898	{	811	{
899	dDisp;
900
901	#ifndef NO_RESOURCES	812	#ifndef NO_RESOURCES
902
903	char homedir = (char )getenv ("HOME");
904	char fname[1024];
905
906	# if defined XAPPLOADDIR
907	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
908	/* Compute the path of the possibly available localized Rxvt file */
909	char localepath[1024];
910
911	if (locale)
912	snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
913	else
914	localepath[0] = 0;
915	# endif
916	# endif
917
918	# ifdef USE_XGETDEFAULT
919	/*
920	* get resources using the X library function
921	*/
922	int entry;
923
924	# ifdef XrmEnumOneLevel
925	char displayResource, xe;
926	XrmName name_prefix[3];
927	XrmClass class_prefix[3];
928	XrmDatabase database, rdb1;
929
930	XrmInitialize ();
931	database = NULL;
932
933	// for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
934
935	// 6. System wide per application default file.
936	/* Add in Rxvt file */
937	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
938	if (*localepath
939	&& ((rdb1 = XrmGetFileDatabase (localepath))
940	\|\| (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
941	# endif
942	XrmMergeDatabases (rdb1, &database);
943
944	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
945	if ((xe = (char *)getenv ("XAPPLRESDIR")))
946	{
947	snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
948
949	if ((rdb1 = XrmGetFileDatabase (fname)))
950	XrmMergeDatabases (rdb1, &database);
951	}
952
953	// 5. User's per application default file.
954	// none
955
956	// 4. User's defaults file.
957	/* Get any Xserver defaults */
958	displayResource = XResourceManagerString (disp);
959	if (displayResource != NULL)
960	{
961	if ((rdb1 = XrmGetStringDatabase (displayResource)))
962	XrmMergeDatabases (rdb1, &database);
963	}
964	else if (homedir)
965	{
966	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
967
968	if ((rdb1 = XrmGetFileDatabase (fname)))
969	XrmMergeDatabases (rdb1, &database);
970	}
971
972	/* Get screen specific resources */
973	displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
974	if (displayResource != NULL)
975	{
976	if ((rdb1 = XrmGetStringDatabase (displayResource)))
977	/* Merge with screen-independent resources */
978	XrmMergeDatabases (rdb1, &database);
979
980	XFree (displayResource);
981	}
982
983	// 3. User's per host defaults file
984	/* Add in XENVIRONMENT file */
985	if ((xe = (char *)getenv ("XENVIRONMENT"))
986	&& (rdb1 = XrmGetFileDatabase (xe)))
987	XrmMergeDatabases (rdb1, &database);
988	else if (homedir)
989	{
990	struct utsname un;
991
992	if (!uname (&un))
993	{
994	snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
995
996	if ((rdb1 = XrmGetFileDatabase (fname)))
997	XrmMergeDatabases (rdb1, &database);
998	}
999	}
1000
1001	XrmSetDatabase (disp, database);
1002	# endif
1003
1004	/*	813	/*
1005	* Query resources for options that affect us	814	* Query resources for options that affect us
1006	*/	815	*/
1007	for (entry = 0; entry < optList_size; entry++)	816	for (int entry = 0; entry < optList_size; entry++)
1008	{	817	{
1009	int s;	818	int s;
1010	char p, p0;
1011	const char *kw = optList[entry].kw;	819	const char *kw = optList[entry].kw;
1012		820
1013	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)	821	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
1014	continue; /* previously set */	822	continue; // previously set
1015		823
1016	p = XGetDefault (disp, rs[Rs_name], kw);	824	const char *p = x_resource (kw);
1017	p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
1018	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
1019	{
1020	p = XGetDefault (disp, RESCLASS, kw);
1021	#ifdef RESFALLBACK
1022	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
1023	p = XGetDefault (disp, RESFALLBACK, kw);
1024	#endif
1025	}
1026
1027	if (p == NULL && p0)
1028	p = p0;
1029		825
1030	if (p)	826	if (p)
1031	{	827	{
		828	p = strdup (p);
		829	allocated.push_back ((void *)p);
1032	rs[optList[entry].doff] = p;	830	rs[optList[entry].doff] = p;
1033		831
1034	if (optList_isBool (entry))	832	if (optList_isBool (entry))
1035	{	833	{
1036	s = strcasecmp (p, "TRUE") == 0	834	s = strcasecmp (p, "TRUE") == 0
…		…
1039	\|\| strcasecmp (p, "1") == 0;	837	\|\| strcasecmp (p, "1") == 0;
1040		838
1041	if (optList_isReverse (entry))	839	if (optList_isReverse (entry))
1042	s = !s;	840	s = !s;
1043		841
1044	if (s)
1045	SET_OPTION (optList[entry].flag & Optflag_mask);	842	set_option (optList[entry].flag & Optflag_mask, s);
1046	else
1047	CLR_OPTION (optList[entry].flag & Optflag_mask);
1048	}	843	}
1049	}	844	}
1050	}	845	}
1051		846
1052	/*	847	/*
1053	* [R5 or later]: enumerate the resource database	848	* [R5 or later]: enumerate the resource database
1054	*/	849	*/
1055	# ifdef KEYSYM_RESOURCE	850	# ifdef KEYSYM_RESOURCE
		851	XrmDatabase database = XrmGetDatabase (display->display);
		852	XrmName name_prefix[3];
		853	XrmClass class_prefix[3];
		854
1056	name_prefix[0] = XrmStringToName (rs[Rs_name]);	855	name_prefix[0] = XrmStringToName (rs[Rs_name]);
1057	name_prefix[1] = XrmStringToName ("keysym");	856	name_prefix[1] = XrmStringToName ("keysym");
1058	name_prefix[2] = NULLQUARK;	857	name_prefix[2] = NULLQUARK;
1059	class_prefix[0] = XrmStringToName (RESCLASS);	858	class_prefix[0] = XrmStringToName (RESCLASS);
1060	class_prefix[1] = XrmStringToName ("Keysym");	859	class_prefix[1] = XrmStringToName ("Keysym");
1061	class_prefix[2] = NULLQUARK;	860	class_prefix[2] = NULLQUARK;
1062	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	861	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1063	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,	862	XrmEnumerateDatabase (database, name_prefix, class_prefix,
1064	XrmEnumOneLevel, rxvt_define_key, NULL);	863	XrmEnumOneLevel, rxvt_define_key, NULL);
1065	# ifdef RESFALLBACK	864	# ifdef RESFALLBACK
1066	name_prefix[0] = XrmStringToName (RESFALLBACK);	865	name_prefix[0] = XrmStringToName (RESFALLBACK);
1067	name_prefix[1] = XrmStringToName ("keysym");	866	name_prefix[1] = XrmStringToName ("keysym");
1068	class_prefix[0] = XrmStringToName (RESFALLBACK);	867	class_prefix[0] = XrmStringToName (RESFALLBACK);
1069	class_prefix[1] = XrmStringToName ("Keysym");	868	class_prefix[1] = XrmStringToName ("Keysym");
1070	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	869	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1071	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,	870	XrmEnumerateDatabase (database, name_prefix, class_prefix,
1072	XrmEnumOneLevel, rxvt_define_key, NULL);	871	XrmEnumOneLevel, rxvt_define_key, NULL);
1073	# endif	872	# endif
1074	# endif	873	# endif
1075		874
1076	# else /* USE_XGETDEFAULT */
1077	/* get resources the hard way, but save lots of memory */
1078	FILE *fd = NULL;
1079
1080	if (homedir)
1081	{
1082	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
1083
1084	for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
1085	{
1086	snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
1087
1088	if ((fd = fopen (fname, "r")) != NULL)
1089	break;
1090	}
1091	}
1092	/*
1093	* The normal order to match resources is the following:
1094	* @ global resources (partial match, ~/.Xdefaults)
1095	* @ application file resources (XAPPLOADDIR/Rxvt)
1096	* @ class resources (~/.Xdefaults)
1097	* @ private resources (~/.Xdefaults)
1098	*
1099	* However, for the hand-rolled resources, the matching algorithm
1100	* checks if a resource string value has already been allocated
1101	* and won't overwrite it with (in this case) a less specific
1102	* resource value.
1103	*
1104	* This avoids multiple allocation. Also, when we've called this
1105	* routine command-line string options have already been applied so we
1106	* needn't to allocate for those resources.
1107	*
1108	* So, search in resources from most to least specific.
1109	*
1110	* Also, use a special sub-class so that we can use either or both of
1111	* "XTerm" and "Rxvt" as class names.
1112	*/
1113
1114	get_xdefaults (fd, rs[Rs_name]);
1115	get_xdefaults (fd, RESCLASS);
1116	# ifdef RESFALLBACK
1117	get_xdefaults (fd, RESFALLBACK);
1118	# endif
1119
1120	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1121	{
1122	FILE *ad = NULL;
1123
1124	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1125	if (!*localepath \|\| (ad = fopen (localepath, "r")) == NULL)
1126	# endif
1127	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1128	if (ad != NULL)
1129	{
1130	get_xdefaults (ad, RESCLASS);
1131	get_xdefaults (ad, "");
1132	fclose (ad);
1133	}
1134	}
1135	# endif /* XAPPLOADDIR */
1136
1137	get_xdefaults (fd, ""); /* partial match */
1138	if (fd != NULL)
1139	fclose (fd);
1140	# endif /* USE_XGETDEFAULT */
1141
1142	#endif /* NO_RESOURCES */	875	#endif /* NO_RESOURCES */
1143	}	876	}
1144		877
1145	/}}} /
1146	/----------------------- end-of-file (C source) -----------------------/	878	/----------------------- 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.72 by root, Fri Jan 6 05:28:55 2006 UTC vs. Revision 1.79 by root, Mon Jan 16 09:28:17 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.72 by root, Fri Jan 6 05:28:55 2006 UTC vs.
Revision 1.79 by root, Mon Jan 16 09:28:17 2006 UTC