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

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.56 by root, Thu Feb 17 15:07:48 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.56 by root, Thu Feb 17 15:07:48 2005 UTC