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

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.57 by root, Sat Feb 19 01:07:58 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.57 by root, Sat Feb 19 01:07:58 2005 UTC