[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.65 by root, Mon Jan 2 18:20:23 2006 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
		40	/* place holders used for parsing command-line options */
		41	#define Optflag_Reverse 0x40000000UL
		42	#define Optflag_Boolean 0x80000000UL
		43	#define Optflag_mask 0x3fffffffUL
		44
38	/* #define DEBUG_RESOURCES */	45	/* #define DEBUG_RESOURCES */
39
40	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
41		46
42	/{{{ monolithic option/resource structure: /	47	/{{{ monolithic option/resource structure: /
43	/*	48	/*
44	* `string' options MUST have a usage argument	49	* `string' options MUST have a usage argument
45	* `switch' and `boolean' options have no argument	50	* `switch' and `boolean' options have no argument
…		…
58	#define RSTRG(rsp, kw, arg) \	63	#define RSTRG(rsp, kw, arg) \
59	{0, (rsp), (kw), NULL, (arg), NULL}	64	{0, (rsp), (kw), NULL, (arg), NULL}
60		65
61	/* BOOL () - regular boolean `-/+' flag */	66	/* BOOL () - regular boolean `-/+' flag */
62	#define BOOL(rsp, kw, opt, flag, desc) \	67	#define BOOL(rsp, kw, opt, flag, desc) \
63	{ (Opt_Boolean\| (flag)), (rsp), (kw), (opt), NULL, (desc)}	68	{ (Optflag_Boolean \| (flag)), (rsp), (kw), (opt), NULL, (desc)}
64		69
65	/* SWCH () - `-' flag */	70	/* SWCH () - `-' flag */
66	#define SWCH(opt, flag, desc) \	71	#define SWCH(opt, flag, desc) \
67	{ (flag), -1, NULL, (opt), NULL, (desc)}	72	{ (flag), -1, NULL, (opt), NULL, (desc)}
68		73
69	/* convenient macros */	74	/* convenient macros */
70	#define optList_strlen(i) \	75	#define optList_strlen(i) \
71	(optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))	76	(optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
72	#define optList_isBool(i) \	77	#define optList_isBool(i) \
73	(optList[i].flag & Opt_Boolean)	78	(optList[i].flag & Optflag_Boolean)
74	#define optList_isReverse(i) \	79	#define optList_isReverse(i) \
75	(optList[i].flag & Opt_Reverse)	80	(optList[i].flag & Optflag_Reverse)
76	#define optList_size() \	81	#define optList_size \
77	(sizeof (optList) / sizeof (optList[0]))	82	(sizeof (optList) / sizeof (optList[0]))
78		83
79	static const struct	84	static const struct
80	{	85	{
81	const unsigned long flag; /* Option flag */	86	const unsigned long flag; /* Option flag */
…		…
96	SWCH ("ic", Opt_iconic, NULL), /* short form */	101	SWCH ("ic", Opt_iconic, NULL), /* short form */
97	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),	102	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
98	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),	103	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),	104	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
100	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),	105	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
101	#ifdef HAVE_SCROLLBARS	106	#if HAVE_SCROLLBARS
		107	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),	108	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
103	BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),	109	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"),	110	BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
		111	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
		112	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
105	#endif	113	#endif
106	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),	114	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
107	BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse \| Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),	115	BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse \| Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
108	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),	116	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
109	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),	117	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
110	#ifdef TRANSPARENT	118	#if TRANSPARENT
111	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),	119	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
112	BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
113	SWCH ("tr", Opt_transparent, NULL),	120	SWCH ("tr", Opt_transparent, NULL),
		121	# if TINTING
		122	STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
		123	# endif
		124	#endif
		125	#if OFF_FOCUS_FADING
		126	STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
		127	STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
		128	#endif
114	#if TINTING	129	#if TINTING
115	STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116	#endif
117	#endif
118	#ifdef OFF_FOCUS_FADING
119	STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
120	#endif
121	#ifdef TINTING
122	STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),	130	STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
123	#endif	131	#endif
124	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),	132	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
125	#ifndef NO_BELL	133	#ifndef NO_BELL
126	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),	134	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
…		…
135	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),	143	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
136	#endif	144	#endif
137	#if ENABLE_FRILLS	145	#if ENABLE_FRILLS
138	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),	146	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
139	BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),	147	BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
		148	BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"),
140	#endif	149	#endif
141	#ifdef CURSOR_BLINK	150	#if CURSOR_BLINK
142	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),	151	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
143	#endif	152	#endif
144	#ifdef POINTER_BLANK	153	#ifdef POINTER_BLANK
145	BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),	154	BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
146	#endif	155	#endif
…		…
178	RSTRG (Rs_color + Color_trough, "troughColor", "color"),	187	RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179	#endif /* KEEP_SCROLLCOLOR */	188	#endif /* KEEP_SCROLLCOLOR */
180	#ifdef OPTION_HC	189	#ifdef OPTION_HC
181	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),	190	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182	#endif	191	#endif
		192	#ifndef NO_CURSORCOLOR
		193	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
		194	/* command-line option = resource name */
		195	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
		196	#endif /* NO_CURSORCOLOR */
		197	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
		198	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
		199	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
183	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)	200	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
184	RSTRG (Rs_path, "path", "search path"),	201	RSTRG (Rs_path, "path", "search path"),
185	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */	202	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */
186	#ifdef XPM_BACKGROUND	203	#ifdef XPM_BACKGROUND
187	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),	204	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
…		…
193	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),	210	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
194	#if ENABLE_STYLES	211	#if ENABLE_STYLES
195	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),	212	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
196	STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),	213	STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
197	STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),	214	STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
		215	BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"),
198	#endif	216	#endif
199	#ifdef USE_XIM	217	#ifdef USE_XIM
200	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),	218	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
201	STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot\|OffTheSpot\|Root"),	219	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"),	220	STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
204	#endif	221	STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
205	#endif /* USE_XIM */	222	#endif /* USE_XIM */
206	STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),	223	STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
207	STRG (Rs_title, "title", "title", "string", "title name for window"),	224	STRG (Rs_title, "title", "title", "string", "title name for window"),
208	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */	225	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
209	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),	226	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"),	227	STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
		228	#if ENABLE_XEMBED
		229	STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
		230	#endif
219	#if ENABLE_FRILLS	231	#if ENABLE_FRILLS
		232	STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
		233	BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
220	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	234	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
221	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	235	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
222	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	236	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
223	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),	237	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
224	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),	238	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
225	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),	239	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
226	#endif	240	#endif
227	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
228	#ifdef POINTER_BLANK	241	#ifdef POINTER_BLANK
229	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),	242	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
230	#endif	243	#endif
231	#ifndef NO_BACKSPACE_KEY	244	#ifndef NO_BACKSPACE_KEY
232	RSTRG (Rs_backspace_key, "backspacekey", "string"),	245	RSTRG (Rs_backspace_key, "backspacekey", "string"),
233	#endif	246	#endif
234	#ifndef NO_DELETE_KEY	247	#ifndef NO_DELETE_KEY
235	RSTRG (Rs_delete_key, "deletekey", "string"),	248	RSTRG (Rs_delete_key, "deletekey", "string"),
236	#endif	249	#endif
237	RSTRG (Rs_selectstyle, "selectstyle", "mode"),	250	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	251	#ifdef PRINTPIPE
243	RSTRG (Rs_print_pipe, "print-pipe", "string"),	252	RSTRG (Rs_print_pipe, "print-pipe", "string"),
244	#endif	253	#endif
245	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),	254	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),
246	INFO ("xrm", "string", "X resource"),
247	#ifdef CUTCHAR_RESOURCE	255	#ifdef CUTCHAR_RESOURCE
248	RSTRG (Rs_cutchars, "cutchars", "string"),	256	RSTRG (Rs_cutchars, "cutchars", "string"),
249	#endif /* CUTCHAR_RESOURCE */	257	#endif /* CUTCHAR_RESOURCE */
250	RSTRG (Rs_answerbackstring, "answerbackString", "string"),	258	RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251	#ifndef NO_SECONDARY_SCREEN	259	#ifndef NO_SECONDARY_SCREEN
252	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),	260	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
253	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),	261	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
		262	#endif
		263	#if ENABLE_PERL
		264	STRG (Rs_perl_lib, "perl-lib", 0, "string", "directory where to look for additional extension scripts"),
		265	STRG (Rs_perl_eval, "perl-eval", 0, "string", "string to be evaluated after all extensions have been loaded"),
		266	STRG (Rs_perl, "perl", "perl", "string", "unused by urxvt proper, free for extensions to use"),
		267	#endif
		268	#if 0 && TODO
		269	#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
		270	INFO ("xrm", "string", "X resource"),
		271	#endif
254	#endif	272	#endif
255	INFO ("e", "command arg ...", "command to execute")	273	INFO ("e", "command arg ...", "command to execute")
256	};	274	};
257		275
258	#undef INFO	276	#undef INFO
…		…
408	switch (type)	426	switch (type)
409	{	427	{
410	case 0: /* brief listing */	428	case 0: /* brief listing */
411	rxvt_log (" [-help] [--help]\n");	429	rxvt_log (" [-help] [--help]\n");
412		430
413	for (col = 1, i = 0; i < optList_size (); i++)	431	for (col = 1, i = 0; i < optList_size; i++)
414	if (optList[i].desc != NULL)	432	if (optList[i].desc != NULL)
415	{	433	{
416	int len = 0;	434	int len = 0;
417		435
418	if (!optList_isBool (i))	436	if (!optList_isBool (i))
…		…
441	break;	459	break;
442		460
443	case 1: /* full command-line listing */	461	case 1: /* full command-line listing */
444	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");	462	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
445		463
446	for (i = 0; i < optList_size (); i++)	464	for (i = 0; i < optList_size; i++)
447	if (optList[i].desc != NULL)	465	if (optList[i].desc != NULL)
448	{	466	{
449	#ifdef DEBUG_STRICT	467	#ifdef DEBUG_STRICT
450	assert (optList[i].opt != NULL);	468	assert (optList[i].opt != NULL);
451	#endif	469	#endif
…		…
462		480
463	case 2: /* full resource listing */	481	case 2: /* full resource listing */
464	rxvt_log (" [options] [-e command args]\n\n"	482	rxvt_log (" [options] [-e command args]\n\n"
465	"where resources (long-options) include:\n");	483	"where resources (long-options) include:\n");
466		484
467	for (i = 0; i < optList_size (); i++)	485	for (i = 0; i < optList_size; i++)
468	if (optList[i].kw != NULL)	486	if (optList[i].kw != NULL)
469	rxvt_log (" %s: %*s%s\n",	487	rxvt_log (" %s: %*s%s\n",
470	optList[i].kw,	488	optList[i].kw,
471	(INDENT - strlen (optList[i].kw)), "", /* XXX */	489	(INDENT - strlen (optList[i].kw)), "", /* XXX */
472	(optList_isBool (i) ? "boolean" : optList[i].arg));	490	(optList_isBool (i) ? "boolean" : optList[i].arg));
…		…
493	int i, bad_option = 0;	511	int i, bad_option = 0;
494	static const char On[3] = "ON", Off[4] = "OFF";	512	static const char On[3] = "ON", Off[4] = "OFF";
495		513
496	for (i = 1; i < argc; i++)	514	for (i = 1; i < argc; i++)
497	{	515	{
498	unsigned int entry, longopt = 0;	516	unsigned int entry, longopt = 0;
499	const char flag, opt;	517	const char flag, opt;
500		518
501	opt = argv[i];	519	opt = argv[i];
502	#ifdef DEBUG_RESOURCES	520	#ifdef DEBUG_RESOURCES
503	fprintf (stderr, "argv[%d] = %s: ", i, opt);	521	fprintf (stderr, "argv[%d] = %s: ", i, opt);
504	#endif	522	#endif
…		…
525	rxvt_usage (longopt ? 2 : 1);	543	rxvt_usage (longopt ? 2 : 1);
526	if (!strcmp (opt, "h"))	544	if (!strcmp (opt, "h"))
527	rxvt_usage (0);	545	rxvt_usage (0);
528		546
529	/* feature: always try to match long-options */	547	/* feature: always try to match long-options */
530	for (entry = 0; entry < optList_size (); entry++)	548	for (entry = 0; entry < optList_size; entry++)
531	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))	549	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
532	\|\| (!longopt	550	\|\| (!longopt
533	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))	551	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))
534	break;	552	break;
535		553
536	if (entry < optList_size ())	554	if (entry < optList_size)
537	{	555	{
538	if (optList_isReverse (entry))	556	if (optList_isReverse (entry))
539	flag = flag == On ? Off : On;	557	flag = flag == On ? Off : On;
540		558
541	if (optList_strlen (entry))	559	if (optList_strlen (entry))
…		…
555	#ifdef DEBUG_RESOURCES	573	#ifdef DEBUG_RESOURCES
556	fprintf (stderr, "boolean (%s,%s) = %s\n",	574	fprintf (stderr, "boolean (%s,%s) = %s\n",
557	optList[entry].opt, optList[entry].kw, flag);	575	optList[entry].opt, optList[entry].kw, flag);
558	#endif	576	#endif
559	if (flag == On)	577	if (flag == On)
560	options \|= (optList[entry].flag);	578	SET_OPTION (optList[entry].flag & Optflag_mask);
561	else	579	else
562	options &= ~ (optList[entry].flag);	580	CLR_OPTION (optList[entry].flag & Optflag_mask);
563		581
564	if (optList[entry].doff != -1)	582	if (optList[entry].doff != -1)
565	rs[optList[entry].doff] = flag;	583	rs[optList[entry].doff] = flag;
566	}	584	}
567	}	585	}
…		…
606	XrmQuarkList quarks,	624	XrmQuarkList quarks,
607	XrmRepresentation *type __attribute__((unused)),	625	XrmRepresentation *type __attribute__((unused)),
608	XrmValue *value,	626	XrmValue *value,
609	XPointer closure __attribute__((unused)))	627	XPointer closure __attribute__((unused)))
610	{	628	{
611	int last;	629	int last;
612		630
613	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */	631	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
614	;	632	;
		633
615	last--;	634	last--;
616	GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO	635	GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
617	return False;	636	return False;
618	}	637	}
619		638
…		…
663	};	682	};
664		683
665	int	684	int
666	rxvt_term::parse_keysym (const char str, const char arg)	685	rxvt_term::parse_keysym (const char str, const char arg)
667	{	686	{
668	int n, sym;	687	int n, sym;
669	unsigned int state = 0;	688	unsigned int state = 0;
670	const char *pmodend = NULL;	689	const char *pmodend = NULL;
671	char *newarg = NULL;	690	char *newarg = NULL;
672	char newargstr[NEWARGLIM];	691	char newargstr[NEWARGLIM];
673		692
674	if (arg == NULL)	693	if (arg == NULL)
675	{	694	{
676	if ((n = rxvt_Str_match (str, "keysym.")) == 0)	695	if ((n = rxvt_Str_match (str, "keysym.")) == 0)
677	return 0;	696	return 0;
…		…
781	return;	800	return;
782		801
783	len = strlen (name);	802	len = strlen (name);
784	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)	803	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
785	{	804	{
786	unsigned int entry, n;	805	unsigned int entry, n;
787		806
788	while (str && isspace (str))	807	while (str && isspace (str))
789	str++; /* leading whitespace */	808	str++; /* leading whitespace */
790		809
791	if ((str[len] != '*' && str[len] != '.')	810	if ((str[len] != '*' && str[len] != '.')
…		…
794	str += (len + 1); /* skip `name' or `name.' /	813	str += (len + 1); /* skip `name' or `name.' /
795		814
796	# ifdef KEYSYM_RESOURCE	815	# ifdef KEYSYM_RESOURCE
797	if (!parse_keysym (str, NULL))	816	if (!parse_keysym (str, NULL))
798	# endif /* KEYSYM_RESOURCE */	817	# endif /* KEYSYM_RESOURCE */
799	for (entry = 0; entry < optList_size (); entry++)	818	for (entry = 0; entry < optList_size; entry++)
800	{	819	{
801	const char *kw = optList[entry].kw;	820	const char *kw = optList[entry].kw;
802		821
803	if (kw == NULL)	822	if (kw == NULL)
804	continue;	823	continue;
…		…
808	{	827	{
809	/* skip `keyword:' */	828	/* skip `keyword:' */
810	str += n + 1;	829	str += n + 1;
811	rxvt_Str_trim (str);	830	rxvt_Str_trim (str);
812	n = strlen (str);	831	n = strlen (str);
		832
813	if (n && rs[optList[entry].doff] == NULL)	833	if (n && rs[optList[entry].doff] == NULL)
814	{	834	{
815	/* not already set */	835	/* not already set */
816	int s;	836	int s;
817	char *p = 0;	837	char *p = 0;
…		…
838	rs[optList[entry].doff] = p;	858	rs[optList[entry].doff] = p;
839	allocated.push_back (p);	859	allocated.push_back (p);
840		860
841	if (optList_isBool (entry))	861	if (optList_isBool (entry))
842	{	862	{
843	s = strcasecmp (str, "TRUE") == 0	863	s = strcasecmp (str, "true") == 0
844	\|\| strcasecmp (str, "YES") == 0	864	\|\| strcasecmp (str, "yes") == 0
845	\|\| strcasecmp (str, "ON") == 0	865	\|\| strcasecmp (str, "on") == 0
846	\|\| strcasecmp (str, "1") == 0;	866	\|\| strcmp (str, "1") == 0;
847		867
848	if (optList_isReverse (entry))	868	if (optList_isReverse (entry))
849	s = !s;	869	s = !s;
850		870
851	if (s)	871	if (s)
852	options \|= optList[entry].flag;	872	SET_OPTION (optList[entry].flag & Optflag_mask);
853	else	873	else
854	options &= ~optList[entry].flag;	874	CLR_OPTION (optList[entry].flag & Optflag_mask);
855	}	875	}
856	}	876	}
857		877
858	break;	878	break;
859	}	879	}
…		…
871	/*	891	/*
872	* using XGetDefault () or the hand-rolled replacement	892	* using XGetDefault () or the hand-rolled replacement
873	*/	893	*/
874	/* ARGSUSED */	894	/* ARGSUSED */
875	void	895	void
876	rxvt_term::extract_resources (Display display __attribute__ ((unused)), const char name)	896	rxvt_term::extract_resources ()
877	{	897	{
		898	dDisp;
		899
878	#ifndef NO_RESOURCES	900	#ifndef NO_RESOURCES
		901
		902	char homedir = (char )getenv ("HOME");
		903	char fname[1024];
879		904
880	# if defined XAPPLOADDIR	905	# if defined XAPPLOADDIR
881	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	906	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
882	/* Compute the path of the possibly available localized Rxvt file */	907	/* Compute the path of the possibly available localized Rxvt file */
883	char *localepath = NULL;	908	char localepath[1024];
884		909
885	if (locale != NULL)	910	if (locale)
886	{ /* XXX: must limit length of string */
887	localepath = (char *)rxvt_malloc (256);
888	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,	911	snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
889	(int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),	912	else
890	locale); /* 258 = 255 + 4 (-.s) - 1 (/) /	913	localepath[0] = 0;
891	}
892
893	{
894	# endif	914	# endif
895	# endif	915	# endif
896		916
897	# ifdef USE_XGETDEFAULT	917	# ifdef USE_XGETDEFAULT
898	/*	918	/*
899	* get resources using the X library function	919	* get resources using the X library function
900	*/	920	*/
901	int entry;	921	int entry;
902		922
903	# ifdef XrmEnumOneLevel	923	# ifdef XrmEnumOneLevel
904	int i;
905	char displayResource, xe;	924	char displayResource, xe;
906	XrmName name_prefix[3];	925	XrmName name_prefix[3];
907	XrmClass class_prefix[3];	926	XrmClass class_prefix[3];
908	XrmDatabase database, rdb1;	927	XrmDatabase database, rdb1;
909	char fname[1024];
910		928
911	XrmInitialize ();	929	XrmInitialize ();
912	database = NULL;	930	database = NULL;
913		931
		932	// for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
		933
		934	// 6. System wide per application default file.
		935	/* Add in Rxvt file */
		936	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
		937	if (*localepath
		938	&& ((rdb1 = XrmGetFileDatabase (localepath))
		939	\|\| (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
		940	# endif
		941	XrmMergeDatabases (rdb1, &database);
		942
		943	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
		944	if ((xe = (char *)getenv ("XAPPLRESDIR")))
		945	{
		946	snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
		947
		948	if ((rdb1 = XrmGetFileDatabase (fname)))
		949	XrmMergeDatabases (rdb1, &database);
		950	}
		951
		952	// 5. User's per application default file.
		953	// none
		954
		955	// 4. User's defaults file.
914	/* Get any Xserver defaults */	956	/* Get any Xserver defaults */
915
916	displayResource = XResourceManagerString (display);	957	displayResource = XResourceManagerString (disp);
917	if (displayResource != NULL)	958	if (displayResource != NULL)
		959	{
918	database = XrmGetStringDatabase (displayResource);	960	if ((rdb1 = XrmGetStringDatabase (displayResource)))
919		961	XrmMergeDatabases (rdb1, &database);
920	# ifdef HAVE_EXTRA_XRESOURCE_FILES
921	/* Add in ~/.Xdefaults or ~/.Xresources */
922	{	962	}
923	char *ptr;	963	else if (homedir)
		964	{
		965	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
924		966
925	if ((ptr = (char *)getenv ("HOME")) == NULL)	967	if ((rdb1 = XrmGetFileDatabase (fname)))
926	ptr = ".";	968	XrmMergeDatabases (rdb1, &database);
		969	}
927		970
928	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)	971	/* Get screen specific resources */
		972	displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
		973	if (displayResource != NULL)
		974	{
		975	if ((rdb1 = XrmGetStringDatabase (displayResource)))
		976	/* Merge with screen-independent resources */
		977	XrmMergeDatabases (rdb1, &database);
		978
		979	XFree (displayResource);
		980	}
		981
		982	// 3. User's per host defaults file
		983	/* Add in XENVIRONMENT file */
		984	if ((xe = (char *)getenv ("XENVIRONMENT"))
		985	&& (rdb1 = XrmGetFileDatabase (xe)))
		986	XrmMergeDatabases (rdb1, &database);
		987	else if (homedir)
		988	{
		989	struct utsname un;
		990
		991	if (!uname (&un))
929	{	992	{
930	sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,	993	snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
931	ptr, xnames[i]);	994
932	if ((rdb1 = XrmGetFileDatabase (fname)))	995	if ((rdb1 = XrmGetFileDatabase (fname)))
		996	XrmMergeDatabases (rdb1, &database);
		997	}
		998	}
		999
		1000	XrmSetDatabase (disp, database);
		1001	# endif
		1002
		1003	/*
		1004	* Query resources for options that affect us
		1005	*/
		1006	for (entry = 0; entry < optList_size; entry++)
		1007	{
		1008	int s;
		1009	char p, p0;
		1010	const char *kw = optList[entry].kw;
		1011
		1012	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
		1013	continue; /* previously set */
		1014
		1015	p = XGetDefault (disp, rs[Rs_name], kw);
		1016	p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
		1017	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		1018	{
		1019	p = XGetDefault (disp, RESCLASS, kw);
		1020	#ifdef RESFALLBACK
		1021	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		1022	p = XGetDefault (disp, RESFALLBACK, kw);
		1023	#endif
		1024	}
		1025
		1026	if (p == NULL && p0)
		1027	p = p0;
		1028
		1029	if (p)
		1030	{
		1031	rs[optList[entry].doff] = p;
		1032
		1033	if (optList_isBool (entry))
933	{	1034	{
934	XrmMergeDatabases (rdb1, &database);	1035	s = strcasecmp (p, "TRUE") == 0
935	# ifndef HAVE_BOTH_XRESOURCE_FILES	1036	\|\| strcasecmp (p, "YES") == 0
		1037	\|\| strcasecmp (p, "ON") == 0
		1038	\|\| strcasecmp (p, "1") == 0;
		1039
		1040	if (optList_isReverse (entry))
		1041	s = !s;
		1042
		1043	if (s)
		1044	SET_OPTION (optList[entry].flag & Optflag_mask);
936	break;	1045	else
937	# endif	1046	CLR_OPTION (optList[entry].flag & Optflag_mask);
938
939	}	1047	}
940	}	1048	}
941	}	1049	}
942	# endif
943		1050
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	/*	1051	/*
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	1052	* [R5 or later]: enumerate the resource database
1019	*/	1053	*/
1020	# ifdef XrmEnumOneLevel
1021	# ifdef KEYSYM_RESOURCE	1054	# ifdef KEYSYM_RESOURCE
1022	name_prefix[0] = XrmStringToName (name);	1055	name_prefix[0] = XrmStringToName (rs[Rs_name]);
1023	name_prefix[1] = XrmStringToName ("keysym");	1056	name_prefix[1] = XrmStringToName ("keysym");
1024	name_prefix[2] = NULLQUARK;	1057	name_prefix[2] = NULLQUARK;
1025	class_prefix[0] = XrmStringToName (RESCLASS);	1058	class_prefix[0] = XrmStringToName (RESCLASS);
1026	class_prefix[1] = XrmStringToName ("Keysym");	1059	class_prefix[1] = XrmStringToName ("Keysym");
1027	class_prefix[2] = NULLQUARK;	1060	class_prefix[2] = NULLQUARK;
1028	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1061	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1029	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1062	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
1030	XrmEnumOneLevel, rxvt_define_key, NULL);	1063	XrmEnumOneLevel, rxvt_define_key, NULL);
1031	# ifdef RESFALLBACK	1064	# ifdef RESFALLBACK
1032	name_prefix[0] = XrmStringToName (RESFALLBACK);	1065	name_prefix[0] = XrmStringToName (RESFALLBACK);
1033	name_prefix[1] = XrmStringToName ("keysym");	1066	name_prefix[1] = XrmStringToName ("keysym");
1034	class_prefix[0] = XrmStringToName (RESFALLBACK);	1067	class_prefix[0] = XrmStringToName (RESFALLBACK);
1035	class_prefix[1] = XrmStringToName ("Keysym");	1068	class_prefix[1] = XrmStringToName ("Keysym");
1036	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1069	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1037	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1070	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
1038	XrmEnumOneLevel, rxvt_define_key, NULL);	1071	XrmEnumOneLevel, rxvt_define_key, NULL);
1039	# endif
1040	# endif	1072	# endif
1041	# endif	1073	# endif
1042		1074
1043	# else /* USE_XGETDEFAULT */	1075	# else /* USE_XGETDEFAULT */
1044	/* get resources the hard way, but save lots of memory */	1076	/* get resources the hard way, but save lots of memory */
		1077	FILE *fd = NULL;
		1078
		1079	if (homedir)
		1080	{
		1081	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
		1082
		1083	for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
		1084	{
		1085	snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
		1086
		1087	if ((fd = fopen (fname, "r")) != NULL)
		1088	break;
		1089	}
		1090	}
		1091	/*
		1092	* The normal order to match resources is the following:
		1093	* @ global resources (partial match, ~/.Xdefaults)
		1094	* @ application file resources (XAPPLOADDIR/Rxvt)
		1095	* @ class resources (~/.Xdefaults)
		1096	* @ private resources (~/.Xdefaults)
		1097	*
		1098	* However, for the hand-rolled resources, the matching algorithm
		1099	* checks if a resource string value has already been allocated
		1100	* and won't overwrite it with (in this case) a less specific
		1101	* resource value.
		1102	*
		1103	* This avoids multiple allocation. Also, when we've called this
		1104	* routine command-line string options have already been applied so we
		1105	* needn't to allocate for those resources.
		1106	*
		1107	* So, search in resources from most to least specific.
		1108	*
		1109	* Also, use a special sub-class so that we can use either or both of
		1110	* "XTerm" and "Rxvt" as class names.
		1111	*/
		1112
		1113	get_xdefaults (fd, rs[Rs_name]);
		1114	get_xdefaults (fd, RESCLASS);
		1115	# ifdef RESFALLBACK
		1116	get_xdefaults (fd, RESFALLBACK);
		1117	# endif
		1118
		1119	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
		1120	{
1045	FILE *fd = NULL;	1121	FILE *ad = NULL;
1046	char *home;
1047		1122
1048	if ((home = getenv ("HOME")) != NULL)	1123	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
		1124	if (!*localepath \|\| (ad = fopen (localepath, "r")) == NULL)
		1125	# endif
		1126	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
		1127	if (ad != NULL)
1049	{	1128	{
1050	unsigned int i, len = strlen (home) + 2;	1129	get_xdefaults (ad, RESCLASS);
1051	char *f = NULL;	1130	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);	1131	fclose (ad);
1063	}	1132	}
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	}	1133	}
1107	# endif /* XAPPLOADDIR */	1134	# endif /* XAPPLOADDIR */
1108		1135
1109	get_xdefaults (fd, ""); /* partial match */	1136	get_xdefaults (fd, ""); /* partial match */
1110	if (fd != NULL)	1137	if (fd != NULL)
1111	fclose (fd);	1138	fclose (fd);
1112	# endif /* USE_XGETDEFAULT */	1139	# 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		1140
1124	#endif /* NO_RESOURCES */	1141	#endif /* NO_RESOURCES */
1125	}	1142	}
1126		1143
1127	/}}} /	1144	/}}} /

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.65 by root, Mon Jan 2 18:20:23 2006 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.65 by root, Mon Jan 2 18:20:23 2006 UTC