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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.42 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.60 by root, Tue Oct 25 19:04:46 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 */
…		…
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"),
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	#if 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"),
106	#ifdef TRANSPARENT	113	#if TRANSPARENT
107	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),	114	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
108	BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
109	SWCH ("tr", Opt_transparent, NULL),	115	SWCH ("tr", Opt_transparent, NULL),
		116	# if TINTING
		117	STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
		118	# endif
		119	#endif
		120	#if OFF_FOCUS_FADING
		121	STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
		122	STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
		123	#endif
110	#if TINTING	124	#if TINTING
111	STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
112	#endif
113	#endif
114	#ifdef OFF_FOCUS_FADING
115	STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
116	#endif
117	#ifdef TINTING
118	STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),	125	STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
119	#endif	126	#endif
120	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),	127	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
121	#ifndef NO_BELL	128	#ifndef NO_BELL
122	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),	129	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
…		…
131	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),	138	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
132	#endif	139	#endif
133	#if ENABLE_FRILLS	140	#if ENABLE_FRILLS
134	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),	141	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
135	BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),	142	BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
		143	BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"),
136	#endif	144	#endif
137	#ifdef CURSOR_BLINK	145	#if CURSOR_BLINK
138	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),	146	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
139	#endif	147	#endif
140	#ifdef POINTER_BLANK	148	#ifdef POINTER_BLANK
141	BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),	149	BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
142	#endif	150	#endif
…		…
164	RSTRG (Rs_color + Color_BD, "colorBD", "color"),	172	RSTRG (Rs_color + Color_BD, "colorBD", "color"),
165	RSTRG (Rs_color + Color_IT, "colorIT", "color"),	173	RSTRG (Rs_color + Color_IT, "colorIT", "color"),
166	RSTRG (Rs_color + Color_UL, "colorUL", "color"),	174	RSTRG (Rs_color + Color_UL, "colorUL", "color"),
167	RSTRG (Rs_color + Color_RV, "colorRV", "color"),	175	RSTRG (Rs_color + Color_RV, "colorRV", "color"),
168	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	176	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
		177	#if ENABLE_FRILLS
		178	RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
		179	#endif
169	#ifdef KEEP_SCROLLCOLOR	180	#ifdef KEEP_SCROLLCOLOR
170	RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),	181	RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
171	RSTRG (Rs_color + Color_trough, "troughColor", "color"),	182	RSTRG (Rs_color + Color_trough, "troughColor", "color"),
172	#endif /* KEEP_SCROLLCOLOR */	183	#endif /* KEEP_SCROLLCOLOR */
173	#ifdef OPTION_HC	184	#ifdef OPTION_HC
174	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),	185	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
175	#endif	186	#endif
		187	#ifndef NO_CURSORCOLOR
		188	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
		189	/* command-line option = resource name */
		190	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
		191	#endif /* NO_CURSORCOLOR */
		192	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
		193	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
		194	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
176	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)	195	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
177	RSTRG (Rs_path, "path", "search path"),	196	RSTRG (Rs_path, "path", "search path"),
178	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */	197	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */
179	#ifdef XPM_BACKGROUND	198	#ifdef XPM_BACKGROUND
180	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),	199	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
…		…
190	STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),	209	STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
191	#endif	210	#endif
192	#ifdef USE_XIM	211	#ifdef USE_XIM
193	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),	212	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
194	STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot\|OffTheSpot\|Root"),	213	STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot\|OffTheSpot\|Root"),
195	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
196	STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),	214	STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
197	#endif	215	STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
198	#endif /* USE_XIM */	216	#endif /* USE_XIM */
199	STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),	217	STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
200	STRG (Rs_title, "title", "title", "string", "title name for window"),	218	STRG (Rs_title, "title", "title", "string", "title name for window"),
201	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */	219	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
202	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),	220	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
203	#ifndef NO_CURSORCOLOR
204	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
205	/* command-line option = resource name */
206	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
207	#endif /* NO_CURSORCOLOR */
208	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
209	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
210	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
211	STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),	221	STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
		222	#if ENABLE_XEMBED
		223	STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
		224	#endif
212	#if ENABLE_FRILLS	225	#if ENABLE_FRILLS
		226	STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
213	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	227	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
214	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	228	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
215	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	229	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
216	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),	230	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
217	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),	231	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
218	#endif
219	#ifndef NO_LINESPACE
220	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),	232	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
221	#endif	233	#endif
222	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
223	#ifdef POINTER_BLANK	234	#ifdef POINTER_BLANK
224	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),	235	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
225	#endif	236	#endif
226	#ifndef NO_BACKSPACE_KEY	237	#ifndef NO_BACKSPACE_KEY
227	RSTRG (Rs_backspace_key, "backspacekey", "string"),	238	RSTRG (Rs_backspace_key, "backspacekey", "string"),
228	#endif	239	#endif
229	#ifndef NO_DELETE_KEY	240	#ifndef NO_DELETE_KEY
230	RSTRG (Rs_delete_key, "deletekey", "string"),	241	RSTRG (Rs_delete_key, "deletekey", "string"),
231	#endif	242	#endif
232	RSTRG (Rs_selectstyle, "selectstyle", "mode"),	243	RSTRG (Rs_selectstyle, "selectstyle", "mode"),
233	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
234	#ifdef HAVE_SCROLLBARS
235	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
236	#endif
237	#ifdef PRINTPIPE	244	#ifdef PRINTPIPE
238	RSTRG (Rs_print_pipe, "print-pipe", "string"),	245	RSTRG (Rs_print_pipe, "print-pipe", "string"),
239	#endif	246	#endif
240	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),	247	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),
241	INFO ("xrm", "string", "X resource"),
242	#ifdef CUTCHAR_RESOURCE	248	#ifdef CUTCHAR_RESOURCE
243	RSTRG (Rs_cutchars, "cutchars", "string"),	249	RSTRG (Rs_cutchars, "cutchars", "string"),
244	#endif /* CUTCHAR_RESOURCE */	250	#endif /* CUTCHAR_RESOURCE */
245	RSTRG (Rs_answerbackstring, "answerbackString", "string"),	251	RSTRG (Rs_answerbackstring, "answerbackString", "string"),
246	#ifndef NO_SECONDARY_SCREEN	252	#ifndef NO_SECONDARY_SCREEN
247	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),	253	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
248	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),	254	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
		255	#endif
		256	#if 0 && TODO
		257	#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
		258	INFO ("xrm", "string", "X resource"),
		259	#endif
249	#endif	260	#endif
250	INFO ("e", "command arg ...", "command to execute")	261	INFO ("e", "command arg ...", "command to execute")
251	};	262	};
252		263
253	#undef INFO	264	#undef INFO
…		…
355	"strings,"	366	"strings,"
356	#endif	367	#endif
357	#if defined(ENABLE_FRILLS)	368	#if defined(ENABLE_FRILLS)
358	"frills,"	369	"frills,"
359	#endif	370	#endif
360	#if !defined(NO_LINESPACE)
361	"linespace,"
362	#endif
363	#if defined(PREFER_24BIT)	371	#if defined(PREFER_24BIT)
364	"24bit,"	372	"24bit,"
365	#endif	373	#endif
366	#if defined(SELECTION_SCROLLING)	374	#if defined(SELECTION_SCROLLING)
367	"selectionscrolling,"	375	"selectionscrolling,"
…		…
406	switch (type)	414	switch (type)
407	{	415	{
408	case 0: /* brief listing */	416	case 0: /* brief listing */
409	rxvt_log (" [-help] [--help]\n");	417	rxvt_log (" [-help] [--help]\n");
410		418
411	for (col = 1, i = 0; i < optList_size (); i++)	419	for (col = 1, i = 0; i < optList_size; i++)
412	if (optList[i].desc != NULL)	420	if (optList[i].desc != NULL)
413	{	421	{
414	int len = 0;	422	int len = 0;
415		423
416	if (!optList_isBool (i))	424	if (!optList_isBool (i))
…		…
439	break;	447	break;
440		448
441	case 1: /* full command-line listing */	449	case 1: /* full command-line listing */
442	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");	450	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
443		451
444	for (i = 0; i < optList_size (); i++)	452	for (i = 0; i < optList_size; i++)
445	if (optList[i].desc != NULL)	453	if (optList[i].desc != NULL)
446	{	454	{
447	#ifdef DEBUG_STRICT	455	#ifdef DEBUG_STRICT
448	assert (optList[i].opt != NULL);	456	assert (optList[i].opt != NULL);
449	#endif	457	#endif
…		…
460		468
461	case 2: /* full resource listing */	469	case 2: /* full resource listing */
462	rxvt_log (" [options] [-e command args]\n\n"	470	rxvt_log (" [options] [-e command args]\n\n"
463	"where resources (long-options) include:\n");	471	"where resources (long-options) include:\n");
464		472
465	for (i = 0; i < optList_size (); i++)	473	for (i = 0; i < optList_size; i++)
466	if (optList[i].kw != NULL)	474	if (optList[i].kw != NULL)
467	rxvt_log (" %s: %*s%s\n",	475	rxvt_log (" %s: %*s%s\n",
468	optList[i].kw,	476	optList[i].kw,
469	(INDENT - strlen (optList[i].kw)), "", /* XXX */	477	(INDENT - strlen (optList[i].kw)), "", /* XXX */
470	(optList_isBool (i) ? "boolean" : optList[i].arg));	478	(optList_isBool (i) ? "boolean" : optList[i].arg));
…		…
491	int i, bad_option = 0;	499	int i, bad_option = 0;
492	static const char On[3] = "ON", Off[4] = "OFF";	500	static const char On[3] = "ON", Off[4] = "OFF";
493		501
494	for (i = 1; i < argc; i++)	502	for (i = 1; i < argc; i++)
495	{	503	{
496	unsigned int entry, longopt = 0;	504	unsigned int entry, longopt = 0;
497	const char flag, opt;	505	const char flag, opt;
498		506
499	opt = argv[i];	507	opt = argv[i];
500	#ifdef DEBUG_RESOURCES	508	#ifdef DEBUG_RESOURCES
501	fprintf (stderr, "argv[%d] = %s: ", i, opt);	509	fprintf (stderr, "argv[%d] = %s: ", i, opt);
502	#endif	510	#endif
…		…
523	rxvt_usage (longopt ? 2 : 1);	531	rxvt_usage (longopt ? 2 : 1);
524	if (!strcmp (opt, "h"))	532	if (!strcmp (opt, "h"))
525	rxvt_usage (0);	533	rxvt_usage (0);
526		534
527	/* feature: always try to match long-options */	535	/* feature: always try to match long-options */
528	for (entry = 0; entry < optList_size (); entry++)	536	for (entry = 0; entry < optList_size; entry++)
529	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))	537	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
530	\|\| (!longopt	538	\|\| (!longopt
531	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))	539	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))
532	break;	540	break;
533		541
534	if (entry < optList_size ())	542	if (entry < optList_size)
535	{	543	{
536	if (optList_isReverse (entry))	544	if (optList_isReverse (entry))
537	flag = flag == On ? Off : On;	545	flag = flag == On ? Off : On;
538		546
539	if (optList_strlen (entry))	547	if (optList_strlen (entry))
…		…
553	#ifdef DEBUG_RESOURCES	561	#ifdef DEBUG_RESOURCES
554	fprintf (stderr, "boolean (%s,%s) = %s\n",	562	fprintf (stderr, "boolean (%s,%s) = %s\n",
555	optList[entry].opt, optList[entry].kw, flag);	563	optList[entry].opt, optList[entry].kw, flag);
556	#endif	564	#endif
557	if (flag == On)	565	if (flag == On)
558	options \|= (optList[entry].flag);	566	options \|= optList[entry].flag;
559	else	567	else
560	options &= ~ (optList[entry].flag);	568	options &= ~optList[entry].flag;
561		569
562	if (optList[entry].doff != -1)	570	if (optList[entry].doff != -1)
563	rs[optList[entry].doff] = flag;	571	rs[optList[entry].doff] = flag;
564	}	572	}
565	}	573	}
…		…
604	XrmQuarkList quarks,	612	XrmQuarkList quarks,
605	XrmRepresentation *type __attribute__((unused)),	613	XrmRepresentation *type __attribute__((unused)),
606	XrmValue *value,	614	XrmValue *value,
607	XPointer closure __attribute__((unused)))	615	XPointer closure __attribute__((unused)))
608	{	616	{
609	int last;	617	int last;
610		618
611	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */	619	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
612	;	620	;
		621
613	last--;	622	last--;
614	GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO	623	GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
615	return False;	624	return False;
616	}	625	}
617		626
…		…
622	* arg will be	631	* arg will be
623	* NULL for ~/.Xdefaults and	632	* NULL for ~/.Xdefaults and
624	* non-NULL for command-line options (need to allocate)	633	* non-NULL for command-line options (need to allocate)
625	*/	634	*/
626	#define NEWARGLIM 500 /* `reasonable' size */	635	#define NEWARGLIM 500 /* `reasonable' size */
		636
		637	struct keysym_vocabulary_t
		638	{
		639	const char *name;
		640	unsigned short len;
		641	unsigned short value;
		642	};
		643	keysym_vocabulary_t keysym_vocabulary[] =
		644	{
		645	{ "ISOLevel3", 9, Level3Mask },
		646	{ "AppKeypad", 9, AppKeypadMask },
		647	{ "Control", 7, ControlMask },
		648	{ "NumLock", 7, NumLockMask },
		649	{ "Shift", 5, ShiftMask },
		650	{ "Meta", 4, MetaMask },
		651	{ "Lock", 4, LockMask },
		652	{ "Mod1", 4, Mod1Mask },
		653	{ "Mod2", 4, Mod2Mask },
		654	{ "Mod3", 4, Mod3Mask },
		655	{ "Mod4", 4, Mod4Mask },
		656	{ "Mod5", 4, Mod5Mask },
		657	{ "I", 1, Level3Mask },
		658	{ "K", 1, AppKeypadMask },
		659	{ "C", 1, ControlMask },
		660	{ "N", 1, NumLockMask },
		661	{ "S", 1, ShiftMask },
		662	{ "M", 1, MetaMask },
		663	{ "A", 1, MetaMask },
		664	{ "L", 1, LockMask },
		665	{ "1", 1, Mod1Mask },
		666	{ "2", 1, Mod2Mask },
		667	{ "3", 1, Mod3Mask },
		668	{ "4", 1, Mod4Mask },
		669	{ "5", 1, Mod5Mask },
		670	};
		671
627	int	672	int
628	rxvt_term::parse_keysym (const char str, const char arg)	673	rxvt_term::parse_keysym (const char str, const char arg)
629	{	674	{
630	int n, sym;	675	int n, sym;
631	char key_string, newarg = NULL;	676	unsigned int state = 0;
		677	const char *pmodend = NULL;
		678	char *newarg = NULL;
632	char newargstr[NEWARGLIM];	679	char newargstr[NEWARGLIM];
633		680
634	if (arg == NULL)	681	if (arg == NULL)
635	{	682	{
636	if ((n = rxvt_Str_match (str, "keysym.")) == 0)	683	if ((n = rxvt_Str_match (str, "keysym.")) == 0)
637	return 0;	684	return 0;
		685
638	str += n; /* skip `keysym.' */	686	str += n; /* skip `keysym.' */
		687	if ((pmodend = strchr (str, ':')) < str)
		688	return -1;
		689	}
		690	else
		691	pmodend = str + strlen(str);
		692
		693	for (--pmodend; str < pmodend; --pmodend)
		694	if (*pmodend == '-')
		695	break;
		696
		697	while (str < pmodend)
639	}	698	{
		699	unsigned int i;
		700
		701	for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
		702	{
		703	if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
		704	{
		705	state \|= keysym_vocabulary[i].value;
		706	str += keysym_vocabulary[i].len;
		707	break;
		708	}
		709	}
		710
		711	if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
		712	return -1;
		713
		714	if (*str == '-')
		715	++str;
		716	}
		717
640	/* some scanf () have trouble with a 0x prefix */	718	/* some scanf () have trouble with a 0x prefix */
641	if (isdigit (str[0]))
642	{
643	if (str[0] == '0' && toupper (str[1]) == 'X')	719	if (str[0] == '0' && toupper (str[1]) == 'X')
		720	{
644	str += 2;	721	str += 2;
		722
645	if (arg)	723	if (arg)
646	{	724	{
647	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)	725	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
648	return -1;	726	return -1;
649	}	727	}
…		…
663	/*	741	/*
664	* convert keysym name to keysym number	742	* convert keysym name to keysym number
665	*/	743	*/
666	strncpy (newargstr, str, NEWARGLIM - 1);	744	strncpy (newargstr, str, NEWARGLIM - 1);
667	newargstr[NEWARGLIM - 1] = '\0';	745	newargstr[NEWARGLIM - 1] = '\0';
		746
668	if (arg == NULL)	747	if (arg == NULL)
669	{	748	{
670	if ((newarg = strchr (newargstr, ':')) == NULL)	749	if ((newarg = strchr (newargstr, ':')) == NULL)
671	return -1;	750	return -1;
		751
672	newarg++ = '\0'; / terminate keysym name */	752	newarg++ = '\0'; / terminate keysym name */
673	}	753	}
		754
674	if ((sym = XStringToKeysym (newargstr)) == None)	755	if ((sym = XStringToKeysym (newargstr)) == None)
675	return -1;	756	return -1;
676	}	757	}
677
678	if (sym < 0xFF00 \|\| sym > 0xFFFF) /* we only do extended keys */
679	return -1;
680	sym &= 0xFF;
681	if (Keysym_map[sym] != NULL) /* already set ? */
682	return -1;
683		758
684	if (newarg == NULL)	759	if (newarg == NULL)
685	{	760	{
686	strncpy (newargstr, arg, NEWARGLIM - 1);	761	strncpy (newargstr, arg, NEWARGLIM - 1);
687	newargstr[NEWARGLIM - 1] = '\0';	762	newargstr[NEWARGLIM - 1] = '\0';
688	newarg = newargstr;	763	newarg = newargstr;
689	}	764	}
		765
690	rxvt_Str_trim (newarg);	766	rxvt_Str_trim (newarg);
691	if (*newarg == '\0' \|\| (n = rxvt_Str_escaped (newarg)) == 0)	767	if (*newarg == '\0' \|\| (n = rxvt_Str_escaped (newarg)) == 0)
692	return -1;	768	return -1;
693	MIN_IT (n, 255);
694	key_string = (char )rxvt_malloc ((n + 1) sizeof (char));
695		769
696	key_string[0] = n;	770	keyboard->register_user_translation (sym, state, newarg);
697	strncpy (key_string + 1, newarg, n);
698	Keysym_map[sym] = (unsigned char *)key_string;
699
700	return 1;	771	return 1;
701	}	772	}
702		773
703	# endif /* KEYSYM_RESOURCE */	774	# endif /* KEYSYM_RESOURCE */
704		775
…		…
717	return;	788	return;
718		789
719	len = strlen (name);	790	len = strlen (name);
720	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)	791	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
721	{	792	{
722	unsigned int entry, n;	793	unsigned int entry, n;
723		794
724	while (str && isspace (str))	795	while (str && isspace (str))
725	str++; /* leading whitespace */	796	str++; /* leading whitespace */
726		797
727	if ((str[len] != '*' && str[len] != '.')	798	if ((str[len] != '*' && str[len] != '.')
…		…
730	str += (len + 1); /* skip `name' or `name.' /	801	str += (len + 1); /* skip `name' or `name.' /
731		802
732	# ifdef KEYSYM_RESOURCE	803	# ifdef KEYSYM_RESOURCE
733	if (!parse_keysym (str, NULL))	804	if (!parse_keysym (str, NULL))
734	# endif /* KEYSYM_RESOURCE */	805	# endif /* KEYSYM_RESOURCE */
735	for (entry = 0; entry < optList_size (); entry++)	806	for (entry = 0; entry < optList_size; entry++)
736	{	807	{
737	const char *kw = optList[entry].kw;	808	const char *kw = optList[entry].kw;
738		809
739	if (kw == NULL)	810	if (kw == NULL)
740	continue;	811	continue;
…		…
744	{	815	{
745	/* skip `keyword:' */	816	/* skip `keyword:' */
746	str += n + 1;	817	str += n + 1;
747	rxvt_Str_trim (str);	818	rxvt_Str_trim (str);
748	n = strlen (str);	819	n = strlen (str);
		820
749	if (n && rs[optList[entry].doff] == NULL)	821	if (n && rs[optList[entry].doff] == NULL)
750	{	822	{
751	/* not already set */	823	/* not already set */
752	int s;	824	int s;
753	char *p = 0;	825	char *p = 0;
…		…
774	rs[optList[entry].doff] = p;	846	rs[optList[entry].doff] = p;
775	allocated.push_back (p);	847	allocated.push_back (p);
776		848
777	if (optList_isBool (entry))	849	if (optList_isBool (entry))
778	{	850	{
779	s = strcasecmp (str, "TRUE") == 0	851	s = strcasecmp (str, "true") == 0
780	\|\| strcasecmp (str, "YES") == 0	852	\|\| strcasecmp (str, "yes") == 0
781	\|\| strcasecmp (str, "ON") == 0	853	\|\| strcasecmp (str, "on") == 0
782	\|\| strcasecmp (str, "1") == 0;	854	\|\| strcmp (str, "1") == 0;
783		855
784	if (optList_isReverse (entry))	856	if (optList_isReverse (entry))
785	s = !s;	857	s = !s;
786		858
787	if (s)	859	if (s)
…		…
807	/*	879	/*
808	* using XGetDefault () or the hand-rolled replacement	880	* using XGetDefault () or the hand-rolled replacement
809	*/	881	*/
810	/* ARGSUSED */	882	/* ARGSUSED */
811	void	883	void
812	rxvt_term::extract_resources (Display display __attribute__ ((unused)), const char name)	884	rxvt_term::extract_resources ()
813	{	885	{
		886	dDisp;
		887
814	#ifndef NO_RESOURCES	888	#ifndef NO_RESOURCES
		889
		890	char homedir = (char )getenv ("HOME");
		891	char fname[1024];
815		892
816	# if defined XAPPLOADDIR	893	# if defined XAPPLOADDIR
817	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	894	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
818	/* Compute the path of the possibly available localized Rxvt file */	895	/* Compute the path of the possibly available localized Rxvt file */
819	char *localepath = NULL;	896	char localepath[1024];
820		897
821	if (locale != NULL)	898	if (locale)
822	{ /* XXX: must limit length of string */
823	localepath = (char *)rxvt_malloc (256);
824	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,	899	snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
825	(int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),	900	else
826	locale); /* 258 = 255 + 4 (-.s) - 1 (/) /	901	localepath[0] = 0;
827	}
828
829	{
830	# endif	902	# endif
831	# endif	903	# endif
832		904
833	# ifdef USE_XGETDEFAULT	905	# ifdef USE_XGETDEFAULT
834	/*	906	/*
835	* get resources using the X library function	907	* get resources using the X library function
836	*/	908	*/
837	int entry;	909	int entry;
838		910
839	# ifdef XrmEnumOneLevel	911	# ifdef XrmEnumOneLevel
840	int i;	912	int i;
841	char displayResource, xe;	913	char displayResource, xe;
842	XrmName name_prefix[3];	914	XrmName name_prefix[3];
843	XrmClass class_prefix[3];	915	XrmClass class_prefix[3];
844	XrmDatabase database, rdb1;	916	XrmDatabase database, rdb1;
845	char fname[1024];
846		917
847	XrmInitialize ();	918	XrmInitialize ();
848	database = NULL;	919	database = NULL;
849		920
		921	// for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
		922
		923	// 6. System wide per application default file.
		924	/* Add in Rxvt file */
		925	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
		926	if (*localepath
		927	&& ((rdb1 = XrmGetFileDatabase (localepath))
		928	\|\| (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
		929	# endif
		930	XrmMergeDatabases (rdb1, &database);
		931
		932	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
		933	if ((xe = (char *)getenv ("XAPPLRESDIR")))
		934	{
		935	snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
		936
		937	if ((rdb1 = XrmGetFileDatabase (fname)))
		938	XrmMergeDatabases (rdb1, &database);
		939	}
		940
		941	// 5. User's per application default file.
		942	// none
		943
		944	// 4. User's defaults file.
850	/* Get any Xserver defaults */	945	/* Get any Xserver defaults */
851
852	displayResource = XResourceManagerString (display);	946	displayResource = XResourceManagerString (disp);
853	if (displayResource != NULL)	947	if (displayResource != NULL)
		948	{
854	database = XrmGetStringDatabase (displayResource);	949	if ((rdb1 = XrmGetStringDatabase (displayResource)))
855		950	XrmMergeDatabases (rdb1, &database);
856	# ifdef HAVE_EXTRA_XRESOURCE_FILES
857	/* Add in ~/.Xdefaults or ~/.Xresources */
858	{	951	}
859	char *ptr;	952	else if (homedir)
		953	{
		954	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
860		955
861	if ((ptr = (char *)getenv ("HOME")) == NULL)	956	if ((rdb1 = XrmGetFileDatabase (fname)))
862	ptr = ".";	957	XrmMergeDatabases (rdb1, &database);
		958	}
863		959
864	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)	960	/* Get screen specific resources */
		961	displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
		962	if (displayResource != NULL)
		963	{
		964	if ((rdb1 = XrmGetStringDatabase (displayResource)))
		965	/* Merge with screen-independent resources */
		966	XrmMergeDatabases (rdb1, &database);
		967
		968	XFree (displayResource);
		969	}
		970
		971	// 3. User's per host defaults file
		972	/* Add in XENVIRONMENT file */
		973	if ((xe = (char *)getenv ("XENVIRONMENT"))
		974	&& (rdb1 = XrmGetFileDatabase (xe)))
		975	XrmMergeDatabases (rdb1, &database);
		976	else if (homedir)
		977	{
		978	struct utsname un;
		979
		980	if (!uname (&un))
865	{	981	{
866	sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,	982	snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
867	ptr, xnames[i]);	983
868	if ((rdb1 = XrmGetFileDatabase (fname)))	984	if ((rdb1 = XrmGetFileDatabase (fname)))
		985	XrmMergeDatabases (rdb1, &database);
		986	}
		987	}
		988
		989	XrmSetDatabase (disp, database);
		990	# endif
		991
		992	/*
		993	* Query resources for options that affect us
		994	*/
		995	for (entry = 0; entry < optList_size; entry++)
		996	{
		997	int s;
		998	char p, p0;
		999	const char *kw = optList[entry].kw;
		1000
		1001	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
		1002	continue; /* previously set */
		1003
		1004	p = XGetDefault (disp, rs[Rs_name], kw);
		1005	p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
		1006	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		1007	{
		1008	p = XGetDefault (disp, RESCLASS, kw);
		1009	#ifdef RESFALLBACK
		1010	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		1011	p = XGetDefault (disp, RESFALLBACK, kw);
		1012	#endif
		1013	}
		1014
		1015	if (p == NULL && p0)
		1016	p = p0;
		1017
		1018	if (p)
		1019	{
		1020	rs[optList[entry].doff] = p;
		1021
		1022	if (optList_isBool (entry))
869	{	1023	{
870	XrmMergeDatabases (rdb1, &database);	1024	s = strcasecmp (p, "TRUE") == 0
871	# ifndef HAVE_BOTH_XRESOURCE_FILES	1025	\|\| strcasecmp (p, "YES") == 0
		1026	\|\| strcasecmp (p, "ON") == 0
		1027	\|\| strcasecmp (p, "1") == 0;
		1028
		1029	if (optList_isReverse (entry))
		1030	s = !s;
		1031
		1032	if (s)
		1033	options \|= optList[entry].flag;
872	break;	1034	else
873	# endif	1035	options &= ~optList[entry].flag;
874
875	}	1036	}
876	}	1037	}
877	}	1038	}
878	# endif
879		1039
880	/* Add in XENVIRONMENT file */
881
882	if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
883	&& (rdb1 = XrmGetFileDatabase (xe)) != NULL)
884	XrmMergeDatabases (rdb1, &database);
885
886	/* Add in Rxvt file */
887	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
888	if (localepath == NULL \|\| (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
889	# endif
890	rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
891
892	if (rdb1 != NULL)
893	XrmMergeDatabases (rdb1, &database);
894
895	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
896	if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
897	{
898	sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
899	- sizeof (RESCLASS) - 2, xe);
900	if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
901	XrmMergeDatabases (rdb1, &database);
902	}
903
904	XrmSetDatabase (display, database);
905	# endif
906
907	/*	1040	/*
908	* Query resources for options that affect us
909	*/
910	for (entry = 0; entry < optList_size (); entry++)
911	{
912	int s;
913	char p, p0;
914	const char *kw = optList[entry].kw;
915
916	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
917	continue; /* previously set */
918
919	p = XGetDefault (display, name, kw);
920	p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
921	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
922	{
923	p = XGetDefault (display, RESCLASS, kw);
924	#ifdef RESFALLBACK
925	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
926	p = XGetDefault (display, RESFALLBACK, kw);
927	#endif
928	}
929
930	if (p == NULL && p0)
931	p = p0;
932
933	if (p)
934	{
935	rs[optList[entry].doff] = p;
936
937	if (optList_isBool (entry))
938	{
939	s = strcasecmp (p, "TRUE") == 0
940	\|\| strcasecmp (p, "YES") == 0
941	\|\| strcasecmp (p, "ON") == 0
942	\|\| strcasecmp (p, "1") == 0;
943	if (optList_isReverse (entry))
944	s = !s;
945	if (s)
946	options \|= (optList[entry].flag);
947	else
948	options &= ~ (optList[entry].flag);
949	}
950	}
951	}
952
953	/*
954	* [R5 or later]: enumerate the resource database	1041	* [R5 or later]: enumerate the resource database
955	*/	1042	*/
956	# ifdef XrmEnumOneLevel
957	# ifdef KEYSYM_RESOURCE	1043	# ifdef KEYSYM_RESOURCE
958	name_prefix[0] = XrmStringToName (name);	1044	name_prefix[0] = XrmStringToName (rs[Rs_name]);
959	name_prefix[1] = XrmStringToName ("keysym");	1045	name_prefix[1] = XrmStringToName ("keysym");
960	name_prefix[2] = NULLQUARK;	1046	name_prefix[2] = NULLQUARK;
961	class_prefix[0] = XrmStringToName (RESCLASS);	1047	class_prefix[0] = XrmStringToName (RESCLASS);
962	class_prefix[1] = XrmStringToName ("Keysym");	1048	class_prefix[1] = XrmStringToName ("Keysym");
963	class_prefix[2] = NULLQUARK;	1049	class_prefix[2] = NULLQUARK;
964	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1050	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
965	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1051	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
966	XrmEnumOneLevel, rxvt_define_key, NULL);	1052	XrmEnumOneLevel, rxvt_define_key, NULL);
967	# ifdef RESFALLBACK	1053	# ifdef RESFALLBACK
968	name_prefix[0] = XrmStringToName (RESFALLBACK);	1054	name_prefix[0] = XrmStringToName (RESFALLBACK);
969	name_prefix[1] = XrmStringToName ("keysym");	1055	name_prefix[1] = XrmStringToName ("keysym");
970	class_prefix[0] = XrmStringToName (RESFALLBACK);	1056	class_prefix[0] = XrmStringToName (RESFALLBACK);
971	class_prefix[1] = XrmStringToName ("Keysym");	1057	class_prefix[1] = XrmStringToName ("Keysym");
972	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1058	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
973	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1059	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
974	XrmEnumOneLevel, rxvt_define_key, NULL);	1060	XrmEnumOneLevel, rxvt_define_key, NULL);
975	# endif
976	# endif	1061	# endif
977	# endif	1062	# endif
978		1063
979	# else /* USE_XGETDEFAULT */	1064	# else /* USE_XGETDEFAULT */
980	/* get resources the hard way, but save lots of memory */	1065	/* get resources the hard way, but save lots of memory */
		1066	FILE *fd = NULL;
		1067
		1068	if (homedir)
		1069	{
		1070	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
		1071
		1072	for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
		1073	{
		1074	snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
		1075
		1076	if ((fd = fopen (fname, "r")) != NULL)
		1077	break;
		1078	}
		1079	}
		1080	/*
		1081	* The normal order to match resources is the following:
		1082	* @ global resources (partial match, ~/.Xdefaults)
		1083	* @ application file resources (XAPPLOADDIR/Rxvt)
		1084	* @ class resources (~/.Xdefaults)
		1085	* @ private resources (~/.Xdefaults)
		1086	*
		1087	* However, for the hand-rolled resources, the matching algorithm
		1088	* checks if a resource string value has already been allocated
		1089	* and won't overwrite it with (in this case) a less specific
		1090	* resource value.
		1091	*
		1092	* This avoids multiple allocation. Also, when we've called this
		1093	* routine command-line string options have already been applied so we
		1094	* needn't to allocate for those resources.
		1095	*
		1096	* So, search in resources from most to least specific.
		1097	*
		1098	* Also, use a special sub-class so that we can use either or both of
		1099	* "XTerm" and "Rxvt" as class names.
		1100	*/
		1101
		1102	get_xdefaults (fd, rs[Rs_name]);
		1103	get_xdefaults (fd, RESCLASS);
		1104	# ifdef RESFALLBACK
		1105	get_xdefaults (fd, RESFALLBACK);
		1106	# endif
		1107
		1108	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
		1109	{
981	FILE *fd = NULL;	1110	FILE *ad = NULL;
982	char *home;
983		1111
984	if ((home = getenv ("HOME")) != NULL)	1112	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
		1113	if (!*localepath \|\| (ad = fopen (localepath, "r")) == NULL)
		1114	# endif
		1115	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
		1116	if (ad != NULL)
985	{	1117	{
986	unsigned int i, len = strlen (home) + 2;	1118	get_xdefaults (ad, RESCLASS);
987	char *f = NULL;	1119	get_xdefaults (ad, "");
988
989	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
990	{
991	f = (char )rxvt_realloc (f, (len + strlen (xnames[i])) sizeof (char));
992
993	sprintf (f, "%s/%s", home, xnames[i]);
994
995	if ((fd = fopen (f, "r")) != NULL)
996	break;
997	}
998	free (f);	1120	fclose (ad);
999	}	1121	}
1000	/*
1001	* The normal order to match resources is the following:
1002	* @ global resources (partial match, ~/.Xdefaults)
1003	* @ application file resources (XAPPLOADDIR/Rxvt)
1004	* @ class resources (~/.Xdefaults)
1005	* @ private resources (~/.Xdefaults)
1006	*
1007	* However, for the hand-rolled resources, the matching algorithm
1008	* checks if a resource string value has already been allocated
1009	* and won't overwrite it with (in this case) a less specific
1010	* resource value.
1011	*
1012	* This avoids multiple allocation. Also, when we've called this
1013	* routine command-line string options have already been applied so we
1014	* needn't to allocate for those resources.
1015	*
1016	* So, search in resources from most to least specific.
1017	*
1018	* Also, use a special sub-class so that we can use either or both of
1019	* "XTerm" and "Rxvt" as class names.
1020	*/
1021
1022	get_xdefaults (fd, name);
1023	get_xdefaults (fd, RESCLASS);
1024	# ifdef RESFALLBACK
1025	get_xdefaults (fd, RESFALLBACK);
1026	# endif
1027
1028	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1029	{
1030	FILE *ad = NULL;
1031
1032	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1033	if (localepath == NULL \|\| (ad = fopen (localepath, "r")) == NULL)
1034	# endif
1035	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1036	if (ad != NULL)
1037	{
1038	get_xdefaults (ad, RESCLASS);
1039	get_xdefaults (ad, "");
1040	fclose (ad);
1041	}
1042	}	1122	}
1043	# endif /* XAPPLOADDIR */	1123	# endif /* XAPPLOADDIR */
1044		1124
1045	get_xdefaults (fd, ""); /* partial match */	1125	get_xdefaults (fd, ""); /* partial match */
1046	if (fd != NULL)	1126	if (fd != NULL)
1047	fclose (fd);	1127	fclose (fd);
1048	# endif /* USE_XGETDEFAULT */	1128	# endif /* USE_XGETDEFAULT */
1049
1050	# if defined XAPPLOADDIR
1051	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1052
1053	}
1054
1055	/* Free the path of the possibly available localized Rxvt file */
1056	free (localepath);
1057	# endif
1058	# endif
1059		1129
1060	#endif /* NO_RESOURCES */	1130	#endif /* NO_RESOURCES */
1061	}	1131	}
1062		1132
1063	/}}} /	1133	/}}} /

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.42 by root, Wed Dec 1 02:12:18 2004 UTC vs. Revision 1.60 by root, Tue Oct 25 19:04:46 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.42 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.60 by root, Tue Oct 25 19:04:46 2005 UTC