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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.17 by pcg, Sun Mar 14 17:33:08 2004 UTC vs.
Revision 1.30 by root, Fri Aug 13 03:36:57 2004 UTC

…		…
1	/---------------------------------C----------------------------------	1	/---------------------------------C----------------------------------
2	* File: xdefaults.c	2	* File: xdefaults.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* $Id: xdefaults.C,v 1.17 2004/03/14 17:33:08 pcg Exp $
5	*	4	*
6	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
7	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	6	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
8	* - original version	7	* - original version
9	* Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>	8	* Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
		9	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
10	*	10	*
11	* This program is free software; you can redistribute it and/or modify	11	* This program is free software; you can redistribute it and/or modify
12	* it under the terms of the GNU General Public License as published by	12	* it under the terms of the GNU General Public License as published by
13	* the Free Software Foundation; either version 2 of the License, or	13	* the Free Software Foundation; either version 2 of the License, or
14	* (at your option) any later version.	14	* (at your option) any later version.
83	const char desc; / description */	83	const char desc; / description */
84	}	84	}
85	optList[] = {	85	optList[] = {
86	STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */	86	STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87	STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),	87	STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88	STRG (Rs_term_name, "termName", "tn", "string",	88	STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
89	"value of the TERM environment variable"),
90	STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */	89	STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91	STRG (Rs_geometry, "geometry", "geometry", "geometry",	90	STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
92	"size (in characters) and position"),
93	SWCH ("C", Opt_console, "intercept console messages"),	91	SWCH ("C", Opt_console, "intercept console messages"),
94	SWCH ("iconic", Opt_iconic, "start iconic"),	92	SWCH ("iconic", Opt_iconic, "start iconic"),
95	SWCH ("ic", Opt_iconic, NULL), /* short form */	93	SWCH ("ic", Opt_iconic, NULL), /* short form */
96	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo,	94	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
97	"reverse video"),
98	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),	95	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),	96	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
100	#ifdef HAVE_SCROLLBARS	97	#ifdef HAVE_SCROLLBARS
101	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),	98	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
102	BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right,	99	BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
103	"scrollbar right"),	100	BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
104	BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st",
105	Opt_scrollBar_floating, "scrollbar without a trough"),
106	#endif	101	#endif
107	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput,	102	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
108	NULL),
109	BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse \| Opt_scrollTtyOutput,	103	BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse \| Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
110	"scroll-on-tty-output inhibit"),
111	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress,	104	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112	"scroll-on-keypress"),
113	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer,	105	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
114	"scroll-with-buffer"),
115	#ifdef TRANSPARENT	106	#ifdef TRANSPARENT
116	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent,	107	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
117	"inherit parent pixmap"),
118	BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all,	108	BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
119	"forcefully inherit root pixmap"),
120	SWCH ("tr", Opt_transparent, NULL),	109	SWCH ("tr", Opt_transparent, NULL),
		110	#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 urxvt is losing focus."),
		116	#endif
		117	#ifdef TINTING
		118	STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
121	#endif	119	#endif
122	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),	120	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
123	#ifndef NO_BELL	121	#ifndef NO_BELL
124	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),	122	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
125	# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)	123	# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
…		…
128	#endif	126	#endif
129	#ifdef META8_OPTION	127	#ifdef META8_OPTION
130	BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),	128	BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
131	#endif	129	#endif
132	#ifdef MOUSE_WHEEL	130	#ifdef MOUSE_WHEEL
133	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage,	131	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
134	NULL),
135	#endif	132	#endif
136	#ifndef NO_FRILLS	133	#ifndef NO_FRILLS
137	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords,	134	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
138	"triple click word selection"),	135	BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
139	#endif	136	#endif
140	#ifdef CURSOR_BLINK	137	#ifdef CURSOR_BLINK
141	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),	138	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
142	#endif	139	#endif
143	#ifdef POINTER_BLANK	140	#ifdef POINTER_BLANK
…		…
162	RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),	159	RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
163	RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),	160	RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
164	RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),	161	RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
165	#endif /* NO_BRIGHTCOLOR */	162	#endif /* NO_BRIGHTCOLOR */
166	#ifndef NO_BOLD_UNDERLINE_REVERSE	163	#ifndef NO_BOLD_UNDERLINE_REVERSE
		164	BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
167	RSTRG (Rs_color + Color_BD, "colorBD", "color"),	165	RSTRG (Rs_color + Color_BD, "colorBD", "color"),
168	RSTRG (Rs_color + Color_UL, "colorUL", "color"),	166	RSTRG (Rs_color + Color_UL, "colorUL", "color"),
169	RSTRG (Rs_color + Color_RV, "colorRV", "color"),	167	RSTRG (Rs_color + Color_RV, "colorRV", "color"),
170	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	168	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
171	#ifdef KEEP_SCROLLCOLOR	169	#ifdef KEEP_SCROLLCOLOR
…		…
177	#endif	175	#endif
178	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)	176	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
179	RSTRG (Rs_path, "path", "search path"),	177	RSTRG (Rs_path, "path", "search path"),
180	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */	178	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */
181	#ifdef XPM_BACKGROUND	179	#ifdef XPM_BACKGROUND
182	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]",	180	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
183	"background pixmap"),
184	#endif /* XPM_BACKGROUND */	181	#endif /* XPM_BACKGROUND */
185	#if (MENUBAR_MAX)	182	#if (MENUBAR_MAX)
186	RSTRG (Rs_menu, "menu", "name[;tag]"),	183	RSTRG (Rs_menu, "menu", "name[;tag]"),
187	#endif	184	#endif
188	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),	185	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
189	/* fonts: command-line option = resource name */	186	/* fonts: command-line option = resource name */
190	#ifdef USE_XIM	187	#ifdef USE_XIM
191	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),	188	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
192	STRG (Rs_preeditType, "preeditType", "pt", "style",	189	STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot\|OffTheSpot\|Root"),
193	"input style: style = OverTheSpot\|OffTheSpot\|Root"),
194	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	190	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
195	STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),	191	STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
196	#endif	192	#endif
197	#endif /* USE_XIM */	193	#endif /* USE_XIM */
198	STRG (Rs_name, NULL, "name", "string",	194	STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
199	"client instance, icon, and title strings"),
200	STRG (Rs_title, "title", "title", "string", "title name for window"),	195	STRG (Rs_title, "title", "title", "string", "title name for window"),
201	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */	196	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
202	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),	197	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
203	#ifndef NO_CURSORCOLOR	198	#ifndef NO_CURSORCOLOR
204	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),	199	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
205	/* command-line option = resource name */	200	/* command-line option = resource name */
206	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),	201	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
207	#endif /* NO_CURSORCOLOR */	202	#endif /* NO_CURSORCOLOR */
208	STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color",	203	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
209	"pointer color"),	204	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
210	STRG (Rs_color + Color_border, "borderColor", "bd", "color",	205	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
211	"border color"),
212	STRG (Rs_saveLines, "saveLines", "sl", "number",	206	STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213	"number of scrolled lines to save"),
214	#ifndef NO_FRILLS	207	#ifndef NO_FRILLS
215	STRG (Rs_ext_bwidth, "externalBorder", "w", "number",	208	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
216	"external border in pixels"),
217	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	209	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
218	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	210	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
219	STRG (Rs_int_bwidth, "internalBorder", "b", "number",	211	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
220	"internal border in pixels"),	212	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
221	#endif	213	#endif
222	#ifndef NO_LINESPACE	214	#ifndef NO_LINESPACE
223	STRG (Rs_lineSpace, "lineSpace", "lsp", "number",	215	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
224	"number of extra pixels between rows"),
225	#endif	216	#endif
226	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number",	217	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
227	"scrollbar thickness/width in pixels"),
228	#ifdef POINTER_BLANK	218	#ifdef POINTER_BLANK
229	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),	219	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
230	#endif	220	#endif
231	#ifndef NO_BACKSPACE_KEY	221	#ifndef NO_BACKSPACE_KEY
232	RSTRG (Rs_backspace_key, "backspacekey", "string"),	222	RSTRG (Rs_backspace_key, "backspacekey", "string"),
…		…
240	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),	230	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
241	#endif	231	#endif
242	#ifdef PRINTPIPE	232	#ifdef PRINTPIPE
243	RSTRG (Rs_print_pipe, "print-pipe", "string"),	233	RSTRG (Rs_print_pipe, "print-pipe", "string"),
244	#endif	234	#endif
245	STRG (Rs_modifier, "modifier", "mod", "modifier",	235	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),
246	"meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),
247	INFO ("xrm", "string", "X resource"),	236	INFO ("xrm", "string", "X resource"),
248	#ifdef CUTCHAR_RESOURCE	237	#ifdef CUTCHAR_RESOURCE
249	RSTRG (Rs_cutchars, "cutchars", "string"),	238	RSTRG (Rs_cutchars, "cutchars", "string"),
250	#endif /* CUTCHAR_RESOURCE */	239	#endif /* CUTCHAR_RESOURCE */
251	RSTRG (Rs_answerbackstring, "answerbackString", "string"),	240	RSTRG (Rs_answerbackstring, "answerbackString", "string"),
		241	#ifndef NO_SECONDARY_SCREEN
		242	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
		243	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
		244	#endif
252	INFO ("e", "command arg ...", "command to execute")	245	INFO ("e", "command arg ...", "command to execute")
253	};	246	};
254		247
255	#undef INFO	248	#undef INFO
256	#undef STRG	249	#undef STRG
…		…
259	#undef BOOL	252	#undef BOOL
260	/}}} /	253	/}}} /
261		254
262	static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";	255	static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
263	static const char optionsstring[] = "Options: "	256	static const char optionsstring[] = "Options: "
		257	#if XFT
		258	"xft,"
		259	#endif
		260	#if UNICODE_3
		261	"unicode3,"
		262	#endif
		263	"encodings=eu+vn"
		264	#if ENCODING_JP
		265	"+jp"
		266	#endif
		267	#if ENCODING_JP_EXT
		268	"+jp-ext"
		269	#endif
		270	#if ENCODING_KR
		271	"+kr"
		272	#endif
		273	#if ENCODING_CN
		274	"+cn"
		275	#endif
		276	#if ENCODING_CN_EXT
		277	"+cn-ext"
		278	#endif
		279	","
		280	#if ENABLE_COMBINING
		281	"combining,"
		282	#endif
		283	#if TEXT_BLINK
		284	"blink,"
		285	#endif
		286	#if OFF_FOCUS_FADING
		287	"fade,"
		288	#endif
264	#if defined(XPM_BACKGROUND)	289	#if defined(XPM_BACKGROUND)
265	"XPM,"	290	"XPM,"
266	#endif	291	#endif
267	#if defined(TRANSPARENT)	292	#if defined(TRANSPARENT)
268	"transparent,"	293	"transparent,"
269	#endif	294	#endif
		295	#if TINTING
		296	"tint,"
		297	#endif
270	#if defined(UTMP_SUPPORT)	298	#if defined(UTMP_SUPPORT)
271	"utmp,"	299	"utmp,"
272	#endif	300	#endif
273	#if defined(MENUBAR)	301	#if defined(MENUBAR)
274	"menubar,"	302	"menubar,"
275	#endif
276	#if !defined(NO_FRILLS)
277	"frills,"
278	#endif
279	#if !defined(NO_LINESPACE)
280	"linespace,"
281	#endif
282	#if defined(PREFER_24BIT)
283	"24bit,"
284	#endif	303	#endif
285	#if defined(USE_XIM)	304	#if defined(USE_XIM)
286	"XIM,"	305	"XIM,"
287	#endif	306	#endif
288	"scrollbars="	307	"scrollbars="
…		…
316	"no_backspace,"	335	"no_backspace,"
317	#endif	336	#endif
318	#if defined(NO_DELETE_KEY)	337	#if defined(NO_DELETE_KEY)
319	"no_delete,"	338	"no_delete,"
320	#endif	339	#endif
		340	#if EIGHT_BIT_CONTROLS
		341	"8bitctrls,"
		342	#endif
321	#if !defined(NO_STRINGS)	343	#if !defined(NO_STRINGS)
322	"strings,"	344	"strings,"
323	#endif	345	#endif
		346	#if !defined(NO_FRILLS)
		347	"frills,"
		348	#endif
		349	#if !defined(NO_LINESPACE)
		350	"linespace,"
		351	#endif
		352	#if defined(PREFER_24BIT)
		353	"24bit,"
		354	#endif
		355	#if defined(SELECTION_SCROLLING)
		356	"selectionscrolling,"
		357	#endif
		358	#if MOUSE_WHEEL
		359	"wheel,"
		360	#endif
		361	#if MOUSE_SLIP_WHEELING
		362	"slipwheel,"
		363	#endif
		364	#if defined(SMART_RESIZE)
		365	"smart-resize,"
		366	#endif
324	#if defined(TTY_256COLOR)	367	#if defined(TTY_256COLOR)
325	"256colour,"	368	"256colour,"
		369	#endif
		370	#if defined(CURSOR_BLINK)
		371	"cursorBlink,"
		372	#endif
		373	#if defined(POINTER_BLANK)
		374	"pointerBlank,"
326	#endif	375	#endif
327	#if defined(NO_RESOURCES)	376	#if defined(NO_RESOURCES)
328	"NoResources"	377	"NoResources"
329	#else	378	#else
330	# if defined(USE_XGETDEFAULT)	379	# if defined(USE_XGETDEFAULT)
…		…
340	/{{{ usage: /	389	/{{{ usage: /
341	/----------------------------------------------------------------------/	390	/----------------------------------------------------------------------/
342	static void	391	static void
343	rxvt_usage (int type)	392	rxvt_usage (int type)
344	{	393	{
345	unsigned int i, col;	394	unsigned int i, col;
346		395
347	write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1);	396	rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
348	write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
349	write (STDERR_FILENO, RESNAME, sizeof (RESNAME) - 1);
350		397
351	switch (type)	398	switch (type)
352	{	399	{
353	case 0: /* brief listing */	400	case 0: /* brief listing */
354	fprintf (stderr, " [-help] [--help]\n");	401	rxvt_log (" [-help] [--help]\n");
		402
355	for (col = 1, i = 0; i < optList_size (); i++)	403	for (col = 1, i = 0; i < optList_size (); i++)
356	if (optList[i].desc != NULL)	404	if (optList[i].desc != NULL)
357	{	405	{
358	int len = 0;	406	int len = 0;
359		407
…		…
368	#endif	416	#endif
369	len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);	417	len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);
370	col += len;	418	col += len;
371	if (col > 79)	419	if (col > 79)
372	{ /* assume regular width */	420	{ /* assume regular width */
373	putc ('\n', stderr);	421	rxvt_log ("\n");
374	col = 1 + len;	422	col = 1 + len;
375	}	423	}
		424
376	fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""),	425	rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
377	optList[i].opt);
378	if (optList_strlen (i))	426	if (optList_strlen (i))
379	fprintf (stderr, " %s]", optList[i].arg);	427	rxvt_log (" %s]", optList[i].arg);
380	else	428	else
381	fprintf (stderr, "]");	429	rxvt_log ("]");
382	}	430	}
383	break;	431	break;
384		432
385	case 1: /* full command-line listing */	433	case 1: /* full command-line listing */
386	fprintf (stderr, " [options] [-e command args]\n\n"	434	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
387	"where options include:\n");	435
388	for (i = 0; i < optList_size (); i++)	436	for (i = 0; i < optList_size (); i++)
389	if (optList[i].desc != NULL)	437	if (optList[i].desc != NULL)
390	{	438	{
391	#ifdef DEBUG_STRICT	439	#ifdef DEBUG_STRICT
392	assert (optList[i].opt != NULL);	440	assert (optList[i].opt != NULL);
393	#endif	441	#endif
394	fprintf (stderr, " %s%s %-*s%s%s\n",	442	rxvt_log (" %s%s %-*s%s%s\n",
395	(optList_isBool (i) ? "-/+" : "-"), optList[i].opt,	443	(optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
396	(INDENT - STRLEN (optList[i].opt)	444	(INDENT - STRLEN (optList[i].opt)
397	+ (optList_isBool (i) ? 0 : 2)),	445	+ (optList_isBool (i) ? 0 : 2)),
398	(optList[i].arg ? optList[i].arg : ""),	446	(optList[i].arg ? optList[i].arg : ""),
399	(optList_isBool (i) ? "turn on/off " : ""),	447	(optList_isBool (i) ? "turn on/off " : ""),
400	optList[i].desc);	448	optList[i].desc);
401	}	449	}
402	fprintf (stderr, "\n --help to list long-options");	450	rxvt_log ("\n --help to list long-options");
403	break;	451	break;
404		452
405	case 2: /* full resource listing */	453	case 2: /* full resource listing */
406	fprintf (stderr,
407	" [options] [-e command args]\n\n"	454	rxvt_log (" [options] [-e command args]\n\n"
408	"where resources (long-options) include:\n");	455	"where resources (long-options) include:\n");
409		456
410	for (i = 0; i < optList_size (); i++)	457	for (i = 0; i < optList_size (); i++)
411	if (optList[i].kw != NULL)	458	if (optList[i].kw != NULL)
412	fprintf (stderr, " %s: %*s%s\n",	459	rxvt_log (" %s: %*s%s\n",
413	optList[i].kw,	460	optList[i].kw,
414	(INDENT - STRLEN (optList[i].kw)), "", /* XXX */	461	(INDENT - STRLEN (optList[i].kw)), "", /* XXX */
415	(optList_isBool (i) ? "boolean" : optList[i].arg));	462	(optList_isBool (i) ? "boolean" : optList[i].arg));
416	#ifdef KEYSYM_RESOURCE	463	#ifdef KEYSYM_RESOURCE
417	fprintf (stderr, " " "keysym.sym" ": %*s%s\n",	464	rxvt_log (" " "keysym.sym" ": %*s%s\n",
418	(INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */	465	(INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
419	"keysym");	466	"keysym");
420	#endif	467	#endif
421	fprintf (stderr, "\n -help to list options");	468	rxvt_log ("\n -help to list options");
422	break;	469	break;
423	}	470	}
424	fprintf (stderr, "\n\n");	471
425	exit (EXIT_FAILURE);	472	rxvt_log ("\n\n");
		473	rxvt_exit_failure ();
426	/* NOTREACHED */	474	/* NOTREACHED */
427	}	475	}
428		476
429	/}}} /	477	/}}} /
430		478
…		…
457	longopt = opt++; / long option */	505	longopt = opt++; / long option */
458	}	506	}
459	else	507	else
460	{	508	{
461	bad_option = 1;	509	bad_option = 1;
462	rxvt_print_error ("bad option \"%s\"", opt);	510	rxvt_warn ("\"%s\": malformed option.\n", opt);
463	continue;	511	continue;
464	}	512	}
465		513
466	if (!STRCMP (opt, "help"))	514	if (!STRCMP (opt, "help"))
467	rxvt_usage (longopt ? 2 : 1);	515	rxvt_usage (longopt ? 2 : 1);
…		…
477		525
478	if (entry < optList_size ())	526	if (entry < optList_size ())
479	{	527	{
480	if (optList_isReverse (entry))	528	if (optList_isReverse (entry))
481	flag = flag == On ? Off : On;	529	flag = flag == On ? Off : On;
		530
482	if (optList_strlen (entry))	531	if (optList_strlen (entry))
483	{ /* string value */
484	const char *str = argv[++i];
485
486	#ifdef DEBUG_RESOURCES
487	fprintf (stderr, "string (%s,%s) = ",
488	optList[entry].opt ? optList[entry].opt : "nil",
489	optList[entry].kw ? optList[entry].kw : "nil");
490	#endif
491	if (flag == On && str && (optList[entry].doff != -1))
492	{	532	{
493	#ifdef DEBUG_RESOURCES
494	fprintf (stderr, "\"%s\"\n", str);
495	#endif
496	rs[optList[entry].doff] = str;
497	/*	533	/*
498	* special cases are handled in main.c:main () to allow	534	* special cases are handled in main.c:main () to allow
499	* X resources to set these values before we settle for	535	* X resources to set these values before we settle for
500	* default values	536	* default values
501	*/	537	*/
502	}
503	#ifdef DEBUG_RESOURCES
504	else
505	fprintf (stderr, "???\n");
506	#endif
507		538
		539	if (optList[entry].doff != -1)
		540	rs[optList[entry].doff] = flag == On && argv[i+1]
		541	? argv[++i] : 0;
508	}	542	}
509	else	543	else
510	{ /* boolean value */	544	{ /* boolean value */
511	#ifdef DEBUG_RESOURCES	545	#ifdef DEBUG_RESOURCES
512	fprintf (stderr, "boolean (%s,%s) = %s\n",	546	fprintf (stderr, "boolean (%s,%s) = %s\n",
…		…
524	else	558	else
525	#ifdef KEYSYM_RESOURCE	559	#ifdef KEYSYM_RESOURCE
526	/* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */	560	/* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */
527	if (rxvt_Str_match (opt, "keysym."))	561	if (rxvt_Str_match (opt, "keysym."))
528	{	562	{
529	const char *str = argv[++i];	563	const char *str = argv[++i];
530		564
531	if (str != NULL)	565	if (str != NULL)
532	parse_keysym (opt + sizeof ("keysym.") - 1, str);	566	parse_keysym (opt + sizeof ("keysym.") - 1, str);
533	}	567	}
534	else	568	else
535	#endif	569	#endif
		570	{
536	bad_option = 1;	571	bad_option = 1;
		572	rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
		573	}
537	}	574	}
538		575
539	if (bad_option)	576	if (bad_option)
540	rxvt_usage (0);	577	rxvt_usage (0);
541	}	578	}
…		…
668	unsigned int len;	705	unsigned int len;
669	char *str, buffer[256];	706	char *str, buffer[256];
670		707
671	if (stream == NULL)	708	if (stream == NULL)
672	return;	709	return;
		710
673	len = STRLEN (name);	711	len = STRLEN (name);
674	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)	712	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
675	{	713	{
676	unsigned int entry, n;	714	unsigned int entry, n;
677		715
…		…
686	# ifdef KEYSYM_RESOURCE	724	# ifdef KEYSYM_RESOURCE
687	if (!parse_keysym (str, NULL))	725	if (!parse_keysym (str, NULL))
688	# endif /* KEYSYM_RESOURCE */	726	# endif /* KEYSYM_RESOURCE */
689	for (entry = 0; entry < optList_size (); entry++)	727	for (entry = 0; entry < optList_size (); entry++)
690	{	728	{
691	const char *kw = optList[entry].kw;	729	const char *kw = optList[entry].kw;
692		730
693	if (kw == NULL)	731	if (kw == NULL)
694	continue;	732	continue;
		733
695	n = STRLEN (kw);	734	n = STRLEN (kw);
696	if (str[n] == ':' && rxvt_Str_match (str, kw))	735	if (str[n] == ':' && rxvt_Str_match (str, kw))
697	{	736	{
698	/* skip `keyword:' */	737	/* skip `keyword:' */
699	str += n + 1;	738	str += n + 1;
…		…
723	rxvt_Str_trim (str);	762	rxvt_Str_trim (str);
724	n = STRLEN (str);	763	n = STRLEN (str);
725	}	764	}
726		765
727	rs[optList[entry].doff] = p;	766	rs[optList[entry].doff] = p;
		767	allocated.push_back (p);
		768
728	if (optList_isBool (entry))	769	if (optList_isBool (entry))
729	{	770	{
730	s = STRCASECMP (str, "TRUE") == 0	771	s = STRCASECMP (str, "TRUE") == 0
731	\|\| STRCASECMP (str, "YES") == 0	772	\|\| STRCASECMP (str, "YES") == 0
732	\|\| STRCASECMP (str, "ON") == 0	773	\|\| STRCASECMP (str, "ON") == 0
733	\|\| STRCASECMP (str, "1") == 0;	774	\|\| STRCASECMP (str, "1") == 0;
		775
734	if (optList_isReverse (entry))	776	if (optList_isReverse (entry))
735	s = !s;	777	s = !s;
		778
736	if (s)	779	if (s)
737	Options \|= (optList[entry].flag);	780	Options \|= optList[entry].flag;
738	else	781	else
739	Options &= ~ (optList[entry].flag);	782	Options &= ~optList[entry].flag;
740	}	783	}
741	}	784	}
		785
742	break;	786	break;
743	}	787	}
744	}	788	}
745	}	789	}
		790
746	rewind (stream);	791	rewind (stream);
747	}	792	}
748		793
749	/}}} /	794	/}}} /
750	# endif /* ! USE_XGETDEFAULT */	795	# endif /* ! USE_XGETDEFAULT */
…		…
761	#ifndef NO_RESOURCES	806	#ifndef NO_RESOURCES
762		807
763	# if defined XAPPLOADDIR	808	# if defined XAPPLOADDIR
764	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	809	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
765	/* Compute the path of the possibly available localized Rxvt file */	810	/* Compute the path of the possibly available localized Rxvt file */
766	char *localepath = NULL;	811	char *localepath = NULL;
767		812
768	if (locale != NULL)	813	if (locale != NULL)
769	{ /* XXX: must limit length of string */	814	{ /* XXX: must limit length of string */
770	localepath = (char *)rxvt_malloc (256);	815	localepath = (char *)rxvt_malloc (256);
771	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,	816	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
…		…
779		824
780	# ifdef USE_XGETDEFAULT	825	# ifdef USE_XGETDEFAULT
781	/*	826	/*
782	* get resources using the X library function	827	* get resources using the X library function
783	*/	828	*/
784	int entry;	829	int entry;
785		830
786	# ifdef XrmEnumOneLevel	831	# ifdef XrmEnumOneLevel
787	int i;	832	int i;
788	char displayResource, xe;	833	char displayResource, xe;
789	XrmName name_prefix[3];	834	XrmName name_prefix[3];
790	XrmClass class_prefix[3];	835	XrmClass class_prefix[3];
791	XrmDatabase database, rdb1;	836	XrmDatabase database, rdb1;
792	char fname[1024];	837	char fname[1024];
793		838
794	XrmInitialize ();	839	XrmInitialize ();
795	database = NULL;	840	database = NULL;
796		841
797	/* Get any Xserver defaults */	842	/* Get any Xserver defaults */
…		…
810		855
811	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)	856	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
812	{	857	{
813	sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,	858	sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,
814	ptr, xnames[i]);	859	ptr, xnames[i]);
815	if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)	860	if ((rdb1 = XrmGetFileDatabase (fname)))
816	{	861	{
817	XrmMergeDatabases (rdb1, &database);	862	XrmMergeDatabases (rdb1, &database);
818	# ifndef HAVE_BOTH_XRESOURCE_FILES	863	# ifndef HAVE_BOTH_XRESOURCE_FILES
819	break;	864	break;
820	# endif	865	# endif

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.17 by pcg, Sun Mar 14 17:33:08 2004 UTC vs. Revision 1.30 by root, Fri Aug 13 03:36:57 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.17 by pcg, Sun Mar 14 17:33:08 2004 UTC vs.
Revision 1.30 by root, Fri Aug 13 03:36:57 2004 UTC