[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.63 by root, Sat Dec 31 16:06:48 2005 UTC

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

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.63 by root, Sat Dec 31 16:06:48 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.63 by root, Sat Dec 31 16:06:48 2005 UTC