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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.41 by root, Sun Sep 5 09:33:00 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 */
…		…
91	SWCH ("iconic", Opt_iconic, "start iconic"),	100	SWCH ("iconic", Opt_iconic, "start iconic"),
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"),
		105	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
96	#ifdef HAVE_SCROLLBARS	106	#if HAVE_SCROLLBARS
		107	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
97	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),	108	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
98	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"),
99	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"),
100	#endif	113	#endif
101	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),	114	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
102	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"),
103	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),	116	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
104	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),	117	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
105	#ifdef TRANSPARENT	118	#if TRANSPARENT
106	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),	119	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
107	BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
108	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
109	#if TINTING	129	#if TINTING
110	STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
111	#endif
112	#endif
113	#ifdef OFF_FOCUS_FADING
114	STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."),
115	#endif
116	#ifdef TINTING
117	STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),	130	STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
118	#endif	131	#endif
119	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),	132	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
120	#ifndef NO_BELL	133	#ifndef NO_BELL
121	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),	134	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
…		…
130	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),	143	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
131	#endif	144	#endif
132	#if ENABLE_FRILLS	145	#if ENABLE_FRILLS
133	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),	146	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
134	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"),
135	#endif	149	#endif
136	#ifdef CURSOR_BLINK	150	#if CURSOR_BLINK
137	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),	151	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
138	#endif	152	#endif
139	#ifdef POINTER_BLANK	153	#ifdef POINTER_BLANK
140	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"),
141	#endif	155	#endif
…		…
163	RSTRG (Rs_color + Color_BD, "colorBD", "color"),	177	RSTRG (Rs_color + Color_BD, "colorBD", "color"),
164	RSTRG (Rs_color + Color_IT, "colorIT", "color"),	178	RSTRG (Rs_color + Color_IT, "colorIT", "color"),
165	RSTRG (Rs_color + Color_UL, "colorUL", "color"),	179	RSTRG (Rs_color + Color_UL, "colorUL", "color"),
166	RSTRG (Rs_color + Color_RV, "colorRV", "color"),	180	RSTRG (Rs_color + Color_RV, "colorRV", "color"),
167	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	181	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
		182	#if ENABLE_FRILLS
		183	RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
		184	#endif
168	#ifdef KEEP_SCROLLCOLOR	185	#ifdef KEEP_SCROLLCOLOR
169	RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),	186	RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
170	RSTRG (Rs_color + Color_trough, "troughColor", "color"),	187	RSTRG (Rs_color + Color_trough, "troughColor", "color"),
171	#endif /* KEEP_SCROLLCOLOR */	188	#endif /* KEEP_SCROLLCOLOR */
172	#ifdef OPTION_HC	189	#ifdef OPTION_HC
173	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),	190	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
174	#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"),
175	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)	200	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
176	RSTRG (Rs_path, "path", "search path"),	201	RSTRG (Rs_path, "path", "search path"),
177	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */	202	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */
178	#ifdef XPM_BACKGROUND	203	#ifdef XPM_BACKGROUND
179	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),	204	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
…		…
185	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),	210	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
186	#if ENABLE_STYLES	211	#if ENABLE_STYLES
187	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),	212	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
188	STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),	213	STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
189	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"),
190	#endif	216	#endif
191	#ifdef USE_XIM	217	#ifdef USE_XIM
192	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),	218	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
193	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"),
194	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
195	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"),
196	#endif	221	STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
197	#endif /* USE_XIM */	222	#endif /* USE_XIM */
198	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"),
199	STRG (Rs_title, "title", "title", "string", "title name for window"),	224	STRG (Rs_title, "title", "title", "string", "title name for window"),
200	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */	225	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
201	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),	226	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
202	#ifndef NO_CURSORCOLOR
203	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
204	/* command-line option = resource name */
205	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
206	#endif /* NO_CURSORCOLOR */
207	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
208	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
209	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
210	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
211	#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"),
212	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	234	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
213	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	235	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
214	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	236	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
215	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),	237	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
216	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),	238	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
217	#endif
218	#ifndef NO_LINESPACE
219	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"),
220	#endif	240	#endif
221	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
222	#ifdef POINTER_BLANK	241	#ifdef POINTER_BLANK
223	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),	242	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
224	#endif	243	#endif
225	#ifndef NO_BACKSPACE_KEY	244	#ifndef NO_BACKSPACE_KEY
226	RSTRG (Rs_backspace_key, "backspacekey", "string"),	245	RSTRG (Rs_backspace_key, "backspacekey", "string"),
227	#endif	246	#endif
228	#ifndef NO_DELETE_KEY	247	#ifndef NO_DELETE_KEY
229	RSTRG (Rs_delete_key, "deletekey", "string"),	248	RSTRG (Rs_delete_key, "deletekey", "string"),
230	#endif	249	#endif
231	RSTRG (Rs_selectstyle, "selectstyle", "mode"),	250	RSTRG (Rs_selectstyle, "selectstyle", "mode"),
232	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
233	#ifdef HAVE_SCROLLBARS
234	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
235	#endif
236	#ifdef PRINTPIPE	251	#ifdef PRINTPIPE
237	RSTRG (Rs_print_pipe, "print-pipe", "string"),	252	RSTRG (Rs_print_pipe, "print-pipe", "string"),
238	#endif	253	#endif
239	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"),
240	INFO ("xrm", "string", "X resource"),
241	#ifdef CUTCHAR_RESOURCE	255	#ifdef CUTCHAR_RESOURCE
242	RSTRG (Rs_cutchars, "cutchars", "string"),	256	RSTRG (Rs_cutchars, "cutchars", "string"),
243	#endif /* CUTCHAR_RESOURCE */	257	#endif /* CUTCHAR_RESOURCE */
244	RSTRG (Rs_answerbackstring, "answerbackString", "string"),	258	RSTRG (Rs_answerbackstring, "answerbackString", "string"),
245	#ifndef NO_SECONDARY_SCREEN	259	#ifndef NO_SECONDARY_SCREEN
246	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),	260	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
247	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
248	#endif	273	#endif
249	INFO ("e", "command arg ...", "command to execute")	274	INFO ("e", "command arg ...", "command to execute")
250	};	275	};
251		276
252	#undef INFO	277	#undef INFO
…		…
354	"strings,"	379	"strings,"
355	#endif	380	#endif
356	#if defined(ENABLE_FRILLS)	381	#if defined(ENABLE_FRILLS)
357	"frills,"	382	"frills,"
358	#endif	383	#endif
359	#if !defined(NO_LINESPACE)
360	"linespace,"
361	#endif
362	#if defined(PREFER_24BIT)	384	#if defined(PREFER_24BIT)
363	"24bit,"	385	"24bit,"
364	#endif	386	#endif
365	#if defined(SELECTION_SCROLLING)	387	#if defined(SELECTION_SCROLLING)
366	"selectionscrolling,"	388	"selectionscrolling,"
…		…
405	switch (type)	427	switch (type)
406	{	428	{
407	case 0: /* brief listing */	429	case 0: /* brief listing */
408	rxvt_log (" [-help] [--help]\n");	430	rxvt_log (" [-help] [--help]\n");
409		431
410	for (col = 1, i = 0; i < optList_size (); i++)	432	for (col = 1, i = 0; i < optList_size; i++)
411	if (optList[i].desc != NULL)	433	if (optList[i].desc != NULL)
412	{	434	{
413	int len = 0;	435	int len = 0;
414		436
415	if (!optList_isBool (i))	437	if (!optList_isBool (i))
…		…
438	break;	460	break;
439		461
440	case 1: /* full command-line listing */	462	case 1: /* full command-line listing */
441	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");	463	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
442		464
443	for (i = 0; i < optList_size (); i++)	465	for (i = 0; i < optList_size; i++)
444	if (optList[i].desc != NULL)	466	if (optList[i].desc != NULL)
445	{	467	{
446	#ifdef DEBUG_STRICT	468	#ifdef DEBUG_STRICT
447	assert (optList[i].opt != NULL);	469	assert (optList[i].opt != NULL);
448	#endif	470	#endif
…		…
459		481
460	case 2: /* full resource listing */	482	case 2: /* full resource listing */
461	rxvt_log (" [options] [-e command args]\n\n"	483	rxvt_log (" [options] [-e command args]\n\n"
462	"where resources (long-options) include:\n");	484	"where resources (long-options) include:\n");
463		485
464	for (i = 0; i < optList_size (); i++)	486	for (i = 0; i < optList_size; i++)
465	if (optList[i].kw != NULL)	487	if (optList[i].kw != NULL)
466	rxvt_log (" %s: %*s%s\n",	488	rxvt_log (" %s: %*s%s\n",
467	optList[i].kw,	489	optList[i].kw,
468	(INDENT - strlen (optList[i].kw)), "", /* XXX */	490	(INDENT - strlen (optList[i].kw)), "", /* XXX */
469	(optList_isBool (i) ? "boolean" : optList[i].arg));	491	(optList_isBool (i) ? "boolean" : optList[i].arg));
…		…
490	int i, bad_option = 0;	512	int i, bad_option = 0;
491	static const char On[3] = "ON", Off[4] = "OFF";	513	static const char On[3] = "ON", Off[4] = "OFF";
492		514
493	for (i = 1; i < argc; i++)	515	for (i = 1; i < argc; i++)
494	{	516	{
495	unsigned int entry, longopt = 0;	517	unsigned int entry, longopt = 0;
496	const char flag, opt;	518	const char flag, opt;
497		519
498	opt = argv[i];	520	opt = argv[i];
499	#ifdef DEBUG_RESOURCES	521	#ifdef DEBUG_RESOURCES
500	fprintf (stderr, "argv[%d] = %s: ", i, opt);	522	fprintf (stderr, "argv[%d] = %s: ", i, opt);
501	#endif	523	#endif
…		…
522	rxvt_usage (longopt ? 2 : 1);	544	rxvt_usage (longopt ? 2 : 1);
523	if (!strcmp (opt, "h"))	545	if (!strcmp (opt, "h"))
524	rxvt_usage (0);	546	rxvt_usage (0);
525		547
526	/* feature: always try to match long-options */	548	/* feature: always try to match long-options */
527	for (entry = 0; entry < optList_size (); entry++)	549	for (entry = 0; entry < optList_size; entry++)
528	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))	550	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
529	\|\| (!longopt	551	\|\| (!longopt
530	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))	552	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))
531	break;	553	break;
532		554
533	if (entry < optList_size ())	555	if (entry < optList_size)
534	{	556	{
535	if (optList_isReverse (entry))	557	if (optList_isReverse (entry))
536	flag = flag == On ? Off : On;	558	flag = flag == On ? Off : On;
537		559
538	if (optList_strlen (entry))	560	if (optList_strlen (entry))
…		…
552	#ifdef DEBUG_RESOURCES	574	#ifdef DEBUG_RESOURCES
553	fprintf (stderr, "boolean (%s,%s) = %s\n",	575	fprintf (stderr, "boolean (%s,%s) = %s\n",
554	optList[entry].opt, optList[entry].kw, flag);	576	optList[entry].opt, optList[entry].kw, flag);
555	#endif	577	#endif
556	if (flag == On)	578	if (flag == On)
557	options \|= (optList[entry].flag);	579	SET_OPTION (optList[entry].flag & Optflag_mask);
558	else	580	else
559	options &= ~ (optList[entry].flag);	581	CLR_OPTION (optList[entry].flag & Optflag_mask);
560		582
561	if (optList[entry].doff != -1)	583	if (optList[entry].doff != -1)
562	rs[optList[entry].doff] = flag;	584	rs[optList[entry].doff] = flag;
563	}	585	}
564	}	586	}
…		…
603	XrmQuarkList quarks,	625	XrmQuarkList quarks,
604	XrmRepresentation *type __attribute__((unused)),	626	XrmRepresentation *type __attribute__((unused)),
605	XrmValue *value,	627	XrmValue *value,
606	XPointer closure __attribute__((unused)))	628	XPointer closure __attribute__((unused)))
607	{	629	{
608	int last;	630	int last;
609		631
610	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 */
611	;	633	;
		634
612	last--;	635	last--;
613	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
614	return False;	637	return False;
615	}	638	}
616		639
…		…
621	* arg will be	644	* arg will be
622	* NULL for ~/.Xdefaults and	645	* NULL for ~/.Xdefaults and
623	* non-NULL for command-line options (need to allocate)	646	* non-NULL for command-line options (need to allocate)
624	*/	647	*/
625	#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
626	int	685	int
627	rxvt_term::parse_keysym (const char str, const char arg)	686	rxvt_term::parse_keysym (const char str, const char arg)
628	{	687	{
629	int n, sym;	688	int n, sym;
630	char key_string, newarg = NULL;	689	unsigned int state = 0;
		690	const char *pmodend = NULL;
		691	char *newarg = NULL;
631	char newargstr[NEWARGLIM];	692	char newargstr[NEWARGLIM];
632		693
633	if (arg == NULL)	694	if (arg == NULL)
634	{	695	{
635	if ((n = rxvt_Str_match (str, "keysym.")) == 0)	696	if ((n = rxvt_Str_match (str, "keysym.")) == 0)
636	return 0;	697	return 0;
		698
637	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)
638	}	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
639	/* some scanf () have trouble with a 0x prefix */	731	/* some scanf () have trouble with a 0x prefix */
640	if (isdigit (str[0]))
641	{
642	if (str[0] == '0' && toupper (str[1]) == 'X')	732	if (str[0] == '0' && toupper (str[1]) == 'X')
		733	{
643	str += 2;	734	str += 2;
		735
644	if (arg)	736	if (arg)
645	{	737	{
646	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)	738	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
647	return -1;	739	return -1;
648	}	740	}
…		…
662	/*	754	/*
663	* convert keysym name to keysym number	755	* convert keysym name to keysym number
664	*/	756	*/
665	strncpy (newargstr, str, NEWARGLIM - 1);	757	strncpy (newargstr, str, NEWARGLIM - 1);
666	newargstr[NEWARGLIM - 1] = '\0';	758	newargstr[NEWARGLIM - 1] = '\0';
		759
667	if (arg == NULL)	760	if (arg == NULL)
668	{	761	{
669	if ((newarg = strchr (newargstr, ':')) == NULL)	762	if ((newarg = strchr (newargstr, ':')) == NULL)
670	return -1;	763	return -1;
		764
671	newarg++ = '\0'; / terminate keysym name */	765	newarg++ = '\0'; / terminate keysym name */
672	}	766	}
		767
673	if ((sym = XStringToKeysym (newargstr)) == None)	768	if ((sym = XStringToKeysym (newargstr)) == None)
674	return -1;	769	return -1;
675	}	770	}
676
677	if (sym < 0xFF00 \|\| sym > 0xFFFF) /* we only do extended keys */
678	return -1;
679	sym &= 0xFF;
680	if (Keysym_map[sym] != NULL) /* already set ? */
681	return -1;
682		771
683	if (newarg == NULL)	772	if (newarg == NULL)
684	{	773	{
685	strncpy (newargstr, arg, NEWARGLIM - 1);	774	strncpy (newargstr, arg, NEWARGLIM - 1);
686	newargstr[NEWARGLIM - 1] = '\0';	775	newargstr[NEWARGLIM - 1] = '\0';
687	newarg = newargstr;	776	newarg = newargstr;
688	}	777	}
		778
689	rxvt_Str_trim (newarg);	779	rxvt_Str_trim (newarg);
690	if (*newarg == '\0' \|\| (n = rxvt_Str_escaped (newarg)) == 0)	780	if (*newarg == '\0' \|\| (n = rxvt_Str_escaped (newarg)) == 0)
691	return -1;	781	return -1;
692	MIN_IT (n, 255);
693	key_string = (char )rxvt_malloc ((n + 1) sizeof (char));
694		782
695	key_string[0] = n;	783	keyboard->register_user_translation (sym, state, newarg);
696	strncpy (key_string + 1, newarg, n);
697	Keysym_map[sym] = (unsigned char *)key_string;
698
699	return 1;	784	return 1;
700	}	785	}
701		786
702	# endif /* KEYSYM_RESOURCE */	787	# endif /* KEYSYM_RESOURCE */
703		788
…		…
716	return;	801	return;
717		802
718	len = strlen (name);	803	len = strlen (name);
719	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)	804	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
720	{	805	{
721	unsigned int entry, n;	806	unsigned int entry, n;
722		807
723	while (str && isspace (str))	808	while (str && isspace (str))
724	str++; /* leading whitespace */	809	str++; /* leading whitespace */
725		810
726	if ((str[len] != '*' && str[len] != '.')	811	if ((str[len] != '*' && str[len] != '.')
…		…
729	str += (len + 1); /* skip `name' or `name.' /	814	str += (len + 1); /* skip `name' or `name.' /
730		815
731	# ifdef KEYSYM_RESOURCE	816	# ifdef KEYSYM_RESOURCE
732	if (!parse_keysym (str, NULL))	817	if (!parse_keysym (str, NULL))
733	# endif /* KEYSYM_RESOURCE */	818	# endif /* KEYSYM_RESOURCE */
734	for (entry = 0; entry < optList_size (); entry++)	819	for (entry = 0; entry < optList_size; entry++)
735	{	820	{
736	const char *kw = optList[entry].kw;	821	const char *kw = optList[entry].kw;
737		822
738	if (kw == NULL)	823	if (kw == NULL)
739	continue;	824	continue;
…		…
743	{	828	{
744	/* skip `keyword:' */	829	/* skip `keyword:' */
745	str += n + 1;	830	str += n + 1;
746	rxvt_Str_trim (str);	831	rxvt_Str_trim (str);
747	n = strlen (str);	832	n = strlen (str);
		833
748	if (n && rs[optList[entry].doff] == NULL)	834	if (n && rs[optList[entry].doff] == NULL)
749	{	835	{
750	/* not already set */	836	/* not already set */
751	int s;	837	int s;
752	char *p = 0;	838	char *p = 0;
…		…
773	rs[optList[entry].doff] = p;	859	rs[optList[entry].doff] = p;
774	allocated.push_back (p);	860	allocated.push_back (p);
775		861
776	if (optList_isBool (entry))	862	if (optList_isBool (entry))
777	{	863	{
778	s = strcasecmp (str, "TRUE") == 0	864	s = strcasecmp (str, "true") == 0
779	\|\| strcasecmp (str, "YES") == 0	865	\|\| strcasecmp (str, "yes") == 0
780	\|\| strcasecmp (str, "ON") == 0	866	\|\| strcasecmp (str, "on") == 0
781	\|\| strcasecmp (str, "1") == 0;	867	\|\| strcmp (str, "1") == 0;
782		868
783	if (optList_isReverse (entry))	869	if (optList_isReverse (entry))
784	s = !s;	870	s = !s;
785		871
786	if (s)	872	if (s)
787	options \|= optList[entry].flag;	873	SET_OPTION (optList[entry].flag & Optflag_mask);
788	else	874	else
789	options &= ~optList[entry].flag;	875	CLR_OPTION (optList[entry].flag & Optflag_mask);
790	}	876	}
791	}	877	}
792		878
793	break;	879	break;
794	}	880	}
…		…
806	/*	892	/*
807	* using XGetDefault () or the hand-rolled replacement	893	* using XGetDefault () or the hand-rolled replacement
808	*/	894	*/
809	/* ARGSUSED */	895	/* ARGSUSED */
810	void	896	void
811	rxvt_term::extract_resources (Display display __attribute__ ((unused)), const char name)	897	rxvt_term::extract_resources ()
812	{	898	{
		899	dDisp;
		900
813	#ifndef NO_RESOURCES	901	#ifndef NO_RESOURCES
		902
		903	char homedir = (char )getenv ("HOME");
		904	char fname[1024];
814		905
815	# if defined XAPPLOADDIR	906	# if defined XAPPLOADDIR
816	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	907	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
817	/* Compute the path of the possibly available localized Rxvt file */	908	/* Compute the path of the possibly available localized Rxvt file */
818	char *localepath = NULL;	909	char localepath[1024];
819		910
820	if (locale != NULL)	911	if (locale)
821	{ /* XXX: must limit length of string */
822	localepath = (char *)rxvt_malloc (256);
823	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,	912	snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
824	(int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),	913	else
825	locale); /* 258 = 255 + 4 (-.s) - 1 (/) /	914	localepath[0] = 0;
826	}
827
828	{
829	# endif	915	# endif
830	# endif	916	# endif
831		917
832	# ifdef USE_XGETDEFAULT	918	# ifdef USE_XGETDEFAULT
833	/*	919	/*
834	* get resources using the X library function	920	* get resources using the X library function
835	*/	921	*/
836	int entry;	922	int entry;
837		923
838	# ifdef XrmEnumOneLevel	924	# ifdef XrmEnumOneLevel
839	int i;
840	char displayResource, xe;	925	char displayResource, xe;
841	XrmName name_prefix[3];	926	XrmName name_prefix[3];
842	XrmClass class_prefix[3];	927	XrmClass class_prefix[3];
843	XrmDatabase database, rdb1;	928	XrmDatabase database, rdb1;
844	char fname[1024];
845		929
846	XrmInitialize ();	930	XrmInitialize ();
847	database = NULL;	931	database = NULL;
848		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.
849	/* Get any Xserver defaults */	957	/* Get any Xserver defaults */
850
851	displayResource = XResourceManagerString (display);	958	displayResource = XResourceManagerString (disp);
852	if (displayResource != NULL)	959	if (displayResource != NULL)
		960	{
853	database = XrmGetStringDatabase (displayResource);	961	if ((rdb1 = XrmGetStringDatabase (displayResource)))
854		962	XrmMergeDatabases (rdb1, &database);
855	# ifdef HAVE_EXTRA_XRESOURCE_FILES
856	/* Add in ~/.Xdefaults or ~/.Xresources */
857	{	963	}
858	char *ptr;	964	else if (homedir)
		965	{
		966	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
859		967
860	if ((ptr = (char *)getenv ("HOME")) == NULL)	968	if ((rdb1 = XrmGetFileDatabase (fname)))
861	ptr = ".";	969	XrmMergeDatabases (rdb1, &database);
		970	}
862		971
863	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))
864	{	993	{
865	sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,	994	snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
866	ptr, xnames[i]);	995
867	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))
868	{	1035	{
869	XrmMergeDatabases (rdb1, &database);	1036	s = strcasecmp (p, "TRUE") == 0
870	# 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);
871	break;	1046	else
872	# endif	1047	CLR_OPTION (optList[entry].flag & Optflag_mask);
873
874	}	1048	}
875	}	1049	}
876	}	1050	}
877	# endif
878		1051
879	/* Add in XENVIRONMENT file */
880
881	if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
882	&& (rdb1 = XrmGetFileDatabase (xe)) != NULL)
883	XrmMergeDatabases (rdb1, &database);
884
885	/* Add in Rxvt file */
886	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
887	if (localepath == NULL \|\| (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
888	# endif
889	rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
890
891	if (rdb1 != NULL)
892	XrmMergeDatabases (rdb1, &database);
893
894	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
895	if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
896	{
897	sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
898	- sizeof (RESCLASS) - 2, xe);
899	if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
900	XrmMergeDatabases (rdb1, &database);
901	}
902
903	XrmSetDatabase (display, database);
904	# endif
905
906	/*	1052	/*
907	* Query resources for options that affect us
908	*/
909	for (entry = 0; entry < optList_size (); entry++)
910	{
911	int s;
912	char p, p0;
913	const char *kw = optList[entry].kw;
914
915	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
916	continue; /* previously set */
917
918	p = XGetDefault (display, name, kw);
919	p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
920	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
921	{
922	p = XGetDefault (display, RESCLASS, kw);
923	#ifdef RESFALLBACK
924	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
925	p = XGetDefault (display, RESFALLBACK, kw);
926	#endif
927	}
928
929	if (p == NULL && p0)
930	p = p0;
931
932	if (p)
933	{
934	rs[optList[entry].doff] = p;
935
936	if (optList_isBool (entry))
937	{
938	s = strcasecmp (p, "TRUE") == 0
939	\|\| strcasecmp (p, "YES") == 0
940	\|\| strcasecmp (p, "ON") == 0
941	\|\| strcasecmp (p, "1") == 0;
942	if (optList_isReverse (entry))
943	s = !s;
944	if (s)
945	options \|= (optList[entry].flag);
946	else
947	options &= ~ (optList[entry].flag);
948	}
949	}
950	}
951
952	/*
953	* [R5 or later]: enumerate the resource database	1053	* [R5 or later]: enumerate the resource database
954	*/	1054	*/
955	# ifdef XrmEnumOneLevel
956	# ifdef KEYSYM_RESOURCE	1055	# ifdef KEYSYM_RESOURCE
957	name_prefix[0] = XrmStringToName (name);	1056	name_prefix[0] = XrmStringToName (rs[Rs_name]);
958	name_prefix[1] = XrmStringToName ("keysym");	1057	name_prefix[1] = XrmStringToName ("keysym");
959	name_prefix[2] = NULLQUARK;	1058	name_prefix[2] = NULLQUARK;
960	class_prefix[0] = XrmStringToName (RESCLASS);	1059	class_prefix[0] = XrmStringToName (RESCLASS);
961	class_prefix[1] = XrmStringToName ("Keysym");	1060	class_prefix[1] = XrmStringToName ("Keysym");
962	class_prefix[2] = NULLQUARK;	1061	class_prefix[2] = NULLQUARK;
963	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1062	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
964	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1063	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
965	XrmEnumOneLevel, rxvt_define_key, NULL);	1064	XrmEnumOneLevel, rxvt_define_key, NULL);
966	# ifdef RESFALLBACK	1065	# ifdef RESFALLBACK
967	name_prefix[0] = XrmStringToName (RESFALLBACK);	1066	name_prefix[0] = XrmStringToName (RESFALLBACK);
968	name_prefix[1] = XrmStringToName ("keysym");	1067	name_prefix[1] = XrmStringToName ("keysym");
969	class_prefix[0] = XrmStringToName (RESFALLBACK);	1068	class_prefix[0] = XrmStringToName (RESFALLBACK);
970	class_prefix[1] = XrmStringToName ("Keysym");	1069	class_prefix[1] = XrmStringToName ("Keysym");
971	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1070	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
972	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1071	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
973	XrmEnumOneLevel, rxvt_define_key, NULL);	1072	XrmEnumOneLevel, rxvt_define_key, NULL);
974	# endif
975	# endif	1073	# endif
976	# endif	1074	# endif
977		1075
978	# else /* USE_XGETDEFAULT */	1076	# else /* USE_XGETDEFAULT */
979	/* 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	{
980	FILE *fd = NULL;	1122	FILE *ad = NULL;
981	char *home;
982		1123
983	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)
984	{	1129	{
985	unsigned int i, len = strlen (home) + 2;	1130	get_xdefaults (ad, RESCLASS);
986	char *f = NULL;	1131	get_xdefaults (ad, "");
987
988	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
989	{
990	f = (char )rxvt_realloc (f, (len + strlen (xnames[i])) sizeof (char));
991
992	sprintf (f, "%s/%s", home, xnames[i]);
993
994	if ((fd = fopen (f, "r")) != NULL)
995	break;
996	}
997	free (f);	1132	fclose (ad);
998	}	1133	}
999	/*
1000	* The normal order to match resources is the following:
1001	* @ global resources (partial match, ~/.Xdefaults)
1002	* @ application file resources (XAPPLOADDIR/Rxvt)
1003	* @ class resources (~/.Xdefaults)
1004	* @ private resources (~/.Xdefaults)
1005	*
1006	* However, for the hand-rolled resources, the matching algorithm
1007	* checks if a resource string value has already been allocated
1008	* and won't overwrite it with (in this case) a less specific
1009	* resource value.
1010	*
1011	* This avoids multiple allocation. Also, when we've called this
1012	* routine command-line string options have already been applied so we
1013	* needn't to allocate for those resources.
1014	*
1015	* So, search in resources from most to least specific.
1016	*
1017	* Also, use a special sub-class so that we can use either or both of
1018	* "XTerm" and "Rxvt" as class names.
1019	*/
1020
1021	get_xdefaults (fd, name);
1022	get_xdefaults (fd, RESCLASS);
1023	# ifdef RESFALLBACK
1024	get_xdefaults (fd, RESFALLBACK);
1025	# endif
1026
1027	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1028	{
1029	FILE *ad = NULL;
1030
1031	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1032	if (localepath == NULL \|\| (ad = fopen (localepath, "r")) == NULL)
1033	# endif
1034	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1035	if (ad != NULL)
1036	{
1037	get_xdefaults (ad, RESCLASS);
1038	get_xdefaults (ad, "");
1039	fclose (ad);
1040	}
1041	}	1134	}
1042	# endif /* XAPPLOADDIR */	1135	# endif /* XAPPLOADDIR */
1043		1136
1044	get_xdefaults (fd, ""); /* partial match */	1137	get_xdefaults (fd, ""); /* partial match */
1045	if (fd != NULL)	1138	if (fd != NULL)
1046	fclose (fd);	1139	fclose (fd);
1047	# endif /* USE_XGETDEFAULT */	1140	# endif /* USE_XGETDEFAULT */
1048
1049	# if defined XAPPLOADDIR
1050	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1051
1052	}
1053
1054	/* Free the path of the possibly available localized Rxvt file */
1055	free (localepath);
1056	# endif
1057	# endif
1058		1141
1059	#endif /* NO_RESOURCES */	1142	#endif /* NO_RESOURCES */
1060	}	1143	}
1061		1144
1062	/}}} /	1145	/}}} /

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.41 by root, Sun Sep 5 09:33:00 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.41 by root, Sun Sep 5 09:33:00 2004 UTC vs.
Revision 1.70 by root, Wed Jan 4 05:35:34 2006 UTC