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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.49 by root, Thu Feb 3 10:24:10 2005 UTC vs.
Revision 1.54 by root, Fri Feb 11 17:19:30 2005 UTC

…		…
29		29
30	#include "../config.h" /* NECESSARY */	30	#include "../config.h" /* NECESSARY */
31	#include "rxvt.h" /* NECESSARY */	31	#include "rxvt.h" /* NECESSARY */
32	#include "version.h"	32	#include "version.h"
33		33
		34	#include <sys/utsname.h>
		35
34	#ifdef KEYSYM_RESOURCE	36	#ifdef KEYSYM_RESOURCE
35	#include "keyboard.h"	37	#include "keyboard.h"
36	#endif	38	#endif
37		39
38	/* #define DEBUG_RESOURCES */	40	/* #define DEBUG_RESOURCES */
39
40	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
41		41
42	/{{{ monolithic option/resource structure: /	42	/{{{ monolithic option/resource structure: /
43	/*	43	/*
44	* `string' options MUST have a usage argument	44	* `string' options MUST have a usage argument
45	* `switch' and `boolean' options have no argument	45	* `switch' and `boolean' options have no argument
…		…
71	(optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))	71	(optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
72	#define optList_isBool(i) \	72	#define optList_isBool(i) \
73	(optList[i].flag & Opt_Boolean)	73	(optList[i].flag & Opt_Boolean)
74	#define optList_isReverse(i) \	74	#define optList_isReverse(i) \
75	(optList[i].flag & Opt_Reverse)	75	(optList[i].flag & Opt_Reverse)
76	#define optList_size() \	76	#define optList_size \
77	(sizeof (optList) / sizeof (optList[0]))	77	(sizeof (optList) / sizeof (optList[0]))
78		78
79	static const struct	79	static const struct
80	{	80	{
81	const unsigned long flag; /* Option flag */	81	const unsigned long flag; /* Option flag */
…		…
246	RSTRG (Rs_answerbackstring, "answerbackString", "string"),	246	RSTRG (Rs_answerbackstring, "answerbackString", "string"),
247	#ifndef NO_SECONDARY_SCREEN	247	#ifndef NO_SECONDARY_SCREEN
248	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),	248	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
249	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),	249	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
250	#endif	250	#endif
		251	#if 0 && TODO
251	#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)	252	#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
252	INFO ("xrm", "string", "X resource"),	253	INFO ("xrm", "string", "X resource"),
		254	#endif
253	#endif	255	#endif
254	INFO ("e", "command arg ...", "command to execute")	256	INFO ("e", "command arg ...", "command to execute")
255	};	257	};
256		258
257	#undef INFO	259	#undef INFO
…		…
407	switch (type)	409	switch (type)
408	{	410	{
409	case 0: /* brief listing */	411	case 0: /* brief listing */
410	rxvt_log (" [-help] [--help]\n");	412	rxvt_log (" [-help] [--help]\n");
411		413
412	for (col = 1, i = 0; i < optList_size (); i++)	414	for (col = 1, i = 0; i < optList_size; i++)
413	if (optList[i].desc != NULL)	415	if (optList[i].desc != NULL)
414	{	416	{
415	int len = 0;	417	int len = 0;
416		418
417	if (!optList_isBool (i))	419	if (!optList_isBool (i))
…		…
440	break;	442	break;
441		443
442	case 1: /* full command-line listing */	444	case 1: /* full command-line listing */
443	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");	445	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
444		446
445	for (i = 0; i < optList_size (); i++)	447	for (i = 0; i < optList_size; i++)
446	if (optList[i].desc != NULL)	448	if (optList[i].desc != NULL)
447	{	449	{
448	#ifdef DEBUG_STRICT	450	#ifdef DEBUG_STRICT
449	assert (optList[i].opt != NULL);	451	assert (optList[i].opt != NULL);
450	#endif	452	#endif
…		…
461		463
462	case 2: /* full resource listing */	464	case 2: /* full resource listing */
463	rxvt_log (" [options] [-e command args]\n\n"	465	rxvt_log (" [options] [-e command args]\n\n"
464	"where resources (long-options) include:\n");	466	"where resources (long-options) include:\n");
465		467
466	for (i = 0; i < optList_size (); i++)	468	for (i = 0; i < optList_size; i++)
467	if (optList[i].kw != NULL)	469	if (optList[i].kw != NULL)
468	rxvt_log (" %s: %*s%s\n",	470	rxvt_log (" %s: %*s%s\n",
469	optList[i].kw,	471	optList[i].kw,
470	(INDENT - strlen (optList[i].kw)), "", /* XXX */	472	(INDENT - strlen (optList[i].kw)), "", /* XXX */
471	(optList_isBool (i) ? "boolean" : optList[i].arg));	473	(optList_isBool (i) ? "boolean" : optList[i].arg));
…		…
492	int i, bad_option = 0;	494	int i, bad_option = 0;
493	static const char On[3] = "ON", Off[4] = "OFF";	495	static const char On[3] = "ON", Off[4] = "OFF";
494		496
495	for (i = 1; i < argc; i++)	497	for (i = 1; i < argc; i++)
496	{	498	{
497	unsigned int entry, longopt = 0;	499	unsigned int entry, longopt = 0;
498	const char flag, opt;	500	const char flag, opt;
499		501
500	opt = argv[i];	502	opt = argv[i];
501	#ifdef DEBUG_RESOURCES	503	#ifdef DEBUG_RESOURCES
502	fprintf (stderr, "argv[%d] = %s: ", i, opt);	504	fprintf (stderr, "argv[%d] = %s: ", i, opt);
503	#endif	505	#endif
…		…
524	rxvt_usage (longopt ? 2 : 1);	526	rxvt_usage (longopt ? 2 : 1);
525	if (!strcmp (opt, "h"))	527	if (!strcmp (opt, "h"))
526	rxvt_usage (0);	528	rxvt_usage (0);
527		529
528	/* feature: always try to match long-options */	530	/* feature: always try to match long-options */
529	for (entry = 0; entry < optList_size (); entry++)	531	for (entry = 0; entry < optList_size; entry++)
530	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))	532	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
531	\|\| (!longopt	533	\|\| (!longopt
532	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))	534	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))
533	break;	535	break;
534		536
535	if (entry < optList_size ())	537	if (entry < optList_size)
536	{	538	{
537	if (optList_isReverse (entry))	539	if (optList_isReverse (entry))
538	flag = flag == On ? Off : On;	540	flag = flag == On ? Off : On;
539		541
540	if (optList_strlen (entry))	542	if (optList_strlen (entry))
…		…
554	#ifdef DEBUG_RESOURCES	556	#ifdef DEBUG_RESOURCES
555	fprintf (stderr, "boolean (%s,%s) = %s\n",	557	fprintf (stderr, "boolean (%s,%s) = %s\n",
556	optList[entry].opt, optList[entry].kw, flag);	558	optList[entry].opt, optList[entry].kw, flag);
557	#endif	559	#endif
558	if (flag == On)	560	if (flag == On)
559	options \|= (optList[entry].flag);	561	options \|= optList[entry].flag;
560	else	562	else
561	options &= ~ (optList[entry].flag);	563	options &= ~optList[entry].flag;
562		564
563	if (optList[entry].doff != -1)	565	if (optList[entry].doff != -1)
564	rs[optList[entry].doff] = flag;	566	rs[optList[entry].doff] = flag;
565	}	567	}
566	}	568	}
…		…
781	return;	783	return;
782		784
783	len = strlen (name);	785	len = strlen (name);
784	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)	786	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
785	{	787	{
786	unsigned int entry, n;	788	unsigned int entry, n;
787		789
788	while (str && isspace (str))	790	while (str && isspace (str))
789	str++; /* leading whitespace */	791	str++; /* leading whitespace */
790		792
791	if ((str[len] != '*' && str[len] != '.')	793	if ((str[len] != '*' && str[len] != '.')
…		…
794	str += (len + 1); /* skip `name' or `name.' /	796	str += (len + 1); /* skip `name' or `name.' /
795		797
796	# ifdef KEYSYM_RESOURCE	798	# ifdef KEYSYM_RESOURCE
797	if (!parse_keysym (str, NULL))	799	if (!parse_keysym (str, NULL))
798	# endif /* KEYSYM_RESOURCE */	800	# endif /* KEYSYM_RESOURCE */
799	for (entry = 0; entry < optList_size (); entry++)	801	for (entry = 0; entry < optList_size; entry++)
800	{	802	{
801	const char *kw = optList[entry].kw;	803	const char *kw = optList[entry].kw;
802		804
803	if (kw == NULL)	805	if (kw == NULL)
804	continue;	806	continue;
…		…
808	{	810	{
809	/* skip `keyword:' */	811	/* skip `keyword:' */
810	str += n + 1;	812	str += n + 1;
811	rxvt_Str_trim (str);	813	rxvt_Str_trim (str);
812	n = strlen (str);	814	n = strlen (str);
		815
813	if (n && rs[optList[entry].doff] == NULL)	816	if (n && rs[optList[entry].doff] == NULL)
814	{	817	{
815	/* not already set */	818	/* not already set */
816	int s;	819	int s;
817	char *p = 0;	820	char *p = 0;
…		…
838	rs[optList[entry].doff] = p;	841	rs[optList[entry].doff] = p;
839	allocated.push_back (p);	842	allocated.push_back (p);
840		843
841	if (optList_isBool (entry))	844	if (optList_isBool (entry))
842	{	845	{
843	s = strcasecmp (str, "TRUE") == 0	846	s = strcasecmp (str, "true") == 0
844	\|\| strcasecmp (str, "YES") == 0	847	\|\| strcasecmp (str, "yes") == 0
845	\|\| strcasecmp (str, "ON") == 0	848	\|\| strcasecmp (str, "on") == 0
846	\|\| strcasecmp (str, "1") == 0;	849	\|\| strcmp (str, "1") == 0;
847		850
848	if (optList_isReverse (entry))	851	if (optList_isReverse (entry))
849	s = !s;	852	s = !s;
850		853
851	if (s)	854	if (s)
…		…
871	/*	874	/*
872	* using XGetDefault () or the hand-rolled replacement	875	* using XGetDefault () or the hand-rolled replacement
873	*/	876	*/
874	/* ARGSUSED */	877	/* ARGSUSED */
875	void	878	void
876	rxvt_term::extract_resources (Display display __attribute__ ((unused)), const char name)	879	rxvt_term::extract_resources ()
877	{	880	{
		881	dDisp;
		882
878	#ifndef NO_RESOURCES	883	#ifndef NO_RESOURCES
		884
		885	char homedir = (char )getenv ("HOME");
		886	char fname[1024];
879		887
880	# if defined XAPPLOADDIR	888	# if defined XAPPLOADDIR
881	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	889	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
882	/* Compute the path of the possibly available localized Rxvt file */	890	/* Compute the path of the possibly available localized Rxvt file */
883	char *localepath = NULL;	891	char localepath[1024];
884		892
885	if (locale != NULL)	893	if (locale)
886	{ /* XXX: must limit length of string */
887	localepath = (char *)rxvt_malloc (256);
888	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,	894	snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
889	(int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),	895	else
890	locale); /* 258 = 255 + 4 (-.s) - 1 (/) /	896	localepath[0] = 0;
891	}
892
893	{
894	# endif	897	# endif
895	# endif	898	# endif
896		899
897	# ifdef USE_XGETDEFAULT	900	# ifdef USE_XGETDEFAULT
898	/*	901	/*
899	* get resources using the X library function	902	* get resources using the X library function
900	*/	903	*/
901	int entry;	904	int entry;
902		905
903	# ifdef XrmEnumOneLevel	906	# ifdef XrmEnumOneLevel
904	int i;	907	int i;
905	char displayResource, xe;	908	char displayResource, xe;
906	XrmName name_prefix[3];	909	XrmName name_prefix[3];
907	XrmClass class_prefix[3];	910	XrmClass class_prefix[3];
908	XrmDatabase database, rdb1;	911	XrmDatabase database, rdb1;
909	char fname[1024];
910		912
911	XrmInitialize ();	913	XrmInitialize ();
912	database = NULL;	914	database = NULL;
913		915
		916	// for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
		917
		918	// 6. System wide per application default file.
		919	/* Add in Rxvt file */
		920	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
		921	if (*localepath
		922	&& ((rdb1 = XrmGetFileDatabase (localepath))
		923	\|\| (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
		924	# endif
		925	XrmMergeDatabases (rdb1, &database);
		926
		927	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
		928	if ((xe = (char *)getenv ("XAPPLRESDIR")))
		929	{
		930	snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
		931
		932	if ((rdb1 = XrmGetFileDatabase (fname)))
		933	XrmMergeDatabases (rdb1, &database);
		934	}
		935
		936	// 5. User's per application default file.
		937	// none
		938
		939	// 4. User's defaults file.
914	/* Get any Xserver defaults */	940	/* Get any Xserver defaults */
915
916	displayResource = XResourceManagerString (display);	941	displayResource = XResourceManagerString (disp);
917	if (displayResource != NULL)	942	if (displayResource != NULL)
		943	{
918	database = XrmGetStringDatabase (displayResource);	944	if ((rdb1 = XrmGetStringDatabase (displayResource)))
919		945	XrmMergeDatabases (rdb1, &database);
920	# ifdef HAVE_EXTRA_XRESOURCE_FILES
921	/* Add in ~/.Xdefaults or ~/.Xresources */
922	{	946	}
923	char *ptr;	947	else if (homedir)
		948	{
		949	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
924		950
925	if ((ptr = (char *)getenv ("HOME")) == NULL)	951	if ((rdb1 = XrmGetFileDatabase (fname)))
926	ptr = ".";	952	XrmMergeDatabases (rdb1, &database);
		953	}
927		954
928	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)	955	/* Get screen specific resources */
		956	displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
		957	if (displayResource != NULL)
		958	{
		959	if ((rdb1 = XrmGetStringDatabase (displayResource)))
		960	/* Merge with screen-independent resources */
		961	XrmMergeDatabases (rdb1, &database);
		962
		963	XFree (displayResource);
		964	}
		965
		966	// 3. User's per host defaults file
		967	/* Add in XENVIRONMENT file */
		968	if ((xe = (char *)getenv ("XENVIRONMENT"))
		969	&& (rdb1 = XrmGetFileDatabase (xe)))
		970	XrmMergeDatabases (rdb1, &database);
		971	else if (homedir)
		972	{
		973	struct utsname un;
		974
		975	if (!uname (&un))
929	{	976	{
930	sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,	977	snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
931	ptr, xnames[i]);	978
932	if ((rdb1 = XrmGetFileDatabase (fname)))	979	if ((rdb1 = XrmGetFileDatabase (fname)))
		980	XrmMergeDatabases (rdb1, &database);
		981	}
		982	}
		983
		984	XrmSetDatabase (disp, database);
		985	# endif
		986
		987	/*
		988	* Query resources for options that affect us
		989	*/
		990	for (entry = 0; entry < optList_size; entry++)
		991	{
		992	int s;
		993	char p, p0;
		994	const char *kw = optList[entry].kw;
		995
		996	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
		997	continue; /* previously set */
		998
		999	p = XGetDefault (disp, rs[Rs_name], kw);
		1000	p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
		1001	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		1002	{
		1003	p = XGetDefault (disp, RESCLASS, kw);
		1004	#ifdef RESFALLBACK
		1005	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		1006	p = XGetDefault (disp, RESFALLBACK, kw);
		1007	#endif
		1008	}
		1009
		1010	if (p == NULL && p0)
		1011	p = p0;
		1012
		1013	if (p)
		1014	{
		1015	rs[optList[entry].doff] = p;
		1016
		1017	if (optList_isBool (entry))
933	{	1018	{
934	XrmMergeDatabases (rdb1, &database);	1019	s = strcasecmp (p, "TRUE") == 0
935	# ifndef HAVE_BOTH_XRESOURCE_FILES	1020	\|\| strcasecmp (p, "YES") == 0
		1021	\|\| strcasecmp (p, "ON") == 0
		1022	\|\| strcasecmp (p, "1") == 0;
		1023
		1024	if (optList_isReverse (entry))
		1025	s = !s;
		1026
		1027	if (s)
		1028	options \|= optList[entry].flag;
936	break;	1029	else
937	# endif	1030	options &= ~optList[entry].flag;
938	}	1031	}
939	}	1032	}
940	}	1033	}
941	# endif
942		1034
943	/* Add in XENVIRONMENT file */
944
945	if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
946	&& (rdb1 = XrmGetFileDatabase (xe)) != NULL)
947	XrmMergeDatabases (rdb1, &database);
948
949	/* Add in Rxvt file */
950	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
951	if (localepath == NULL \|\| (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
952	# endif
953	rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
954
955	if (rdb1 != NULL)
956	XrmMergeDatabases (rdb1, &database);
957
958	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
959	if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
960	{
961	sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
962	- sizeof (RESCLASS) - 2, xe);
963	if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
964	XrmMergeDatabases (rdb1, &database);
965	}
966
967	XrmSetDatabase (display, database);
968	# endif
969
970	/*	1035	/*
971	* Query resources for options that affect us
972	*/
973	for (entry = 0; entry < optList_size (); entry++)
974	{
975	int s;
976	char p, p0;
977	const char *kw = optList[entry].kw;
978
979	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
980	continue; /* previously set */
981
982	p = XGetDefault (display, name, kw);
983	p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
984	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
985	{
986	p = XGetDefault (display, RESCLASS, kw);
987	#ifdef RESFALLBACK
988	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
989	p = XGetDefault (display, RESFALLBACK, kw);
990	#endif
991	}
992
993	if (p == NULL && p0)
994	p = p0;
995
996	if (p)
997	{
998	rs[optList[entry].doff] = p;
999
1000	if (optList_isBool (entry))
1001	{
1002	s = strcasecmp (p, "TRUE") == 0
1003	\|\| strcasecmp (p, "YES") == 0
1004	\|\| strcasecmp (p, "ON") == 0
1005	\|\| strcasecmp (p, "1") == 0;
1006	if (optList_isReverse (entry))
1007	s = !s;
1008	if (s)
1009	options \|= (optList[entry].flag);
1010	else
1011	options &= ~ (optList[entry].flag);
1012	}
1013	}
1014	}
1015
1016	/*
1017	* [R5 or later]: enumerate the resource database	1036	* [R5 or later]: enumerate the resource database
1018	*/	1037	*/
1019	# ifdef XrmEnumOneLevel
1020	# ifdef KEYSYM_RESOURCE	1038	# ifdef KEYSYM_RESOURCE
1021	name_prefix[0] = XrmStringToName (name);	1039	name_prefix[0] = XrmStringToName (rs[Rs_name]);
1022	name_prefix[1] = XrmStringToName ("keysym");	1040	name_prefix[1] = XrmStringToName ("keysym");
1023	name_prefix[2] = NULLQUARK;	1041	name_prefix[2] = NULLQUARK;
1024	class_prefix[0] = XrmStringToName (RESCLASS);	1042	class_prefix[0] = XrmStringToName (RESCLASS);
1025	class_prefix[1] = XrmStringToName ("Keysym");	1043	class_prefix[1] = XrmStringToName ("Keysym");
1026	class_prefix[2] = NULLQUARK;	1044	class_prefix[2] = NULLQUARK;
1027	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1045	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1028	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1046	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
1029	XrmEnumOneLevel, rxvt_define_key, NULL);	1047	XrmEnumOneLevel, rxvt_define_key, NULL);
1030	# ifdef RESFALLBACK	1048	# ifdef RESFALLBACK
1031	name_prefix[0] = XrmStringToName (RESFALLBACK);	1049	name_prefix[0] = XrmStringToName (RESFALLBACK);
1032	name_prefix[1] = XrmStringToName ("keysym");	1050	name_prefix[1] = XrmStringToName ("keysym");
1033	class_prefix[0] = XrmStringToName (RESFALLBACK);	1051	class_prefix[0] = XrmStringToName (RESFALLBACK);
1034	class_prefix[1] = XrmStringToName ("Keysym");	1052	class_prefix[1] = XrmStringToName ("Keysym");
1035	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1053	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1036	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1054	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
1037	XrmEnumOneLevel, rxvt_define_key, NULL);	1055	XrmEnumOneLevel, rxvt_define_key, NULL);
1038	# endif
1039	# endif	1056	# endif
1040	# endif	1057	# endif
1041		1058
1042	# else /* USE_XGETDEFAULT */	1059	# else /* USE_XGETDEFAULT */
1043	/* get resources the hard way, but save lots of memory */	1060	/* get resources the hard way, but save lots of memory */
		1061	FILE *fd = NULL;
		1062
		1063	if (homedir)
		1064	{
		1065	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
		1066
		1067	for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
		1068	{
		1069	snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
		1070
		1071	if ((fd = fopen (fname, "r")) != NULL)
		1072	break;
		1073	}
		1074	}
		1075	/*
		1076	* The normal order to match resources is the following:
		1077	* @ global resources (partial match, ~/.Xdefaults)
		1078	* @ application file resources (XAPPLOADDIR/Rxvt)
		1079	* @ class resources (~/.Xdefaults)
		1080	* @ private resources (~/.Xdefaults)
		1081	*
		1082	* However, for the hand-rolled resources, the matching algorithm
		1083	* checks if a resource string value has already been allocated
		1084	* and won't overwrite it with (in this case) a less specific
		1085	* resource value.
		1086	*
		1087	* This avoids multiple allocation. Also, when we've called this
		1088	* routine command-line string options have already been applied so we
		1089	* needn't to allocate for those resources.
		1090	*
		1091	* So, search in resources from most to least specific.
		1092	*
		1093	* Also, use a special sub-class so that we can use either or both of
		1094	* "XTerm" and "Rxvt" as class names.
		1095	*/
		1096
		1097	get_xdefaults (fd, rs[Rs_name]);
		1098	get_xdefaults (fd, RESCLASS);
		1099	# ifdef RESFALLBACK
		1100	get_xdefaults (fd, RESFALLBACK);
		1101	# endif
		1102
		1103	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
		1104	{
1044	FILE *fd = NULL;	1105	FILE *ad = NULL;
1045	char *home;
1046		1106
1047	if ((home = getenv ("HOME")) != NULL)	1107	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
		1108	if (!*localepath \|\| (ad = fopen (localepath, "r")) == NULL)
		1109	# endif
		1110	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
		1111	if (ad != NULL)
1048	{	1112	{
1049	unsigned int i, len = strlen (home) + 2;	1113	get_xdefaults (ad, RESCLASS);
1050	char *f = NULL;	1114	get_xdefaults (ad, "");
1051
1052	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
1053	{
1054	f = (char *)rxvt_realloc (f, len + strlen (xnames[i]));
1055
1056	sprintf (f, "%s/%s", home, xnames[i]);
1057
1058	if ((fd = fopen (f, "r")) != NULL)
1059	break;
1060	}
1061
1062	free (f);	1115	fclose (ad);
1063	}	1116	}
1064	/*
1065	* The normal order to match resources is the following:
1066	* @ global resources (partial match, ~/.Xdefaults)
1067	* @ application file resources (XAPPLOADDIR/Rxvt)
1068	* @ class resources (~/.Xdefaults)
1069	* @ private resources (~/.Xdefaults)
1070	*
1071	* However, for the hand-rolled resources, the matching algorithm
1072	* checks if a resource string value has already been allocated
1073	* and won't overwrite it with (in this case) a less specific
1074	* resource value.
1075	*
1076	* This avoids multiple allocation. Also, when we've called this
1077	* routine command-line string options have already been applied so we
1078	* needn't to allocate for those resources.
1079	*
1080	* So, search in resources from most to least specific.
1081	*
1082	* Also, use a special sub-class so that we can use either or both of
1083	* "XTerm" and "Rxvt" as class names.
1084	*/
1085
1086	get_xdefaults (fd, name);
1087	get_xdefaults (fd, RESCLASS);
1088	# ifdef RESFALLBACK
1089	get_xdefaults (fd, RESFALLBACK);
1090	# endif
1091
1092	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1093	{
1094	FILE *ad = NULL;
1095
1096	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1097	if (localepath == NULL \|\| (ad = fopen (localepath, "r")) == NULL)
1098	# endif
1099	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1100	if (ad != NULL)
1101	{
1102	get_xdefaults (ad, RESCLASS);
1103	get_xdefaults (ad, "");
1104	fclose (ad);
1105	}
1106	}	1117	}
1107	# endif /* XAPPLOADDIR */	1118	# endif /* XAPPLOADDIR */
1108		1119
1109	get_xdefaults (fd, ""); /* partial match */	1120	get_xdefaults (fd, ""); /* partial match */
1110	if (fd != NULL)	1121	if (fd != NULL)
1111	fclose (fd);	1122	fclose (fd);
1112	# endif /* USE_XGETDEFAULT */	1123	# endif /* USE_XGETDEFAULT */
1113
1114	# if defined XAPPLOADDIR
1115	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1116
1117	}
1118
1119	/* Free the path of the possibly available localized Rxvt file */
1120	free (localepath);
1121	# endif
1122	# endif
1123		1124
1124	#endif /* NO_RESOURCES */	1125	#endif /* NO_RESOURCES */
1125	}	1126	}
1126		1127
1127	/}}} /	1128	/}}} /

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.49 by root, Thu Feb 3 10:24:10 2005 UTC vs. Revision 1.54 by root, Fri Feb 11 17:19:30 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.49 by root, Thu Feb 3 10:24:10 2005 UTC vs.
Revision 1.54 by root, Fri Feb 11 17:19:30 2005 UTC