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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.43 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.70 by root, Wed Jan 4 05:35:34 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
		36	#ifdef KEYSYM_RESOURCE
		37	#include "keyboard.h"
		38	#endif
		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
34	/* #define DEBUG_RESOURCES */	45	/* #define DEBUG_RESOURCES */
35
36	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
37		46
38	/{{{ monolithic option/resource structure: /	47	/{{{ monolithic option/resource structure: /
39	/*	48	/*
40	* `string' options MUST have a usage argument	49	* `string' options MUST have a usage argument
41	* `switch' and `boolean' options have no argument	50	* `switch' and `boolean' options have no argument
…		…
54	#define RSTRG(rsp, kw, arg) \	63	#define RSTRG(rsp, kw, arg) \
55	{0, (rsp), (kw), NULL, (arg), NULL}	64	{0, (rsp), (kw), NULL, (arg), NULL}
56		65
57	/* BOOL () - regular boolean `-/+' flag */	66	/* BOOL () - regular boolean `-/+' flag */
58	#define BOOL(rsp, kw, opt, flag, desc) \	67	#define BOOL(rsp, kw, opt, flag, desc) \
59	{ (Opt_Boolean\| (flag)), (rsp), (kw), (opt), NULL, (desc)}	68	{ (Optflag_Boolean \| (flag)), (rsp), (kw), (opt), NULL, (desc)}
60		69
61	/* SWCH () - `-' flag */	70	/* SWCH () - `-' flag */
62	#define SWCH(opt, flag, desc) \	71	#define SWCH(opt, flag, desc) \
63	{ (flag), -1, NULL, (opt), NULL, (desc)}	72	{ (flag), -1, NULL, (opt), NULL, (desc)}
64		73
65	/* convenient macros */	74	/* convenient macros */
66	#define optList_strlen(i) \	75	#define optList_strlen(i) \
67	(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))
68	#define optList_isBool(i) \	77	#define optList_isBool(i) \
69	(optList[i].flag & Opt_Boolean)	78	(optList[i].flag & Optflag_Boolean)
70	#define optList_isReverse(i) \	79	#define optList_isReverse(i) \
71	(optList[i].flag & Opt_Reverse)	80	(optList[i].flag & Optflag_Reverse)
72	#define optList_size() \	81	#define optList_size \
73	(sizeof (optList) / sizeof (optList[0]))	82	(sizeof (optList) / sizeof (optList[0]))
74		83
75	static const struct	84	static const struct
76	{	85	{
77	const unsigned long flag; /* Option flag */	86	const unsigned long flag; /* Option flag */
…		…
92	SWCH ("ic", Opt_iconic, NULL), /* short form */	101	SWCH ("ic", Opt_iconic, NULL), /* short form */
93	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),	102	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
94	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),	103	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
95	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),	104	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
96	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),	105	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
97	#ifdef HAVE_SCROLLBARS	106	#if HAVE_SCROLLBARS
		107	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
98	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),	108	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
99	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"),
100	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"),
101	#endif	113	#endif
102	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),	114	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
103	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"),
104	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),	116	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
105	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),	117	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
106	#ifdef TRANSPARENT	118	#if TRANSPARENT
107	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),	119	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),	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
110	#if TINTING	129	#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."),	130	STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
119	#endif	131	#endif
120	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),	132	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
121	#ifndef NO_BELL	133	#ifndef NO_BELL
122	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),	134	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
…		…
131	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),	143	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
132	#endif	144	#endif
133	#if ENABLE_FRILLS	145	#if ENABLE_FRILLS
134	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),	146	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
135	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"),
136	#endif	149	#endif
137	#ifdef CURSOR_BLINK	150	#if CURSOR_BLINK
138	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),	151	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
139	#endif	152	#endif
140	#ifdef POINTER_BLANK	153	#ifdef POINTER_BLANK
141	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"),
142	#endif	155	#endif
…		…
174	RSTRG (Rs_color + Color_trough, "troughColor", "color"),	187	RSTRG (Rs_color + Color_trough, "troughColor", "color"),
175	#endif /* KEEP_SCROLLCOLOR */	188	#endif /* KEEP_SCROLLCOLOR */
176	#ifdef OPTION_HC	189	#ifdef OPTION_HC
177	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),	190	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
178	#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"),
179	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)	200	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
180	RSTRG (Rs_path, "path", "search path"),	201	RSTRG (Rs_path, "path", "search path"),
181	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */	202	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */
182	#ifdef XPM_BACKGROUND	203	#ifdef XPM_BACKGROUND
183	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),	204	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
…		…
189	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),	210	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
190	#if ENABLE_STYLES	211	#if ENABLE_STYLES
191	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),	212	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
192	STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),	213	STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
193	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"),
194	#endif	216	#endif
195	#ifdef USE_XIM	217	#ifdef USE_XIM
196	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),	218	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
197	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"),
198	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
199	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"),
200	#endif	221	STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
201	#endif /* USE_XIM */	222	#endif /* USE_XIM */
202	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"),
203	STRG (Rs_title, "title", "title", "string", "title name for window"),	224	STRG (Rs_title, "title", "title", "string", "title name for window"),
204	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */	225	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
205	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),	226	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
206	#ifndef NO_CURSORCOLOR
207	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
208	/* command-line option = resource name */
209	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
210	#endif /* NO_CURSORCOLOR */
211	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
212	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
213	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
214	STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),	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
215	#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"),
216	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	234	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
217	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	235	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
218	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	236	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
219	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),	237	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
220	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),	238	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
221	#endif
222	#ifndef NO_LINESPACE
223	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),	239	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
224	#endif	240	#endif
225	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
226	#ifdef POINTER_BLANK	241	#ifdef POINTER_BLANK
227	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),	242	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
228	#endif	243	#endif
229	#ifndef NO_BACKSPACE_KEY	244	#ifndef NO_BACKSPACE_KEY
230	RSTRG (Rs_backspace_key, "backspacekey", "string"),	245	RSTRG (Rs_backspace_key, "backspacekey", "string"),
231	#endif	246	#endif
232	#ifndef NO_DELETE_KEY	247	#ifndef NO_DELETE_KEY
233	RSTRG (Rs_delete_key, "deletekey", "string"),	248	RSTRG (Rs_delete_key, "deletekey", "string"),
234	#endif	249	#endif
235	RSTRG (Rs_selectstyle, "selectstyle", "mode"),	250	RSTRG (Rs_selectstyle, "selectstyle", "mode"),
236	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
237	#ifdef HAVE_SCROLLBARS
238	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
239	#endif
240	#ifdef PRINTPIPE	251	#ifdef PRINTPIPE
241	RSTRG (Rs_print_pipe, "print-pipe", "string"),	252	RSTRG (Rs_print_pipe, "print-pipe", "string"),
242	#endif	253	#endif
243	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"),
244	INFO ("xrm", "string", "X resource"),
245	#ifdef CUTCHAR_RESOURCE	255	#ifdef CUTCHAR_RESOURCE
246	RSTRG (Rs_cutchars, "cutchars", "string"),	256	RSTRG (Rs_cutchars, "cutchars", "string"),
247	#endif /* CUTCHAR_RESOURCE */	257	#endif /* CUTCHAR_RESOURCE */
248	RSTRG (Rs_answerbackstring, "answerbackString", "string"),	258	RSTRG (Rs_answerbackstring, "answerbackString", "string"),
249	#ifndef NO_SECONDARY_SCREEN	259	#ifndef NO_SECONDARY_SCREEN
250	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),	260	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
251	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	RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
		265	RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
		266	RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
		267	STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
		268	#endif
		269	#if 0 && TODO
		270	#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
		271	INFO ("xrm", "string", "X resource"),
		272	#endif
252	#endif	273	#endif
253	INFO ("e", "command arg ...", "command to execute")	274	INFO ("e", "command arg ...", "command to execute")
254	};	275	};
255		276
256	#undef INFO	277	#undef INFO
…		…
358	"strings,"	379	"strings,"
359	#endif	380	#endif
360	#if defined(ENABLE_FRILLS)	381	#if defined(ENABLE_FRILLS)
361	"frills,"	382	"frills,"
362	#endif	383	#endif
363	#if !defined(NO_LINESPACE)
364	"linespace,"
365	#endif
366	#if defined(PREFER_24BIT)	384	#if defined(PREFER_24BIT)
367	"24bit,"	385	"24bit,"
368	#endif	386	#endif
369	#if defined(SELECTION_SCROLLING)	387	#if defined(SELECTION_SCROLLING)
370	"selectionscrolling,"	388	"selectionscrolling,"
…		…
409	switch (type)	427	switch (type)
410	{	428	{
411	case 0: /* brief listing */	429	case 0: /* brief listing */
412	rxvt_log (" [-help] [--help]\n");	430	rxvt_log (" [-help] [--help]\n");
413		431
414	for (col = 1, i = 0; i < optList_size (); i++)	432	for (col = 1, i = 0; i < optList_size; i++)
415	if (optList[i].desc != NULL)	433	if (optList[i].desc != NULL)
416	{	434	{
417	int len = 0;	435	int len = 0;
418		436
419	if (!optList_isBool (i))	437	if (!optList_isBool (i))
…		…
442	break;	460	break;
443		461
444	case 1: /* full command-line listing */	462	case 1: /* full command-line listing */
445	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");	463	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
446		464
447	for (i = 0; i < optList_size (); i++)	465	for (i = 0; i < optList_size; i++)
448	if (optList[i].desc != NULL)	466	if (optList[i].desc != NULL)
449	{	467	{
450	#ifdef DEBUG_STRICT	468	#ifdef DEBUG_STRICT
451	assert (optList[i].opt != NULL);	469	assert (optList[i].opt != NULL);
452	#endif	470	#endif
…		…
463		481
464	case 2: /* full resource listing */	482	case 2: /* full resource listing */
465	rxvt_log (" [options] [-e command args]\n\n"	483	rxvt_log (" [options] [-e command args]\n\n"
466	"where resources (long-options) include:\n");	484	"where resources (long-options) include:\n");
467		485
468	for (i = 0; i < optList_size (); i++)	486	for (i = 0; i < optList_size; i++)
469	if (optList[i].kw != NULL)	487	if (optList[i].kw != NULL)
470	rxvt_log (" %s: %*s%s\n",	488	rxvt_log (" %s: %*s%s\n",
471	optList[i].kw,	489	optList[i].kw,
472	(INDENT - strlen (optList[i].kw)), "", /* XXX */	490	(INDENT - strlen (optList[i].kw)), "", /* XXX */
473	(optList_isBool (i) ? "boolean" : optList[i].arg));	491	(optList_isBool (i) ? "boolean" : optList[i].arg));
…		…
494	int i, bad_option = 0;	512	int i, bad_option = 0;
495	static const char On[3] = "ON", Off[4] = "OFF";	513	static const char On[3] = "ON", Off[4] = "OFF";
496		514
497	for (i = 1; i < argc; i++)	515	for (i = 1; i < argc; i++)
498	{	516	{
499	unsigned int entry, longopt = 0;	517	unsigned int entry, longopt = 0;
500	const char flag, opt;	518	const char flag, opt;
501		519
502	opt = argv[i];	520	opt = argv[i];
503	#ifdef DEBUG_RESOURCES	521	#ifdef DEBUG_RESOURCES
504	fprintf (stderr, "argv[%d] = %s: ", i, opt);	522	fprintf (stderr, "argv[%d] = %s: ", i, opt);
505	#endif	523	#endif
…		…
526	rxvt_usage (longopt ? 2 : 1);	544	rxvt_usage (longopt ? 2 : 1);
527	if (!strcmp (opt, "h"))	545	if (!strcmp (opt, "h"))
528	rxvt_usage (0);	546	rxvt_usage (0);
529		547
530	/* feature: always try to match long-options */	548	/* feature: always try to match long-options */
531	for (entry = 0; entry < optList_size (); entry++)	549	for (entry = 0; entry < optList_size; entry++)
532	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))	550	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
533	\|\| (!longopt	551	\|\| (!longopt
534	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))	552	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))
535	break;	553	break;
536		554
537	if (entry < optList_size ())	555	if (entry < optList_size)
538	{	556	{
539	if (optList_isReverse (entry))	557	if (optList_isReverse (entry))
540	flag = flag == On ? Off : On;	558	flag = flag == On ? Off : On;
541		559
542	if (optList_strlen (entry))	560	if (optList_strlen (entry))
…		…
556	#ifdef DEBUG_RESOURCES	574	#ifdef DEBUG_RESOURCES
557	fprintf (stderr, "boolean (%s,%s) = %s\n",	575	fprintf (stderr, "boolean (%s,%s) = %s\n",
558	optList[entry].opt, optList[entry].kw, flag);	576	optList[entry].opt, optList[entry].kw, flag);
559	#endif	577	#endif
560	if (flag == On)	578	if (flag == On)
561	options \|= (optList[entry].flag);	579	SET_OPTION (optList[entry].flag & Optflag_mask);
562	else	580	else
563	options &= ~ (optList[entry].flag);	581	CLR_OPTION (optList[entry].flag & Optflag_mask);
564		582
565	if (optList[entry].doff != -1)	583	if (optList[entry].doff != -1)
566	rs[optList[entry].doff] = flag;	584	rs[optList[entry].doff] = flag;
567	}	585	}
568	}	586	}
…		…
607	XrmQuarkList quarks,	625	XrmQuarkList quarks,
608	XrmRepresentation *type __attribute__((unused)),	626	XrmRepresentation *type __attribute__((unused)),
609	XrmValue *value,	627	XrmValue *value,
610	XPointer closure __attribute__((unused)))	628	XPointer closure __attribute__((unused)))
611	{	629	{
612	int last;	630	int last;
613		631
614	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */	632	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
615	;	633	;
		634
616	last--;	635	last--;
617	GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO	636	GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
618	return False;	637	return False;
619	}	638	}
620		639
…		…
625	* arg will be	644	* arg will be
626	* NULL for ~/.Xdefaults and	645	* NULL for ~/.Xdefaults and
627	* non-NULL for command-line options (need to allocate)	646	* non-NULL for command-line options (need to allocate)
628	*/	647	*/
629	#define NEWARGLIM 500 /* `reasonable' size */	648	#define NEWARGLIM 500 /* `reasonable' size */
		649
		650	struct keysym_vocabulary_t
		651	{
		652	const char *name;
		653	unsigned short len;
		654	unsigned short value;
		655	};
		656	keysym_vocabulary_t keysym_vocabulary[] =
		657	{
		658	{ "ISOLevel3", 9, Level3Mask },
		659	{ "AppKeypad", 9, AppKeypadMask },
		660	{ "Control", 7, ControlMask },
		661	{ "NumLock", 7, NumLockMask },
		662	{ "Shift", 5, ShiftMask },
		663	{ "Meta", 4, MetaMask },
		664	{ "Lock", 4, LockMask },
		665	{ "Mod1", 4, Mod1Mask },
		666	{ "Mod2", 4, Mod2Mask },
		667	{ "Mod3", 4, Mod3Mask },
		668	{ "Mod4", 4, Mod4Mask },
		669	{ "Mod5", 4, Mod5Mask },
		670	{ "I", 1, Level3Mask },
		671	{ "K", 1, AppKeypadMask },
		672	{ "C", 1, ControlMask },
		673	{ "N", 1, NumLockMask },
		674	{ "S", 1, ShiftMask },
		675	{ "M", 1, MetaMask },
		676	{ "A", 1, MetaMask },
		677	{ "L", 1, LockMask },
		678	{ "1", 1, Mod1Mask },
		679	{ "2", 1, Mod2Mask },
		680	{ "3", 1, Mod3Mask },
		681	{ "4", 1, Mod4Mask },
		682	{ "5", 1, Mod5Mask },
		683	};
		684
630	int	685	int
631	rxvt_term::parse_keysym (const char str, const char arg)	686	rxvt_term::parse_keysym (const char str, const char arg)
632	{	687	{
633	int n, sym;	688	int n, sym;
634	char key_string, newarg = NULL;	689	unsigned int state = 0;
		690	const char *pmodend = NULL;
		691	char *newarg = NULL;
635	char newargstr[NEWARGLIM];	692	char newargstr[NEWARGLIM];
636		693
637	if (arg == NULL)	694	if (arg == NULL)
638	{	695	{
639	if ((n = rxvt_Str_match (str, "keysym.")) == 0)	696	if ((n = rxvt_Str_match (str, "keysym.")) == 0)
640	return 0;	697	return 0;
		698
641	str += n; /* skip `keysym.' */	699	str += n; /* skip `keysym.' */
		700	if ((pmodend = strchr (str, ':')) < str)
		701	return -1;
		702	}
		703	else
		704	pmodend = str + strlen(str);
		705
		706	for (--pmodend; str < pmodend; --pmodend)
		707	if (*pmodend == '-')
		708	break;
		709
		710	while (str < pmodend)
642	}	711	{
		712	unsigned int i;
		713
		714	for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
		715	{
		716	if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
		717	{
		718	state \|= keysym_vocabulary[i].value;
		719	str += keysym_vocabulary[i].len;
		720	break;
		721	}
		722	}
		723
		724	if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
		725	return -1;
		726
		727	if (*str == '-')
		728	++str;
		729	}
		730
643	/* some scanf () have trouble with a 0x prefix */	731	/* some scanf () have trouble with a 0x prefix */
644	if (isdigit (str[0]))
645	{
646	if (str[0] == '0' && toupper (str[1]) == 'X')	732	if (str[0] == '0' && toupper (str[1]) == 'X')
		733	{
647	str += 2;	734	str += 2;
		735
648	if (arg)	736	if (arg)
649	{	737	{
650	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)	738	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
651	return -1;	739	return -1;
652	}	740	}
…		…
666	/*	754	/*
667	* convert keysym name to keysym number	755	* convert keysym name to keysym number
668	*/	756	*/
669	strncpy (newargstr, str, NEWARGLIM - 1);	757	strncpy (newargstr, str, NEWARGLIM - 1);
670	newargstr[NEWARGLIM - 1] = '\0';	758	newargstr[NEWARGLIM - 1] = '\0';
		759
671	if (arg == NULL)	760	if (arg == NULL)
672	{	761	{
673	if ((newarg = strchr (newargstr, ':')) == NULL)	762	if ((newarg = strchr (newargstr, ':')) == NULL)
674	return -1;	763	return -1;
		764
675	newarg++ = '\0'; / terminate keysym name */	765	newarg++ = '\0'; / terminate keysym name */
676	}	766	}
		767
677	if ((sym = XStringToKeysym (newargstr)) == None)	768	if ((sym = XStringToKeysym (newargstr)) == None)
678	return -1;	769	return -1;
679	}	770	}
680
681	if (sym < 0xFF00 \|\| sym > 0xFFFF) /* we only do extended keys */
682	return -1;
683	sym &= 0xFF;
684	if (Keysym_map[sym] != NULL) /* already set ? */
685	return -1;
686		771
687	if (newarg == NULL)	772	if (newarg == NULL)
688	{	773	{
689	strncpy (newargstr, arg, NEWARGLIM - 1);	774	strncpy (newargstr, arg, NEWARGLIM - 1);
690	newargstr[NEWARGLIM - 1] = '\0';	775	newargstr[NEWARGLIM - 1] = '\0';
691	newarg = newargstr;	776	newarg = newargstr;
692	}	777	}
		778
693	rxvt_Str_trim (newarg);	779	rxvt_Str_trim (newarg);
694	if (*newarg == '\0' \|\| (n = rxvt_Str_escaped (newarg)) == 0)	780	if (*newarg == '\0' \|\| (n = rxvt_Str_escaped (newarg)) == 0)
695	return -1;	781	return -1;
696	MIN_IT (n, 255);
697	key_string = (char )rxvt_malloc ((n + 1) sizeof (char));
698		782
699	key_string[0] = n;	783	keyboard->register_user_translation (sym, state, newarg);
700	strncpy (key_string + 1, newarg, n);
701	Keysym_map[sym] = (unsigned char *)key_string;
702
703	return 1;	784	return 1;
704	}	785	}
705		786
706	# endif /* KEYSYM_RESOURCE */	787	# endif /* KEYSYM_RESOURCE */
707		788
…		…
720	return;	801	return;
721		802
722	len = strlen (name);	803	len = strlen (name);
723	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)	804	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
724	{	805	{
725	unsigned int entry, n;	806	unsigned int entry, n;
726		807
727	while (str && isspace (str))	808	while (str && isspace (str))
728	str++; /* leading whitespace */	809	str++; /* leading whitespace */
729		810
730	if ((str[len] != '*' && str[len] != '.')	811	if ((str[len] != '*' && str[len] != '.')
…		…
733	str += (len + 1); /* skip `name' or `name.' /	814	str += (len + 1); /* skip `name' or `name.' /
734		815
735	# ifdef KEYSYM_RESOURCE	816	# ifdef KEYSYM_RESOURCE
736	if (!parse_keysym (str, NULL))	817	if (!parse_keysym (str, NULL))
737	# endif /* KEYSYM_RESOURCE */	818	# endif /* KEYSYM_RESOURCE */
738	for (entry = 0; entry < optList_size (); entry++)	819	for (entry = 0; entry < optList_size; entry++)
739	{	820	{
740	const char *kw = optList[entry].kw;	821	const char *kw = optList[entry].kw;
741		822
742	if (kw == NULL)	823	if (kw == NULL)
743	continue;	824	continue;
…		…
747	{	828	{
748	/* skip `keyword:' */	829	/* skip `keyword:' */
749	str += n + 1;	830	str += n + 1;
750	rxvt_Str_trim (str);	831	rxvt_Str_trim (str);
751	n = strlen (str);	832	n = strlen (str);
		833
752	if (n && rs[optList[entry].doff] == NULL)	834	if (n && rs[optList[entry].doff] == NULL)
753	{	835	{
754	/* not already set */	836	/* not already set */
755	int s;	837	int s;
756	char *p = 0;	838	char *p = 0;
…		…
777	rs[optList[entry].doff] = p;	859	rs[optList[entry].doff] = p;
778	allocated.push_back (p);	860	allocated.push_back (p);
779		861
780	if (optList_isBool (entry))	862	if (optList_isBool (entry))
781	{	863	{
782	s = strcasecmp (str, "TRUE") == 0	864	s = strcasecmp (str, "true") == 0
783	\|\| strcasecmp (str, "YES") == 0	865	\|\| strcasecmp (str, "yes") == 0
784	\|\| strcasecmp (str, "ON") == 0	866	\|\| strcasecmp (str, "on") == 0
785	\|\| strcasecmp (str, "1") == 0;	867	\|\| strcmp (str, "1") == 0;
786		868
787	if (optList_isReverse (entry))	869	if (optList_isReverse (entry))
788	s = !s;	870	s = !s;
789		871
790	if (s)	872	if (s)
791	options \|= optList[entry].flag;	873	SET_OPTION (optList[entry].flag & Optflag_mask);
792	else	874	else
793	options &= ~optList[entry].flag;	875	CLR_OPTION (optList[entry].flag & Optflag_mask);
794	}	876	}
795	}	877	}
796		878
797	break;	879	break;
798	}	880	}
…		…
810	/*	892	/*
811	* using XGetDefault () or the hand-rolled replacement	893	* using XGetDefault () or the hand-rolled replacement
812	*/	894	*/
813	/* ARGSUSED */	895	/* ARGSUSED */
814	void	896	void
815	rxvt_term::extract_resources (Display display __attribute__ ((unused)), const char name)	897	rxvt_term::extract_resources ()
816	{	898	{
		899	dDisp;
		900
817	#ifndef NO_RESOURCES	901	#ifndef NO_RESOURCES
		902
		903	char homedir = (char )getenv ("HOME");
		904	char fname[1024];
818		905
819	# if defined XAPPLOADDIR	906	# if defined XAPPLOADDIR
820	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	907	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
821	/* Compute the path of the possibly available localized Rxvt file */	908	/* Compute the path of the possibly available localized Rxvt file */
822	char *localepath = NULL;	909	char localepath[1024];
823		910
824	if (locale != NULL)	911	if (locale)
825	{ /* XXX: must limit length of string */
826	localepath = (char *)rxvt_malloc (256);
827	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,	912	snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
828	(int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),	913	else
829	locale); /* 258 = 255 + 4 (-.s) - 1 (/) /	914	localepath[0] = 0;
830	}
831
832	{
833	# endif	915	# endif
834	# endif	916	# endif
835		917
836	# ifdef USE_XGETDEFAULT	918	# ifdef USE_XGETDEFAULT
837	/*	919	/*
838	* get resources using the X library function	920	* get resources using the X library function
839	*/	921	*/
840	int entry;	922	int entry;
841		923
842	# ifdef XrmEnumOneLevel	924	# ifdef XrmEnumOneLevel
843	int i;
844	char displayResource, xe;	925	char displayResource, xe;
845	XrmName name_prefix[3];	926	XrmName name_prefix[3];
846	XrmClass class_prefix[3];	927	XrmClass class_prefix[3];
847	XrmDatabase database, rdb1;	928	XrmDatabase database, rdb1;
848	char fname[1024];
849		929
850	XrmInitialize ();	930	XrmInitialize ();
851	database = NULL;	931	database = NULL;
852		932
		933	// for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
		934
		935	// 6. System wide per application default file.
		936	/* Add in Rxvt file */
		937	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
		938	if (*localepath
		939	&& ((rdb1 = XrmGetFileDatabase (localepath))
		940	\|\| (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
		941	# endif
		942	XrmMergeDatabases (rdb1, &database);
		943
		944	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
		945	if ((xe = (char *)getenv ("XAPPLRESDIR")))
		946	{
		947	snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
		948
		949	if ((rdb1 = XrmGetFileDatabase (fname)))
		950	XrmMergeDatabases (rdb1, &database);
		951	}
		952
		953	// 5. User's per application default file.
		954	// none
		955
		956	// 4. User's defaults file.
853	/* Get any Xserver defaults */	957	/* Get any Xserver defaults */
854
855	displayResource = XResourceManagerString (display);	958	displayResource = XResourceManagerString (disp);
856	if (displayResource != NULL)	959	if (displayResource != NULL)
		960	{
857	database = XrmGetStringDatabase (displayResource);	961	if ((rdb1 = XrmGetStringDatabase (displayResource)))
858		962	XrmMergeDatabases (rdb1, &database);
859	# ifdef HAVE_EXTRA_XRESOURCE_FILES
860	/* Add in ~/.Xdefaults or ~/.Xresources */
861	{	963	}
862	char *ptr;	964	else if (homedir)
		965	{
		966	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
863		967
864	if ((ptr = (char *)getenv ("HOME")) == NULL)	968	if ((rdb1 = XrmGetFileDatabase (fname)))
865	ptr = ".";	969	XrmMergeDatabases (rdb1, &database);
		970	}
866		971
867	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)	972	/* Get screen specific resources */
		973	displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
		974	if (displayResource != NULL)
		975	{
		976	if ((rdb1 = XrmGetStringDatabase (displayResource)))
		977	/* Merge with screen-independent resources */
		978	XrmMergeDatabases (rdb1, &database);
		979
		980	XFree (displayResource);
		981	}
		982
		983	// 3. User's per host defaults file
		984	/* Add in XENVIRONMENT file */
		985	if ((xe = (char *)getenv ("XENVIRONMENT"))
		986	&& (rdb1 = XrmGetFileDatabase (xe)))
		987	XrmMergeDatabases (rdb1, &database);
		988	else if (homedir)
		989	{
		990	struct utsname un;
		991
		992	if (!uname (&un))
868	{	993	{
869	sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,	994	snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
870	ptr, xnames[i]);	995
871	if ((rdb1 = XrmGetFileDatabase (fname)))	996	if ((rdb1 = XrmGetFileDatabase (fname)))
		997	XrmMergeDatabases (rdb1, &database);
		998	}
		999	}
		1000
		1001	XrmSetDatabase (disp, database);
		1002	# endif
		1003
		1004	/*
		1005	* Query resources for options that affect us
		1006	*/
		1007	for (entry = 0; entry < optList_size; entry++)
		1008	{
		1009	int s;
		1010	char p, p0;
		1011	const char *kw = optList[entry].kw;
		1012
		1013	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
		1014	continue; /* previously set */
		1015
		1016	p = XGetDefault (disp, rs[Rs_name], kw);
		1017	p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
		1018	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		1019	{
		1020	p = XGetDefault (disp, RESCLASS, kw);
		1021	#ifdef RESFALLBACK
		1022	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		1023	p = XGetDefault (disp, RESFALLBACK, kw);
		1024	#endif
		1025	}
		1026
		1027	if (p == NULL && p0)
		1028	p = p0;
		1029
		1030	if (p)
		1031	{
		1032	rs[optList[entry].doff] = p;
		1033
		1034	if (optList_isBool (entry))
872	{	1035	{
873	XrmMergeDatabases (rdb1, &database);	1036	s = strcasecmp (p, "TRUE") == 0
874	# ifndef HAVE_BOTH_XRESOURCE_FILES	1037	\|\| strcasecmp (p, "YES") == 0
		1038	\|\| strcasecmp (p, "ON") == 0
		1039	\|\| strcasecmp (p, "1") == 0;
		1040
		1041	if (optList_isReverse (entry))
		1042	s = !s;
		1043
		1044	if (s)
		1045	SET_OPTION (optList[entry].flag & Optflag_mask);
875	break;	1046	else
876	# endif	1047	CLR_OPTION (optList[entry].flag & Optflag_mask);
877
878	}	1048	}
879	}	1049	}
880	}	1050	}
881	# endif
882		1051
883	/* Add in XENVIRONMENT file */
884
885	if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
886	&& (rdb1 = XrmGetFileDatabase (xe)) != NULL)
887	XrmMergeDatabases (rdb1, &database);
888
889	/* Add in Rxvt file */
890	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
891	if (localepath == NULL \|\| (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
892	# endif
893	rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
894
895	if (rdb1 != NULL)
896	XrmMergeDatabases (rdb1, &database);
897
898	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
899	if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
900	{
901	sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
902	- sizeof (RESCLASS) - 2, xe);
903	if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
904	XrmMergeDatabases (rdb1, &database);
905	}
906
907	XrmSetDatabase (display, database);
908	# endif
909
910	/*	1052	/*
911	* Query resources for options that affect us
912	*/
913	for (entry = 0; entry < optList_size (); entry++)
914	{
915	int s;
916	char p, p0;
917	const char *kw = optList[entry].kw;
918
919	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
920	continue; /* previously set */
921
922	p = XGetDefault (display, name, kw);
923	p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
924	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
925	{
926	p = XGetDefault (display, RESCLASS, kw);
927	#ifdef RESFALLBACK
928	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
929	p = XGetDefault (display, RESFALLBACK, kw);
930	#endif
931	}
932
933	if (p == NULL && p0)
934	p = p0;
935
936	if (p)
937	{
938	rs[optList[entry].doff] = p;
939
940	if (optList_isBool (entry))
941	{
942	s = strcasecmp (p, "TRUE") == 0
943	\|\| strcasecmp (p, "YES") == 0
944	\|\| strcasecmp (p, "ON") == 0
945	\|\| strcasecmp (p, "1") == 0;
946	if (optList_isReverse (entry))
947	s = !s;
948	if (s)
949	options \|= (optList[entry].flag);
950	else
951	options &= ~ (optList[entry].flag);
952	}
953	}
954	}
955
956	/*
957	* [R5 or later]: enumerate the resource database	1053	* [R5 or later]: enumerate the resource database
958	*/	1054	*/
959	# ifdef XrmEnumOneLevel
960	# ifdef KEYSYM_RESOURCE	1055	# ifdef KEYSYM_RESOURCE
961	name_prefix[0] = XrmStringToName (name);	1056	name_prefix[0] = XrmStringToName (rs[Rs_name]);
962	name_prefix[1] = XrmStringToName ("keysym");	1057	name_prefix[1] = XrmStringToName ("keysym");
963	name_prefix[2] = NULLQUARK;	1058	name_prefix[2] = NULLQUARK;
964	class_prefix[0] = XrmStringToName (RESCLASS);	1059	class_prefix[0] = XrmStringToName (RESCLASS);
965	class_prefix[1] = XrmStringToName ("Keysym");	1060	class_prefix[1] = XrmStringToName ("Keysym");
966	class_prefix[2] = NULLQUARK;	1061	class_prefix[2] = NULLQUARK;
967	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1062	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
968	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1063	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
969	XrmEnumOneLevel, rxvt_define_key, NULL);	1064	XrmEnumOneLevel, rxvt_define_key, NULL);
970	# ifdef RESFALLBACK	1065	# ifdef RESFALLBACK
971	name_prefix[0] = XrmStringToName (RESFALLBACK);	1066	name_prefix[0] = XrmStringToName (RESFALLBACK);
972	name_prefix[1] = XrmStringToName ("keysym");	1067	name_prefix[1] = XrmStringToName ("keysym");
973	class_prefix[0] = XrmStringToName (RESFALLBACK);	1068	class_prefix[0] = XrmStringToName (RESFALLBACK);
974	class_prefix[1] = XrmStringToName ("Keysym");	1069	class_prefix[1] = XrmStringToName ("Keysym");
975	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1070	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
976	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1071	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
977	XrmEnumOneLevel, rxvt_define_key, NULL);	1072	XrmEnumOneLevel, rxvt_define_key, NULL);
978	# endif
979	# endif	1073	# endif
980	# endif	1074	# endif
981		1075
982	# else /* USE_XGETDEFAULT */	1076	# else /* USE_XGETDEFAULT */
983	/* get resources the hard way, but save lots of memory */	1077	/* get resources the hard way, but save lots of memory */
		1078	FILE *fd = NULL;
		1079
		1080	if (homedir)
		1081	{
		1082	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
		1083
		1084	for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
		1085	{
		1086	snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
		1087
		1088	if ((fd = fopen (fname, "r")) != NULL)
		1089	break;
		1090	}
		1091	}
		1092	/*
		1093	* The normal order to match resources is the following:
		1094	* @ global resources (partial match, ~/.Xdefaults)
		1095	* @ application file resources (XAPPLOADDIR/Rxvt)
		1096	* @ class resources (~/.Xdefaults)
		1097	* @ private resources (~/.Xdefaults)
		1098	*
		1099	* However, for the hand-rolled resources, the matching algorithm
		1100	* checks if a resource string value has already been allocated
		1101	* and won't overwrite it with (in this case) a less specific
		1102	* resource value.
		1103	*
		1104	* This avoids multiple allocation. Also, when we've called this
		1105	* routine command-line string options have already been applied so we
		1106	* needn't to allocate for those resources.
		1107	*
		1108	* So, search in resources from most to least specific.
		1109	*
		1110	* Also, use a special sub-class so that we can use either or both of
		1111	* "XTerm" and "Rxvt" as class names.
		1112	*/
		1113
		1114	get_xdefaults (fd, rs[Rs_name]);
		1115	get_xdefaults (fd, RESCLASS);
		1116	# ifdef RESFALLBACK
		1117	get_xdefaults (fd, RESFALLBACK);
		1118	# endif
		1119
		1120	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
		1121	{
984	FILE *fd = NULL;	1122	FILE *ad = NULL;
985	char *home;
986		1123
987	if ((home = getenv ("HOME")) != NULL)	1124	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
		1125	if (!*localepath \|\| (ad = fopen (localepath, "r")) == NULL)
		1126	# endif
		1127	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
		1128	if (ad != NULL)
988	{	1129	{
989	unsigned int i, len = strlen (home) + 2;	1130	get_xdefaults (ad, RESCLASS);
990	char *f = NULL;	1131	get_xdefaults (ad, "");
991
992	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
993	{
994	f = (char )rxvt_realloc (f, (len + strlen (xnames[i])) sizeof (char));
995
996	sprintf (f, "%s/%s", home, xnames[i]);
997
998	if ((fd = fopen (f, "r")) != NULL)
999	break;
1000	}
1001	free (f);	1132	fclose (ad);
1002	}	1133	}
1003	/*
1004	* The normal order to match resources is the following:
1005	* @ global resources (partial match, ~/.Xdefaults)
1006	* @ application file resources (XAPPLOADDIR/Rxvt)
1007	* @ class resources (~/.Xdefaults)
1008	* @ private resources (~/.Xdefaults)
1009	*
1010	* However, for the hand-rolled resources, the matching algorithm
1011	* checks if a resource string value has already been allocated
1012	* and won't overwrite it with (in this case) a less specific
1013	* resource value.
1014	*
1015	* This avoids multiple allocation. Also, when we've called this
1016	* routine command-line string options have already been applied so we
1017	* needn't to allocate for those resources.
1018	*
1019	* So, search in resources from most to least specific.
1020	*
1021	* Also, use a special sub-class so that we can use either or both of
1022	* "XTerm" and "Rxvt" as class names.
1023	*/
1024
1025	get_xdefaults (fd, name);
1026	get_xdefaults (fd, RESCLASS);
1027	# ifdef RESFALLBACK
1028	get_xdefaults (fd, RESFALLBACK);
1029	# endif
1030
1031	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1032	{
1033	FILE *ad = NULL;
1034
1035	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1036	if (localepath == NULL \|\| (ad = fopen (localepath, "r")) == NULL)
1037	# endif
1038	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1039	if (ad != NULL)
1040	{
1041	get_xdefaults (ad, RESCLASS);
1042	get_xdefaults (ad, "");
1043	fclose (ad);
1044	}
1045	}	1134	}
1046	# endif /* XAPPLOADDIR */	1135	# endif /* XAPPLOADDIR */
1047		1136
1048	get_xdefaults (fd, ""); /* partial match */	1137	get_xdefaults (fd, ""); /* partial match */
1049	if (fd != NULL)	1138	if (fd != NULL)
1050	fclose (fd);	1139	fclose (fd);
1051	# endif /* USE_XGETDEFAULT */	1140	# endif /* USE_XGETDEFAULT */
1052
1053	# if defined XAPPLOADDIR
1054	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1055
1056	}
1057
1058	/* Free the path of the possibly available localized Rxvt file */
1059	free (localepath);
1060	# endif
1061	# endif
1062		1141
1063	#endif /* NO_RESOURCES */	1142	#endif /* NO_RESOURCES */
1064	}	1143	}
1065		1144
1066	/}}} /	1145	/}}} /

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.43 by root, Wed Dec 15 00:53:23 2004 UTC vs. Revision 1.70 by root, Wed Jan 4 05:35:34 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.43 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.70 by root, Wed Jan 4 05:35:34 2006 UTC