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

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

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.43 by root, Wed Dec 15 00:53:23 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.43 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.54 by root, Fri Feb 11 17:19:30 2005 UTC