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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.46 by root, Sun Jan 16 19:20:30 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 */
…		…
97	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),	97	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
98	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),	98	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),	99	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
100	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),	100	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
101	#ifdef HAVE_SCROLLBARS	101	#ifdef HAVE_SCROLLBARS
		102	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),	103	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
103	BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),	104	BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
104	BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),	105	BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
		106	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
		107	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105	#endif	108	#endif
106	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),	109	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
107	BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse \| Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),	110	BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse \| Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
108	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),	111	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
109	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),	112	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
…		…
178	RSTRG (Rs_color + Color_trough, "troughColor", "color"),	181	RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179	#endif /* KEEP_SCROLLCOLOR */	182	#endif /* KEEP_SCROLLCOLOR */
180	#ifdef OPTION_HC	183	#ifdef OPTION_HC
181	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),	184	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182	#endif	185	#endif
		186	#ifndef NO_CURSORCOLOR
		187	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
		188	/* command-line option = resource name */
		189	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
		190	#endif /* NO_CURSORCOLOR */
		191	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
		192	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
		193	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
183	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)	194	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
184	RSTRG (Rs_path, "path", "search path"),	195	RSTRG (Rs_path, "path", "search path"),
185	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */	196	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */
186	#ifdef XPM_BACKGROUND	197	#ifdef XPM_BACKGROUND
187	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),	198	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
…		…
197	STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),	208	STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
198	#endif	209	#endif
199	#ifdef USE_XIM	210	#ifdef USE_XIM
200	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),	211	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
201	STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot\|OffTheSpot\|Root"),	212	STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot\|OffTheSpot\|Root"),
202	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
203	STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),	213	STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
204	#endif	214	STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
205	#endif /* USE_XIM */	215	#endif /* USE_XIM */
206	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"),
207	STRG (Rs_title, "title", "title", "string", "title name for window"),	217	STRG (Rs_title, "title", "title", "string", "title name for window"),
208	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */	218	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
209	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),	219	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
210	#ifndef NO_CURSORCOLOR
211	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
212	/* command-line option = resource name */
213	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
214	#endif /* NO_CURSORCOLOR */
215	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
216	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
217	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
218	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"),
219	#if ENABLE_FRILLS	221	#if ENABLE_FRILLS
220	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	222	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
221	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	223	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
222	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	224	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
223	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),	225	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
224	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),	226	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
225	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),	227	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
226	#endif	228	#endif
227	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
228	#ifdef POINTER_BLANK	229	#ifdef POINTER_BLANK
229	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),	230	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
230	#endif	231	#endif
231	#ifndef NO_BACKSPACE_KEY	232	#ifndef NO_BACKSPACE_KEY
232	RSTRG (Rs_backspace_key, "backspacekey", "string"),	233	RSTRG (Rs_backspace_key, "backspacekey", "string"),
233	#endif	234	#endif
234	#ifndef NO_DELETE_KEY	235	#ifndef NO_DELETE_KEY
235	RSTRG (Rs_delete_key, "deletekey", "string"),	236	RSTRG (Rs_delete_key, "deletekey", "string"),
236	#endif	237	#endif
237	RSTRG (Rs_selectstyle, "selectstyle", "mode"),	238	RSTRG (Rs_selectstyle, "selectstyle", "mode"),
238	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
239	#ifdef HAVE_SCROLLBARS
240	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
241	#endif
242	#ifdef PRINTPIPE	239	#ifdef PRINTPIPE
243	RSTRG (Rs_print_pipe, "print-pipe", "string"),	240	RSTRG (Rs_print_pipe, "print-pipe", "string"),
244	#endif	241	#endif
245	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),	242	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),
246	INFO ("xrm", "string", "X resource"),
247	#ifdef CUTCHAR_RESOURCE	243	#ifdef CUTCHAR_RESOURCE
248	RSTRG (Rs_cutchars, "cutchars", "string"),	244	RSTRG (Rs_cutchars, "cutchars", "string"),
249	#endif /* CUTCHAR_RESOURCE */	245	#endif /* CUTCHAR_RESOURCE */
250	RSTRG (Rs_answerbackstring, "answerbackString", "string"),	246	RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251	#ifndef NO_SECONDARY_SCREEN	247	#ifndef NO_SECONDARY_SCREEN
252	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),	248	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
253	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
		251	#if 0 && TODO
		252	#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
		253	INFO ("xrm", "string", "X resource"),
		254	#endif
254	#endif	255	#endif
255	INFO ("e", "command arg ...", "command to execute")	256	INFO ("e", "command arg ...", "command to execute")
256	};	257	};
257		258
258	#undef INFO	259	#undef INFO
…		…
408	switch (type)	409	switch (type)
409	{	410	{
410	case 0: /* brief listing */	411	case 0: /* brief listing */
411	rxvt_log (" [-help] [--help]\n");	412	rxvt_log (" [-help] [--help]\n");
412		413
413	for (col = 1, i = 0; i < optList_size (); i++)	414	for (col = 1, i = 0; i < optList_size; i++)
414	if (optList[i].desc != NULL)	415	if (optList[i].desc != NULL)
415	{	416	{
416	int len = 0;	417	int len = 0;
417		418
418	if (!optList_isBool (i))	419	if (!optList_isBool (i))
…		…
441	break;	442	break;
442		443
443	case 1: /* full command-line listing */	444	case 1: /* full command-line listing */
444	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");	445	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
445		446
446	for (i = 0; i < optList_size (); i++)	447	for (i = 0; i < optList_size; i++)
447	if (optList[i].desc != NULL)	448	if (optList[i].desc != NULL)
448	{	449	{
449	#ifdef DEBUG_STRICT	450	#ifdef DEBUG_STRICT
450	assert (optList[i].opt != NULL);	451	assert (optList[i].opt != NULL);
451	#endif	452	#endif
…		…
462		463
463	case 2: /* full resource listing */	464	case 2: /* full resource listing */
464	rxvt_log (" [options] [-e command args]\n\n"	465	rxvt_log (" [options] [-e command args]\n\n"
465	"where resources (long-options) include:\n");	466	"where resources (long-options) include:\n");
466		467
467	for (i = 0; i < optList_size (); i++)	468	for (i = 0; i < optList_size; i++)
468	if (optList[i].kw != NULL)	469	if (optList[i].kw != NULL)
469	rxvt_log (" %s: %*s%s\n",	470	rxvt_log (" %s: %*s%s\n",
470	optList[i].kw,	471	optList[i].kw,
471	(INDENT - strlen (optList[i].kw)), "", /* XXX */	472	(INDENT - strlen (optList[i].kw)), "", /* XXX */
472	(optList_isBool (i) ? "boolean" : optList[i].arg));	473	(optList_isBool (i) ? "boolean" : optList[i].arg));
…		…
493	int i, bad_option = 0;	494	int i, bad_option = 0;
494	static const char On[3] = "ON", Off[4] = "OFF";	495	static const char On[3] = "ON", Off[4] = "OFF";
495		496
496	for (i = 1; i < argc; i++)	497	for (i = 1; i < argc; i++)
497	{	498	{
498	unsigned int entry, longopt = 0;	499	unsigned int entry, longopt = 0;
499	const char flag, opt;	500	const char flag, opt;
500		501
501	opt = argv[i];	502	opt = argv[i];
502	#ifdef DEBUG_RESOURCES	503	#ifdef DEBUG_RESOURCES
503	fprintf (stderr, "argv[%d] = %s: ", i, opt);	504	fprintf (stderr, "argv[%d] = %s: ", i, opt);
504	#endif	505	#endif
…		…
525	rxvt_usage (longopt ? 2 : 1);	526	rxvt_usage (longopt ? 2 : 1);
526	if (!strcmp (opt, "h"))	527	if (!strcmp (opt, "h"))
527	rxvt_usage (0);	528	rxvt_usage (0);
528		529
529	/* feature: always try to match long-options */	530	/* feature: always try to match long-options */
530	for (entry = 0; entry < optList_size (); entry++)	531	for (entry = 0; entry < optList_size; entry++)
531	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))	532	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
532	\|\| (!longopt	533	\|\| (!longopt
533	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))	534	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))
534	break;	535	break;
535		536
536	if (entry < optList_size ())	537	if (entry < optList_size)
537	{	538	{
538	if (optList_isReverse (entry))	539	if (optList_isReverse (entry))
539	flag = flag == On ? Off : On;	540	flag = flag == On ? Off : On;
540		541
541	if (optList_strlen (entry))	542	if (optList_strlen (entry))
…		…
555	#ifdef DEBUG_RESOURCES	556	#ifdef DEBUG_RESOURCES
556	fprintf (stderr, "boolean (%s,%s) = %s\n",	557	fprintf (stderr, "boolean (%s,%s) = %s\n",
557	optList[entry].opt, optList[entry].kw, flag);	558	optList[entry].opt, optList[entry].kw, flag);
558	#endif	559	#endif
559	if (flag == On)	560	if (flag == On)
560	options \|= (optList[entry].flag);	561	options \|= optList[entry].flag;
561	else	562	else
562	options &= ~ (optList[entry].flag);	563	options &= ~optList[entry].flag;
563		564
564	if (optList[entry].doff != -1)	565	if (optList[entry].doff != -1)
565	rs[optList[entry].doff] = flag;	566	rs[optList[entry].doff] = flag;
566	}	567	}
567	}	568	}
…		…
606	XrmQuarkList quarks,	607	XrmQuarkList quarks,
607	XrmRepresentation *type __attribute__((unused)),	608	XrmRepresentation *type __attribute__((unused)),
608	XrmValue *value,	609	XrmValue *value,
609	XPointer closure __attribute__((unused)))	610	XPointer closure __attribute__((unused)))
610	{	611	{
611	int last;	612	int last;
612		613
613	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */	614	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
614	;	615	;
		616
615	last--;	617	last--;
616	GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO	618	GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
617	return False;	619	return False;
618	}	620	}
619		621
…		…
663	};	665	};
664		666
665	int	667	int
666	rxvt_term::parse_keysym (const char str, const char arg)	668	rxvt_term::parse_keysym (const char str, const char arg)
667	{	669	{
668	int n, sym;	670	int n, sym;
669	unsigned int state = 0;	671	unsigned int state = 0;
670	const char *pmodend = NULL;	672	const char *pmodend = NULL;
671	char *newarg = NULL;	673	char *newarg = NULL;
672	char newargstr[NEWARGLIM];	674	char newargstr[NEWARGLIM];
673		675
674	if (arg == NULL)	676	if (arg == NULL)
675	{	677	{
676	if ((n = rxvt_Str_match (str, "keysym.")) == 0)	678	if ((n = rxvt_Str_match (str, "keysym.")) == 0)
677	return 0;	679	return 0;
…		…
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
939	}	1031	}
940	}	1032	}
941	}	1033	}
942	# endif
943		1034
944	/* Add in XENVIRONMENT file */
945
946	if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
947	&& (rdb1 = XrmGetFileDatabase (xe)) != NULL)
948	XrmMergeDatabases (rdb1, &database);
949
950	/* Add in Rxvt file */
951	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
952	if (localepath == NULL \|\| (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
953	# endif
954	rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
955
956	if (rdb1 != NULL)
957	XrmMergeDatabases (rdb1, &database);
958
959	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
960	if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
961	{
962	sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
963	- sizeof (RESCLASS) - 2, xe);
964	if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
965	XrmMergeDatabases (rdb1, &database);
966	}
967
968	XrmSetDatabase (display, database);
969	# endif
970
971	/*	1035	/*
972	* Query resources for options that affect us
973	*/
974	for (entry = 0; entry < optList_size (); entry++)
975	{
976	int s;
977	char p, p0;
978	const char *kw = optList[entry].kw;
979
980	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
981	continue; /* previously set */
982
983	p = XGetDefault (display, name, kw);
984	p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
985	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
986	{
987	p = XGetDefault (display, RESCLASS, kw);
988	#ifdef RESFALLBACK
989	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
990	p = XGetDefault (display, RESFALLBACK, kw);
991	#endif
992	}
993
994	if (p == NULL && p0)
995	p = p0;
996
997	if (p)
998	{
999	rs[optList[entry].doff] = p;
1000
1001	if (optList_isBool (entry))
1002	{
1003	s = strcasecmp (p, "TRUE") == 0
1004	\|\| strcasecmp (p, "YES") == 0
1005	\|\| strcasecmp (p, "ON") == 0
1006	\|\| strcasecmp (p, "1") == 0;
1007	if (optList_isReverse (entry))
1008	s = !s;
1009	if (s)
1010	options \|= (optList[entry].flag);
1011	else
1012	options &= ~ (optList[entry].flag);
1013	}
1014	}
1015	}
1016
1017	/*
1018	* [R5 or later]: enumerate the resource database	1036	* [R5 or later]: enumerate the resource database
1019	*/	1037	*/
1020	# ifdef XrmEnumOneLevel
1021	# ifdef KEYSYM_RESOURCE	1038	# ifdef KEYSYM_RESOURCE
1022	name_prefix[0] = XrmStringToName (name);	1039	name_prefix[0] = XrmStringToName (rs[Rs_name]);
1023	name_prefix[1] = XrmStringToName ("keysym");	1040	name_prefix[1] = XrmStringToName ("keysym");
1024	name_prefix[2] = NULLQUARK;	1041	name_prefix[2] = NULLQUARK;
1025	class_prefix[0] = XrmStringToName (RESCLASS);	1042	class_prefix[0] = XrmStringToName (RESCLASS);
1026	class_prefix[1] = XrmStringToName ("Keysym");	1043	class_prefix[1] = XrmStringToName ("Keysym");
1027	class_prefix[2] = NULLQUARK;	1044	class_prefix[2] = NULLQUARK;
1028	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1045	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1029	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1046	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
1030	XrmEnumOneLevel, rxvt_define_key, NULL);	1047	XrmEnumOneLevel, rxvt_define_key, NULL);
1031	# ifdef RESFALLBACK	1048	# ifdef RESFALLBACK
1032	name_prefix[0] = XrmStringToName (RESFALLBACK);	1049	name_prefix[0] = XrmStringToName (RESFALLBACK);
1033	name_prefix[1] = XrmStringToName ("keysym");	1050	name_prefix[1] = XrmStringToName ("keysym");
1034	class_prefix[0] = XrmStringToName (RESFALLBACK);	1051	class_prefix[0] = XrmStringToName (RESFALLBACK);
1035	class_prefix[1] = XrmStringToName ("Keysym");	1052	class_prefix[1] = XrmStringToName ("Keysym");
1036	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1053	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1037	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1054	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
1038	XrmEnumOneLevel, rxvt_define_key, NULL);	1055	XrmEnumOneLevel, rxvt_define_key, NULL);
1039	# endif
1040	# endif	1056	# endif
1041	# endif	1057	# endif
1042		1058
1043	# else /* USE_XGETDEFAULT */	1059	# else /* USE_XGETDEFAULT */
1044	/* 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	{
1045	FILE *fd = NULL;	1105	FILE *ad = NULL;
1046	char *home;
1047		1106
1048	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)
1049	{	1112	{
1050	unsigned int i, len = strlen (home) + 2;	1113	get_xdefaults (ad, RESCLASS);
1051	char *f = NULL;	1114	get_xdefaults (ad, "");
1052
1053	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
1054	{
1055	f = (char )rxvt_realloc (f, (len + strlen (xnames[i])) sizeof (char));
1056
1057	sprintf (f, "%s/%s", home, xnames[i]);
1058
1059	if ((fd = fopen (f, "r")) != NULL)
1060	break;
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.46 by root, Sun Jan 16 19:20:30 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.46 by root, Sun Jan 16 19:20:30 2005 UTC vs.
Revision 1.54 by root, Fri Feb 11 17:19:30 2005 UTC