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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.41 by root, Sun Sep 5 09:33:00 2004 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
		36	#ifdef KEYSYM_RESOURCE
		37	#include "keyboard.h"
		38	#endif
		39
34	/* #define DEBUG_RESOURCES */	40	/* #define DEBUG_RESOURCES */
35
36	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
37		41
38	/{{{ monolithic option/resource structure: /	42	/{{{ monolithic option/resource structure: /
39	/*	43	/*
40	* `string' options MUST have a usage argument	44	* `string' options MUST have a usage argument
41	* `switch' and `boolean' options have no argument	45	* `switch' and `boolean' options have no argument
…		…
67	(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))
68	#define optList_isBool(i) \	72	#define optList_isBool(i) \
69	(optList[i].flag & Opt_Boolean)	73	(optList[i].flag & Opt_Boolean)
70	#define optList_isReverse(i) \	74	#define optList_isReverse(i) \
71	(optList[i].flag & Opt_Reverse)	75	(optList[i].flag & Opt_Reverse)
72	#define optList_size() \	76	#define optList_size \
73	(sizeof (optList) / sizeof (optList[0]))	77	(sizeof (optList) / sizeof (optList[0]))
74		78
75	static const struct	79	static const struct
76	{	80	{
77	const unsigned long flag; /* Option flag */	81	const unsigned long flag; /* Option flag */
…		…
91	SWCH ("iconic", Opt_iconic, "start iconic"),	95	SWCH ("iconic", Opt_iconic, "start iconic"),
92	SWCH ("ic", Opt_iconic, NULL), /* short form */	96	SWCH ("ic", Opt_iconic, NULL), /* short form */
93	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),	97	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
94	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),	98	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
95	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"),
96	#ifdef HAVE_SCROLLBARS	101	#ifdef HAVE_SCROLLBARS
		102	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
97	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),	103	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
98	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"),
99	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"),
100	#endif	108	#endif
101	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),	109	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
102	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"),
103	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),	111	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
104	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),	112	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
…		…
163	RSTRG (Rs_color + Color_BD, "colorBD", "color"),	171	RSTRG (Rs_color + Color_BD, "colorBD", "color"),
164	RSTRG (Rs_color + Color_IT, "colorIT", "color"),	172	RSTRG (Rs_color + Color_IT, "colorIT", "color"),
165	RSTRG (Rs_color + Color_UL, "colorUL", "color"),	173	RSTRG (Rs_color + Color_UL, "colorUL", "color"),
166	RSTRG (Rs_color + Color_RV, "colorRV", "color"),	174	RSTRG (Rs_color + Color_RV, "colorRV", "color"),
167	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	175	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
		176	#if ENABLE_FRILLS
		177	RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
		178	#endif
168	#ifdef KEEP_SCROLLCOLOR	179	#ifdef KEEP_SCROLLCOLOR
169	RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),	180	RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
170	RSTRG (Rs_color + Color_trough, "troughColor", "color"),	181	RSTRG (Rs_color + Color_trough, "troughColor", "color"),
171	#endif /* KEEP_SCROLLCOLOR */	182	#endif /* KEEP_SCROLLCOLOR */
172	#ifdef OPTION_HC	183	#ifdef OPTION_HC
173	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),	184	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
174	#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"),
175	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)	194	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
176	RSTRG (Rs_path, "path", "search path"),	195	RSTRG (Rs_path, "path", "search path"),
177	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */	196	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */
178	#ifdef XPM_BACKGROUND	197	#ifdef XPM_BACKGROUND
179	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),	198	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
…		…
189	STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),	208	STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
190	#endif	209	#endif
191	#ifdef USE_XIM	210	#ifdef USE_XIM
192	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),	211	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
193	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"),
194	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
195	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"),
196	#endif	214	STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
197	#endif /* USE_XIM */	215	#endif /* USE_XIM */
198	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"),
199	STRG (Rs_title, "title", "title", "string", "title name for window"),	217	STRG (Rs_title, "title", "title", "string", "title name for window"),
200	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */	218	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
201	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),	219	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
202	#ifndef NO_CURSORCOLOR
203	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
204	/* command-line option = resource name */
205	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
206	#endif /* NO_CURSORCOLOR */
207	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
208	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
209	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
210	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"),
211	#if ENABLE_FRILLS	221	#if ENABLE_FRILLS
212	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	222	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
213	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	223	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
214	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	224	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
215	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),	225	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
216	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),	226	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
217	#endif
218	#ifndef NO_LINESPACE
219	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"),
220	#endif	228	#endif
221	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
222	#ifdef POINTER_BLANK	229	#ifdef POINTER_BLANK
223	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),	230	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
224	#endif	231	#endif
225	#ifndef NO_BACKSPACE_KEY	232	#ifndef NO_BACKSPACE_KEY
226	RSTRG (Rs_backspace_key, "backspacekey", "string"),	233	RSTRG (Rs_backspace_key, "backspacekey", "string"),
227	#endif	234	#endif
228	#ifndef NO_DELETE_KEY	235	#ifndef NO_DELETE_KEY
229	RSTRG (Rs_delete_key, "deletekey", "string"),	236	RSTRG (Rs_delete_key, "deletekey", "string"),
230	#endif	237	#endif
231	RSTRG (Rs_selectstyle, "selectstyle", "mode"),	238	RSTRG (Rs_selectstyle, "selectstyle", "mode"),
232	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
233	#ifdef HAVE_SCROLLBARS
234	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
235	#endif
236	#ifdef PRINTPIPE	239	#ifdef PRINTPIPE
237	RSTRG (Rs_print_pipe, "print-pipe", "string"),	240	RSTRG (Rs_print_pipe, "print-pipe", "string"),
238	#endif	241	#endif
239	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"),
240	INFO ("xrm", "string", "X resource"),
241	#ifdef CUTCHAR_RESOURCE	243	#ifdef CUTCHAR_RESOURCE
242	RSTRG (Rs_cutchars, "cutchars", "string"),	244	RSTRG (Rs_cutchars, "cutchars", "string"),
243	#endif /* CUTCHAR_RESOURCE */	245	#endif /* CUTCHAR_RESOURCE */
244	RSTRG (Rs_answerbackstring, "answerbackString", "string"),	246	RSTRG (Rs_answerbackstring, "answerbackString", "string"),
245	#ifndef NO_SECONDARY_SCREEN	247	#ifndef NO_SECONDARY_SCREEN
246	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),	248	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
247	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
248	#endif	255	#endif
249	INFO ("e", "command arg ...", "command to execute")	256	INFO ("e", "command arg ...", "command to execute")
250	};	257	};
251		258
252	#undef INFO	259	#undef INFO
…		…
354	"strings,"	361	"strings,"
355	#endif	362	#endif
356	#if defined(ENABLE_FRILLS)	363	#if defined(ENABLE_FRILLS)
357	"frills,"	364	"frills,"
358	#endif	365	#endif
359	#if !defined(NO_LINESPACE)
360	"linespace,"
361	#endif
362	#if defined(PREFER_24BIT)	366	#if defined(PREFER_24BIT)
363	"24bit,"	367	"24bit,"
364	#endif	368	#endif
365	#if defined(SELECTION_SCROLLING)	369	#if defined(SELECTION_SCROLLING)
366	"selectionscrolling,"	370	"selectionscrolling,"
…		…
405	switch (type)	409	switch (type)
406	{	410	{
407	case 0: /* brief listing */	411	case 0: /* brief listing */
408	rxvt_log (" [-help] [--help]\n");	412	rxvt_log (" [-help] [--help]\n");
409		413
410	for (col = 1, i = 0; i < optList_size (); i++)	414	for (col = 1, i = 0; i < optList_size; i++)
411	if (optList[i].desc != NULL)	415	if (optList[i].desc != NULL)
412	{	416	{
413	int len = 0;	417	int len = 0;
414		418
415	if (!optList_isBool (i))	419	if (!optList_isBool (i))
…		…
438	break;	442	break;
439		443
440	case 1: /* full command-line listing */	444	case 1: /* full command-line listing */
441	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");	445	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
442		446
443	for (i = 0; i < optList_size (); i++)	447	for (i = 0; i < optList_size; i++)
444	if (optList[i].desc != NULL)	448	if (optList[i].desc != NULL)
445	{	449	{
446	#ifdef DEBUG_STRICT	450	#ifdef DEBUG_STRICT
447	assert (optList[i].opt != NULL);	451	assert (optList[i].opt != NULL);
448	#endif	452	#endif
…		…
459		463
460	case 2: /* full resource listing */	464	case 2: /* full resource listing */
461	rxvt_log (" [options] [-e command args]\n\n"	465	rxvt_log (" [options] [-e command args]\n\n"
462	"where resources (long-options) include:\n");	466	"where resources (long-options) include:\n");
463		467
464	for (i = 0; i < optList_size (); i++)	468	for (i = 0; i < optList_size; i++)
465	if (optList[i].kw != NULL)	469	if (optList[i].kw != NULL)
466	rxvt_log (" %s: %*s%s\n",	470	rxvt_log (" %s: %*s%s\n",
467	optList[i].kw,	471	optList[i].kw,
468	(INDENT - strlen (optList[i].kw)), "", /* XXX */	472	(INDENT - strlen (optList[i].kw)), "", /* XXX */
469	(optList_isBool (i) ? "boolean" : optList[i].arg));	473	(optList_isBool (i) ? "boolean" : optList[i].arg));
…		…
490	int i, bad_option = 0;	494	int i, bad_option = 0;
491	static const char On[3] = "ON", Off[4] = "OFF";	495	static const char On[3] = "ON", Off[4] = "OFF";
492		496
493	for (i = 1; i < argc; i++)	497	for (i = 1; i < argc; i++)
494	{	498	{
495	unsigned int entry, longopt = 0;	499	unsigned int entry, longopt = 0;
496	const char flag, opt;	500	const char flag, opt;
497		501
498	opt = argv[i];	502	opt = argv[i];
499	#ifdef DEBUG_RESOURCES	503	#ifdef DEBUG_RESOURCES
500	fprintf (stderr, "argv[%d] = %s: ", i, opt);	504	fprintf (stderr, "argv[%d] = %s: ", i, opt);
501	#endif	505	#endif
…		…
522	rxvt_usage (longopt ? 2 : 1);	526	rxvt_usage (longopt ? 2 : 1);
523	if (!strcmp (opt, "h"))	527	if (!strcmp (opt, "h"))
524	rxvt_usage (0);	528	rxvt_usage (0);
525		529
526	/* feature: always try to match long-options */	530	/* feature: always try to match long-options */
527	for (entry = 0; entry < optList_size (); entry++)	531	for (entry = 0; entry < optList_size; entry++)
528	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))	532	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
529	\|\| (!longopt	533	\|\| (!longopt
530	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))	534	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))
531	break;	535	break;
532		536
533	if (entry < optList_size ())	537	if (entry < optList_size)
534	{	538	{
535	if (optList_isReverse (entry))	539	if (optList_isReverse (entry))
536	flag = flag == On ? Off : On;	540	flag = flag == On ? Off : On;
537		541
538	if (optList_strlen (entry))	542	if (optList_strlen (entry))
…		…
552	#ifdef DEBUG_RESOURCES	556	#ifdef DEBUG_RESOURCES
553	fprintf (stderr, "boolean (%s,%s) = %s\n",	557	fprintf (stderr, "boolean (%s,%s) = %s\n",
554	optList[entry].opt, optList[entry].kw, flag);	558	optList[entry].opt, optList[entry].kw, flag);
555	#endif	559	#endif
556	if (flag == On)	560	if (flag == On)
557	options \|= (optList[entry].flag);	561	options \|= optList[entry].flag;
558	else	562	else
559	options &= ~ (optList[entry].flag);	563	options &= ~optList[entry].flag;
560		564
561	if (optList[entry].doff != -1)	565	if (optList[entry].doff != -1)
562	rs[optList[entry].doff] = flag;	566	rs[optList[entry].doff] = flag;
563	}	567	}
564	}	568	}
…		…
603	XrmQuarkList quarks,	607	XrmQuarkList quarks,
604	XrmRepresentation *type __attribute__((unused)),	608	XrmRepresentation *type __attribute__((unused)),
605	XrmValue *value,	609	XrmValue *value,
606	XPointer closure __attribute__((unused)))	610	XPointer closure __attribute__((unused)))
607	{	611	{
608	int last;	612	int last;
609		613
610	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 */
611	;	615	;
		616
612	last--;	617	last--;
613	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
614	return False;	619	return False;
615	}	620	}
616		621
…		…
621	* arg will be	626	* arg will be
622	* NULL for ~/.Xdefaults and	627	* NULL for ~/.Xdefaults and
623	* non-NULL for command-line options (need to allocate)	628	* non-NULL for command-line options (need to allocate)
624	*/	629	*/
625	#define NEWARGLIM 500 /* `reasonable' size */	630	#define NEWARGLIM 500 /* `reasonable' size */
		631
		632	struct keysym_vocabulary_t
		633	{
		634	const char *name;
		635	unsigned short len;
		636	unsigned short value;
		637	};
		638	keysym_vocabulary_t keysym_vocabulary[] =
		639	{
		640	{ "ISOLevel3", 9, Level3Mask },
		641	{ "AppKeypad", 9, AppKeypadMask },
		642	{ "Control", 7, ControlMask },
		643	{ "NumLock", 7, NumLockMask },
		644	{ "Shift", 5, ShiftMask },
		645	{ "Meta", 4, MetaMask },
		646	{ "Lock", 4, LockMask },
		647	{ "Mod1", 4, Mod1Mask },
		648	{ "Mod2", 4, Mod2Mask },
		649	{ "Mod3", 4, Mod3Mask },
		650	{ "Mod4", 4, Mod4Mask },
		651	{ "Mod5", 4, Mod5Mask },
		652	{ "I", 1, Level3Mask },
		653	{ "K", 1, AppKeypadMask },
		654	{ "C", 1, ControlMask },
		655	{ "N", 1, NumLockMask },
		656	{ "S", 1, ShiftMask },
		657	{ "M", 1, MetaMask },
		658	{ "A", 1, MetaMask },
		659	{ "L", 1, LockMask },
		660	{ "1", 1, Mod1Mask },
		661	{ "2", 1, Mod2Mask },
		662	{ "3", 1, Mod3Mask },
		663	{ "4", 1, Mod4Mask },
		664	{ "5", 1, Mod5Mask },
		665	};
		666
626	int	667	int
627	rxvt_term::parse_keysym (const char str, const char arg)	668	rxvt_term::parse_keysym (const char str, const char arg)
628	{	669	{
629	int n, sym;	670	int n, sym;
630	char key_string, newarg = NULL;	671	unsigned int state = 0;
		672	const char *pmodend = NULL;
		673	char *newarg = NULL;
631	char newargstr[NEWARGLIM];	674	char newargstr[NEWARGLIM];
632		675
633	if (arg == NULL)	676	if (arg == NULL)
634	{	677	{
635	if ((n = rxvt_Str_match (str, "keysym.")) == 0)	678	if ((n = rxvt_Str_match (str, "keysym.")) == 0)
636	return 0;	679	return 0;
		680
637	str += n; /* skip `keysym.' */	681	str += n; /* skip `keysym.' */
		682	if ((pmodend = strchr (str, ':')) < str)
		683	return -1;
		684	}
		685	else
		686	pmodend = str + strlen(str);
		687
		688	for (--pmodend; str < pmodend; --pmodend)
		689	if (*pmodend == '-')
		690	break;
		691
		692	while (str < pmodend)
638	}	693	{
		694	unsigned int i;
		695
		696	for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
		697	{
		698	if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
		699	{
		700	state \|= keysym_vocabulary[i].value;
		701	str += keysym_vocabulary[i].len;
		702	break;
		703	}
		704	}
		705
		706	if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
		707	return -1;
		708
		709	if (*str == '-')
		710	++str;
		711	}
		712
639	/* some scanf () have trouble with a 0x prefix */	713	/* some scanf () have trouble with a 0x prefix */
640	if (isdigit (str[0]))
641	{
642	if (str[0] == '0' && toupper (str[1]) == 'X')	714	if (str[0] == '0' && toupper (str[1]) == 'X')
		715	{
643	str += 2;	716	str += 2;
		717
644	if (arg)	718	if (arg)
645	{	719	{
646	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)	720	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
647	return -1;	721	return -1;
648	}	722	}
…		…
662	/*	736	/*
663	* convert keysym name to keysym number	737	* convert keysym name to keysym number
664	*/	738	*/
665	strncpy (newargstr, str, NEWARGLIM - 1);	739	strncpy (newargstr, str, NEWARGLIM - 1);
666	newargstr[NEWARGLIM - 1] = '\0';	740	newargstr[NEWARGLIM - 1] = '\0';
		741
667	if (arg == NULL)	742	if (arg == NULL)
668	{	743	{
669	if ((newarg = strchr (newargstr, ':')) == NULL)	744	if ((newarg = strchr (newargstr, ':')) == NULL)
670	return -1;	745	return -1;
		746
671	newarg++ = '\0'; / terminate keysym name */	747	newarg++ = '\0'; / terminate keysym name */
672	}	748	}
		749
673	if ((sym = XStringToKeysym (newargstr)) == None)	750	if ((sym = XStringToKeysym (newargstr)) == None)
674	return -1;	751	return -1;
675	}	752	}
676
677	if (sym < 0xFF00 \|\| sym > 0xFFFF) /* we only do extended keys */
678	return -1;
679	sym &= 0xFF;
680	if (Keysym_map[sym] != NULL) /* already set ? */
681	return -1;
682		753
683	if (newarg == NULL)	754	if (newarg == NULL)
684	{	755	{
685	strncpy (newargstr, arg, NEWARGLIM - 1);	756	strncpy (newargstr, arg, NEWARGLIM - 1);
686	newargstr[NEWARGLIM - 1] = '\0';	757	newargstr[NEWARGLIM - 1] = '\0';
687	newarg = newargstr;	758	newarg = newargstr;
688	}	759	}
		760
689	rxvt_Str_trim (newarg);	761	rxvt_Str_trim (newarg);
690	if (*newarg == '\0' \|\| (n = rxvt_Str_escaped (newarg)) == 0)	762	if (*newarg == '\0' \|\| (n = rxvt_Str_escaped (newarg)) == 0)
691	return -1;	763	return -1;
692	MIN_IT (n, 255);
693	key_string = (char )rxvt_malloc ((n + 1) sizeof (char));
694		764
695	key_string[0] = n;	765	keyboard->register_user_translation (sym, state, newarg);
696	strncpy (key_string + 1, newarg, n);
697	Keysym_map[sym] = (unsigned char *)key_string;
698
699	return 1;	766	return 1;
700	}	767	}
701		768
702	# endif /* KEYSYM_RESOURCE */	769	# endif /* KEYSYM_RESOURCE */
703		770
…		…
716	return;	783	return;
717		784
718	len = strlen (name);	785	len = strlen (name);
719	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)	786	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
720	{	787	{
721	unsigned int entry, n;	788	unsigned int entry, n;
722		789
723	while (str && isspace (str))	790	while (str && isspace (str))
724	str++; /* leading whitespace */	791	str++; /* leading whitespace */
725		792
726	if ((str[len] != '*' && str[len] != '.')	793	if ((str[len] != '*' && str[len] != '.')
…		…
729	str += (len + 1); /* skip `name' or `name.' /	796	str += (len + 1); /* skip `name' or `name.' /
730		797
731	# ifdef KEYSYM_RESOURCE	798	# ifdef KEYSYM_RESOURCE
732	if (!parse_keysym (str, NULL))	799	if (!parse_keysym (str, NULL))
733	# endif /* KEYSYM_RESOURCE */	800	# endif /* KEYSYM_RESOURCE */
734	for (entry = 0; entry < optList_size (); entry++)	801	for (entry = 0; entry < optList_size; entry++)
735	{	802	{
736	const char *kw = optList[entry].kw;	803	const char *kw = optList[entry].kw;
737		804
738	if (kw == NULL)	805	if (kw == NULL)
739	continue;	806	continue;
…		…
743	{	810	{
744	/* skip `keyword:' */	811	/* skip `keyword:' */
745	str += n + 1;	812	str += n + 1;
746	rxvt_Str_trim (str);	813	rxvt_Str_trim (str);
747	n = strlen (str);	814	n = strlen (str);
		815
748	if (n && rs[optList[entry].doff] == NULL)	816	if (n && rs[optList[entry].doff] == NULL)
749	{	817	{
750	/* not already set */	818	/* not already set */
751	int s;	819	int s;
752	char *p = 0;	820	char *p = 0;
…		…
773	rs[optList[entry].doff] = p;	841	rs[optList[entry].doff] = p;
774	allocated.push_back (p);	842	allocated.push_back (p);
775		843
776	if (optList_isBool (entry))	844	if (optList_isBool (entry))
777	{	845	{
778	s = strcasecmp (str, "TRUE") == 0	846	s = strcasecmp (str, "true") == 0
779	\|\| strcasecmp (str, "YES") == 0	847	\|\| strcasecmp (str, "yes") == 0
780	\|\| strcasecmp (str, "ON") == 0	848	\|\| strcasecmp (str, "on") == 0
781	\|\| strcasecmp (str, "1") == 0;	849	\|\| strcmp (str, "1") == 0;
782		850
783	if (optList_isReverse (entry))	851	if (optList_isReverse (entry))
784	s = !s;	852	s = !s;
785		853
786	if (s)	854	if (s)
…		…
806	/*	874	/*
807	* using XGetDefault () or the hand-rolled replacement	875	* using XGetDefault () or the hand-rolled replacement
808	*/	876	*/
809	/* ARGSUSED */	877	/* ARGSUSED */
810	void	878	void
811	rxvt_term::extract_resources (Display display __attribute__ ((unused)), const char name)	879	rxvt_term::extract_resources ()
812	{	880	{
		881	dDisp;
		882
813	#ifndef NO_RESOURCES	883	#ifndef NO_RESOURCES
		884
		885	char homedir = (char )getenv ("HOME");
		886	char fname[1024];
814		887
815	# if defined XAPPLOADDIR	888	# if defined XAPPLOADDIR
816	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	889	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
817	/* Compute the path of the possibly available localized Rxvt file */	890	/* Compute the path of the possibly available localized Rxvt file */
818	char *localepath = NULL;	891	char localepath[1024];
819		892
820	if (locale != NULL)	893	if (locale)
821	{ /* XXX: must limit length of string */
822	localepath = (char *)rxvt_malloc (256);
823	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,	894	snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
824	(int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),	895	else
825	locale); /* 258 = 255 + 4 (-.s) - 1 (/) /	896	localepath[0] = 0;
826	}
827
828	{
829	# endif	897	# endif
830	# endif	898	# endif
831		899
832	# ifdef USE_XGETDEFAULT	900	# ifdef USE_XGETDEFAULT
833	/*	901	/*
834	* get resources using the X library function	902	* get resources using the X library function
835	*/	903	*/
836	int entry;	904	int entry;
837		905
838	# ifdef XrmEnumOneLevel	906	# ifdef XrmEnumOneLevel
839	int i;	907	int i;
840	char displayResource, xe;	908	char displayResource, xe;
841	XrmName name_prefix[3];	909	XrmName name_prefix[3];
842	XrmClass class_prefix[3];	910	XrmClass class_prefix[3];
843	XrmDatabase database, rdb1;	911	XrmDatabase database, rdb1;
844	char fname[1024];
845		912
846	XrmInitialize ();	913	XrmInitialize ();
847	database = NULL;	914	database = NULL;
848		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.
849	/* Get any Xserver defaults */	940	/* Get any Xserver defaults */
850
851	displayResource = XResourceManagerString (display);	941	displayResource = XResourceManagerString (disp);
852	if (displayResource != NULL)	942	if (displayResource != NULL)
		943	{
853	database = XrmGetStringDatabase (displayResource);	944	if ((rdb1 = XrmGetStringDatabase (displayResource)))
854		945	XrmMergeDatabases (rdb1, &database);
855	# ifdef HAVE_EXTRA_XRESOURCE_FILES
856	/* Add in ~/.Xdefaults or ~/.Xresources */
857	{	946	}
858	char *ptr;	947	else if (homedir)
		948	{
		949	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
859		950
860	if ((ptr = (char *)getenv ("HOME")) == NULL)	951	if ((rdb1 = XrmGetFileDatabase (fname)))
861	ptr = ".";	952	XrmMergeDatabases (rdb1, &database);
		953	}
862		954
863	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))
864	{	976	{
865	sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,	977	snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
866	ptr, xnames[i]);	978
867	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))
868	{	1018	{
869	XrmMergeDatabases (rdb1, &database);	1019	s = strcasecmp (p, "TRUE") == 0
870	# 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;
871	break;	1029	else
872	# endif	1030	options &= ~optList[entry].flag;
873
874	}	1031	}
875	}	1032	}
876	}	1033	}
877	# endif
878		1034
879	/* Add in XENVIRONMENT file */
880
881	if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
882	&& (rdb1 = XrmGetFileDatabase (xe)) != NULL)
883	XrmMergeDatabases (rdb1, &database);
884
885	/* Add in Rxvt file */
886	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
887	if (localepath == NULL \|\| (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
888	# endif
889	rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
890
891	if (rdb1 != NULL)
892	XrmMergeDatabases (rdb1, &database);
893
894	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
895	if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
896	{
897	sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
898	- sizeof (RESCLASS) - 2, xe);
899	if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
900	XrmMergeDatabases (rdb1, &database);
901	}
902
903	XrmSetDatabase (display, database);
904	# endif
905
906	/*	1035	/*
907	* Query resources for options that affect us
908	*/
909	for (entry = 0; entry < optList_size (); entry++)
910	{
911	int s;
912	char p, p0;
913	const char *kw = optList[entry].kw;
914
915	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
916	continue; /* previously set */
917
918	p = XGetDefault (display, name, kw);
919	p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
920	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
921	{
922	p = XGetDefault (display, RESCLASS, kw);
923	#ifdef RESFALLBACK
924	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
925	p = XGetDefault (display, RESFALLBACK, kw);
926	#endif
927	}
928
929	if (p == NULL && p0)
930	p = p0;
931
932	if (p)
933	{
934	rs[optList[entry].doff] = p;
935
936	if (optList_isBool (entry))
937	{
938	s = strcasecmp (p, "TRUE") == 0
939	\|\| strcasecmp (p, "YES") == 0
940	\|\| strcasecmp (p, "ON") == 0
941	\|\| strcasecmp (p, "1") == 0;
942	if (optList_isReverse (entry))
943	s = !s;
944	if (s)
945	options \|= (optList[entry].flag);
946	else
947	options &= ~ (optList[entry].flag);
948	}
949	}
950	}
951
952	/*
953	* [R5 or later]: enumerate the resource database	1036	* [R5 or later]: enumerate the resource database
954	*/	1037	*/
955	# ifdef XrmEnumOneLevel
956	# ifdef KEYSYM_RESOURCE	1038	# ifdef KEYSYM_RESOURCE
957	name_prefix[0] = XrmStringToName (name);	1039	name_prefix[0] = XrmStringToName (rs[Rs_name]);
958	name_prefix[1] = XrmStringToName ("keysym");	1040	name_prefix[1] = XrmStringToName ("keysym");
959	name_prefix[2] = NULLQUARK;	1041	name_prefix[2] = NULLQUARK;
960	class_prefix[0] = XrmStringToName (RESCLASS);	1042	class_prefix[0] = XrmStringToName (RESCLASS);
961	class_prefix[1] = XrmStringToName ("Keysym");	1043	class_prefix[1] = XrmStringToName ("Keysym");
962	class_prefix[2] = NULLQUARK;	1044	class_prefix[2] = NULLQUARK;
963	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1045	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
964	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1046	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
965	XrmEnumOneLevel, rxvt_define_key, NULL);	1047	XrmEnumOneLevel, rxvt_define_key, NULL);
966	# ifdef RESFALLBACK	1048	# ifdef RESFALLBACK
967	name_prefix[0] = XrmStringToName (RESFALLBACK);	1049	name_prefix[0] = XrmStringToName (RESFALLBACK);
968	name_prefix[1] = XrmStringToName ("keysym");	1050	name_prefix[1] = XrmStringToName ("keysym");
969	class_prefix[0] = XrmStringToName (RESFALLBACK);	1051	class_prefix[0] = XrmStringToName (RESFALLBACK);
970	class_prefix[1] = XrmStringToName ("Keysym");	1052	class_prefix[1] = XrmStringToName ("Keysym");
971	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1053	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
972	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1054	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
973	XrmEnumOneLevel, rxvt_define_key, NULL);	1055	XrmEnumOneLevel, rxvt_define_key, NULL);
974	# endif
975	# endif	1056	# endif
976	# endif	1057	# endif
977		1058
978	# else /* USE_XGETDEFAULT */	1059	# else /* USE_XGETDEFAULT */
979	/* 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	{
980	FILE *fd = NULL;	1105	FILE *ad = NULL;
981	char *home;
982		1106
983	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)
984	{	1112	{
985	unsigned int i, len = strlen (home) + 2;	1113	get_xdefaults (ad, RESCLASS);
986	char *f = NULL;	1114	get_xdefaults (ad, "");
987
988	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
989	{
990	f = (char )rxvt_realloc (f, (len + strlen (xnames[i])) sizeof (char));
991
992	sprintf (f, "%s/%s", home, xnames[i]);
993
994	if ((fd = fopen (f, "r")) != NULL)
995	break;
996	}
997	free (f);	1115	fclose (ad);
998	}	1116	}
999	/*
1000	* The normal order to match resources is the following:
1001	* @ global resources (partial match, ~/.Xdefaults)
1002	* @ application file resources (XAPPLOADDIR/Rxvt)
1003	* @ class resources (~/.Xdefaults)
1004	* @ private resources (~/.Xdefaults)
1005	*
1006	* However, for the hand-rolled resources, the matching algorithm
1007	* checks if a resource string value has already been allocated
1008	* and won't overwrite it with (in this case) a less specific
1009	* resource value.
1010	*
1011	* This avoids multiple allocation. Also, when we've called this
1012	* routine command-line string options have already been applied so we
1013	* needn't to allocate for those resources.
1014	*
1015	* So, search in resources from most to least specific.
1016	*
1017	* Also, use a special sub-class so that we can use either or both of
1018	* "XTerm" and "Rxvt" as class names.
1019	*/
1020
1021	get_xdefaults (fd, name);
1022	get_xdefaults (fd, RESCLASS);
1023	# ifdef RESFALLBACK
1024	get_xdefaults (fd, RESFALLBACK);
1025	# endif
1026
1027	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1028	{
1029	FILE *ad = NULL;
1030
1031	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1032	if (localepath == NULL \|\| (ad = fopen (localepath, "r")) == NULL)
1033	# endif
1034	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1035	if (ad != NULL)
1036	{
1037	get_xdefaults (ad, RESCLASS);
1038	get_xdefaults (ad, "");
1039	fclose (ad);
1040	}
1041	}	1117	}
1042	# endif /* XAPPLOADDIR */	1118	# endif /* XAPPLOADDIR */
1043		1119
1044	get_xdefaults (fd, ""); /* partial match */	1120	get_xdefaults (fd, ""); /* partial match */
1045	if (fd != NULL)	1121	if (fd != NULL)
1046	fclose (fd);	1122	fclose (fd);
1047	# endif /* USE_XGETDEFAULT */	1123	# endif /* USE_XGETDEFAULT */
1048
1049	# if defined XAPPLOADDIR
1050	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1051
1052	}
1053
1054	/* Free the path of the possibly available localized Rxvt file */
1055	free (localepath);
1056	# endif
1057	# endif
1058		1124
1059	#endif /* NO_RESOURCES */	1125	#endif /* NO_RESOURCES */
1060	}	1126	}
1061		1127
1062	/}}} /	1128	/}}} /

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.41 by root, Sun Sep 5 09:33:00 2004 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.41 by root, Sun Sep 5 09:33:00 2004 UTC vs.
Revision 1.54 by root, Fri Feb 11 17:19:30 2005 UTC