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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.16 by pcg, Thu Mar 4 00:59:10 2004 UTC vs.
Revision 1.29 by root, Tue Aug 3 22:19:51 2004 UTC

…		…
1	/---------------------------------C----------------------------------	1	/---------------------------------C----------------------------------
2	* File: xdefaults.c	2	* File: xdefaults.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* $Id: xdefaults.C,v 1.16 2004/03/04 00:59:10 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	#if defined (HOTKEY_CTRL) \|\| defined (HOTKEY_META)	235	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),
246	RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"),
247	RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"),
248	#endif
249	STRG (Rs_modifier, "modifier", "mod", "modifier",
250	"meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),
251	INFO ("xrm", "string", "X resource"),	236	INFO ("xrm", "string", "X resource"),
252	#ifdef CUTCHAR_RESOURCE	237	#ifdef CUTCHAR_RESOURCE
253	RSTRG (Rs_cutchars, "cutchars", "string"),	238	RSTRG (Rs_cutchars, "cutchars", "string"),
254	#endif /* CUTCHAR_RESOURCE */	239	#endif /* CUTCHAR_RESOURCE */
255	#ifdef ACS_ASCII
256	RSTRG (Rs_acs_chars, "acsChars", "string"),
257	#endif /* ACS_ASCII */
258	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
259	INFO ("e", "command arg ...", "command to execute")	245	INFO ("e", "command arg ...", "command to execute")
260	};	246	};
261		247
262	#undef INFO	248	#undef INFO
263	#undef STRG	249	#undef STRG
…		…
347	/{{{ usage: /	333	/{{{ usage: /
348	/----------------------------------------------------------------------/	334	/----------------------------------------------------------------------/
349	static void	335	static void
350	rxvt_usage (int type)	336	rxvt_usage (int type)
351	{	337	{
352	unsigned int i, col;	338	unsigned int i, col;
353		339
354	write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1);	340	rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
355	write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
356	write (STDERR_FILENO, RESNAME, sizeof (RESNAME) - 1);
357		341
358	switch (type)	342	switch (type)
359	{	343	{
360	case 0: /* brief listing */	344	case 0: /* brief listing */
361	fprintf (stderr, " [-help] [--help]\n");	345	rxvt_log (" [-help] [--help]\n");
		346
362	for (col = 1, i = 0; i < optList_size (); i++)	347	for (col = 1, i = 0; i < optList_size (); i++)
363	if (optList[i].desc != NULL)	348	if (optList[i].desc != NULL)
364	{	349	{
365	int len = 0;	350	int len = 0;
366		351
…		…
375	#endif	360	#endif
376	len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);	361	len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);
377	col += len;	362	col += len;
378	if (col > 79)	363	if (col > 79)
379	{ /* assume regular width */	364	{ /* assume regular width */
380	putc ('\n', stderr);	365	rxvt_log ("\n");
381	col = 1 + len;	366	col = 1 + len;
382	}	367	}
		368
383	fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""),	369	rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
384	optList[i].opt);
385	if (optList_strlen (i))	370	if (optList_strlen (i))
386	fprintf (stderr, " %s]", optList[i].arg);	371	rxvt_log (" %s]", optList[i].arg);
387	else	372	else
388	fprintf (stderr, "]");	373	rxvt_log ("]");
389	}	374	}
390	break;	375	break;
391		376
392	case 1: /* full command-line listing */	377	case 1: /* full command-line listing */
393	fprintf (stderr, " [options] [-e command args]\n\n"	378	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
394	"where options include:\n");	379
395	for (i = 0; i < optList_size (); i++)	380	for (i = 0; i < optList_size (); i++)
396	if (optList[i].desc != NULL)	381	if (optList[i].desc != NULL)
397	{	382	{
398	#ifdef DEBUG_STRICT	383	#ifdef DEBUG_STRICT
399	assert (optList[i].opt != NULL);	384	assert (optList[i].opt != NULL);
400	#endif	385	#endif
401	fprintf (stderr, " %s%s %-*s%s%s\n",	386	rxvt_log (" %s%s %-*s%s%s\n",
402	(optList_isBool (i) ? "-/+" : "-"), optList[i].opt,	387	(optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
403	(INDENT - STRLEN (optList[i].opt)	388	(INDENT - STRLEN (optList[i].opt)
404	+ (optList_isBool (i) ? 0 : 2)),	389	+ (optList_isBool (i) ? 0 : 2)),
405	(optList[i].arg ? optList[i].arg : ""),	390	(optList[i].arg ? optList[i].arg : ""),
406	(optList_isBool (i) ? "turn on/off " : ""),	391	(optList_isBool (i) ? "turn on/off " : ""),
407	optList[i].desc);	392	optList[i].desc);
408	}	393	}
409	fprintf (stderr, "\n --help to list long-options");	394	rxvt_log ("\n --help to list long-options");
410	break;	395	break;
411		396
412	case 2: /* full resource listing */	397	case 2: /* full resource listing */
413	fprintf (stderr,
414	" [options] [-e command args]\n\n"	398	rxvt_log (" [options] [-e command args]\n\n"
415	"where resources (long-options) include:\n");	399	"where resources (long-options) include:\n");
416		400
417	for (i = 0; i < optList_size (); i++)	401	for (i = 0; i < optList_size (); i++)
418	if (optList[i].kw != NULL)	402	if (optList[i].kw != NULL)
419	fprintf (stderr, " %s: %*s%s\n",	403	rxvt_log (" %s: %*s%s\n",
420	optList[i].kw,	404	optList[i].kw,
421	(INDENT - STRLEN (optList[i].kw)), "", /* XXX */	405	(INDENT - STRLEN (optList[i].kw)), "", /* XXX */
422	(optList_isBool (i) ? "boolean" : optList[i].arg));	406	(optList_isBool (i) ? "boolean" : optList[i].arg));
423	#ifdef KEYSYM_RESOURCE	407	#ifdef KEYSYM_RESOURCE
424	fprintf (stderr, " " "keysym.sym" ": %*s%s\n",	408	rxvt_log (" " "keysym.sym" ": %*s%s\n",
425	(INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */	409	(INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
426	"keysym");	410	"keysym");
427	#endif	411	#endif
428	fprintf (stderr, "\n -help to list options");	412	rxvt_log ("\n -help to list options");
429	break;	413	break;
430	}	414	}
431	fprintf (stderr, "\n\n");	415
432	exit (EXIT_FAILURE);	416	rxvt_log ("\n\n");
		417	rxvt_exit_failure ();
433	/* NOTREACHED */	418	/* NOTREACHED */
434	}	419	}
435		420
436	/}}} /	421	/}}} /
437		422
…		…
464	longopt = opt++; / long option */	449	longopt = opt++; / long option */
465	}	450	}
466	else	451	else
467	{	452	{
468	bad_option = 1;	453	bad_option = 1;
469	rxvt_print_error ("bad option \"%s\"", opt);	454	rxvt_warn ("\"%s\": malformed option.\n", opt);
470	continue;	455	continue;
471	}	456	}
472		457
473	if (!STRCMP (opt, "help"))	458	if (!STRCMP (opt, "help"))
474	rxvt_usage (longopt ? 2 : 1);	459	rxvt_usage (longopt ? 2 : 1);
…		…
484		469
485	if (entry < optList_size ())	470	if (entry < optList_size ())
486	{	471	{
487	if (optList_isReverse (entry))	472	if (optList_isReverse (entry))
488	flag = flag == On ? Off : On;	473	flag = flag == On ? Off : On;
		474
489	if (optList_strlen (entry))	475	if (optList_strlen (entry))
490	{ /* string value */
491	const char *str = argv[++i];
492
493	#ifdef DEBUG_RESOURCES
494	fprintf (stderr, "string (%s,%s) = ",
495	optList[entry].opt ? optList[entry].opt : "nil",
496	optList[entry].kw ? optList[entry].kw : "nil");
497	#endif
498	if (flag == On && str && (optList[entry].doff != -1))
499	{	476	{
500	#ifdef DEBUG_RESOURCES
501	fprintf (stderr, "\"%s\"\n", str);
502	#endif
503	rs[optList[entry].doff] = str;
504	/*	477	/*
505	* special cases are handled in main.c:main () to allow	478	* special cases are handled in main.c:main () to allow
506	* X resources to set these values before we settle for	479	* X resources to set these values before we settle for
507	* default values	480	* default values
508	*/	481	*/
509	}
510	#ifdef DEBUG_RESOURCES
511	else
512	fprintf (stderr, "???\n");
513	#endif
514		482
		483	if (optList[entry].doff != -1)
		484	rs[optList[entry].doff] = flag == On && argv[i+1]
		485	? argv[++i] : 0;
515	}	486	}
516	else	487	else
517	{ /* boolean value */	488	{ /* boolean value */
518	#ifdef DEBUG_RESOURCES	489	#ifdef DEBUG_RESOURCES
519	fprintf (stderr, "boolean (%s,%s) = %s\n",	490	fprintf (stderr, "boolean (%s,%s) = %s\n",
…		…
531	else	502	else
532	#ifdef KEYSYM_RESOURCE	503	#ifdef KEYSYM_RESOURCE
533	/* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */	504	/* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */
534	if (rxvt_Str_match (opt, "keysym."))	505	if (rxvt_Str_match (opt, "keysym."))
535	{	506	{
536	const char *str = argv[++i];	507	const char *str = argv[++i];
537		508
538	if (str != NULL)	509	if (str != NULL)
539	parse_keysym (opt + sizeof ("keysym.") - 1, str);	510	parse_keysym (opt + sizeof ("keysym.") - 1, str);
540	}	511	}
541	else	512	else
542	#endif	513	#endif
		514	{
543	bad_option = 1;	515	bad_option = 1;
		516	rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
		517	}
544	}	518	}
545		519
546	if (bad_option)	520	if (bad_option)
547	rxvt_usage (0);	521	rxvt_usage (0);
548	}	522	}
…		…
675	unsigned int len;	649	unsigned int len;
676	char *str, buffer[256];	650	char *str, buffer[256];
677		651
678	if (stream == NULL)	652	if (stream == NULL)
679	return;	653	return;
		654
680	len = STRLEN (name);	655	len = STRLEN (name);
681	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)	656	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
682	{	657	{
683	unsigned int entry, n;	658	unsigned int entry, n;
684		659
…		…
693	# ifdef KEYSYM_RESOURCE	668	# ifdef KEYSYM_RESOURCE
694	if (!parse_keysym (str, NULL))	669	if (!parse_keysym (str, NULL))
695	# endif /* KEYSYM_RESOURCE */	670	# endif /* KEYSYM_RESOURCE */
696	for (entry = 0; entry < optList_size (); entry++)	671	for (entry = 0; entry < optList_size (); entry++)
697	{	672	{
698	const char *kw = optList[entry].kw;	673	const char *kw = optList[entry].kw;
699		674
700	if (kw == NULL)	675	if (kw == NULL)
701	continue;	676	continue;
		677
702	n = STRLEN (kw);	678	n = STRLEN (kw);
703	if (str[n] == ':' && rxvt_Str_match (str, kw))	679	if (str[n] == ':' && rxvt_Str_match (str, kw))
704	{	680	{
705	/* skip `keyword:' */	681	/* skip `keyword:' */
706	str += n + 1;	682	str += n + 1;
…		…
730	rxvt_Str_trim (str);	706	rxvt_Str_trim (str);
731	n = STRLEN (str);	707	n = STRLEN (str);
732	}	708	}
733		709
734	rs[optList[entry].doff] = p;	710	rs[optList[entry].doff] = p;
		711	allocated.push_back (p);
		712
735	if (optList_isBool (entry))	713	if (optList_isBool (entry))
736	{	714	{
737	s = STRCASECMP (str, "TRUE") == 0	715	s = STRCASECMP (str, "TRUE") == 0
738	\|\| STRCASECMP (str, "YES") == 0	716	\|\| STRCASECMP (str, "YES") == 0
739	\|\| STRCASECMP (str, "ON") == 0	717	\|\| STRCASECMP (str, "ON") == 0
740	\|\| STRCASECMP (str, "1") == 0;	718	\|\| STRCASECMP (str, "1") == 0;
		719
741	if (optList_isReverse (entry))	720	if (optList_isReverse (entry))
742	s = !s;	721	s = !s;
		722
743	if (s)	723	if (s)
744	Options \|= (optList[entry].flag);	724	Options \|= optList[entry].flag;
745	else	725	else
746	Options &= ~ (optList[entry].flag);	726	Options &= ~optList[entry].flag;
747	}	727	}
748	}	728	}
		729
749	break;	730	break;
750	}	731	}
751	}	732	}
752	}	733	}
		734
753	rewind (stream);	735	rewind (stream);
754	}	736	}
755		737
756	/}}} /	738	/}}} /
757	# endif /* ! USE_XGETDEFAULT */	739	# endif /* ! USE_XGETDEFAULT */
…		…
768	#ifndef NO_RESOURCES	750	#ifndef NO_RESOURCES
769		751
770	# if defined XAPPLOADDIR	752	# if defined XAPPLOADDIR
771	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	753	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
772	/* Compute the path of the possibly available localized Rxvt file */	754	/* Compute the path of the possibly available localized Rxvt file */
773	char *localepath = NULL;	755	char *localepath = NULL;
774		756
775	if (locale != NULL)	757	if (locale != NULL)
776	{ /* XXX: must limit length of string */	758	{ /* XXX: must limit length of string */
777	localepath = (char *)rxvt_malloc (256);	759	localepath = (char *)rxvt_malloc (256);
778	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,	760	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
…		…
786		768
787	# ifdef USE_XGETDEFAULT	769	# ifdef USE_XGETDEFAULT
788	/*	770	/*
789	* get resources using the X library function	771	* get resources using the X library function
790	*/	772	*/
791	int entry;	773	int entry;
792		774
793	# ifdef XrmEnumOneLevel	775	# ifdef XrmEnumOneLevel
794	int i;	776	int i;
795	char displayResource, xe;	777	char displayResource, xe;
796	XrmName name_prefix[3];	778	XrmName name_prefix[3];
797	XrmClass class_prefix[3];	779	XrmClass class_prefix[3];
798	XrmDatabase database, rdb1;	780	XrmDatabase database, rdb1;
799	char fname[1024];	781	char fname[1024];
800		782
801	XrmInitialize ();	783	XrmInitialize ();
802	database = NULL;	784	database = NULL;
803		785
804	/* Get any Xserver defaults */	786	/* Get any Xserver defaults */
…		…
817		799
818	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)	800	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
819	{	801	{
820	sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,	802	sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,
821	ptr, xnames[i]);	803	ptr, xnames[i]);
822	if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)	804	if ((rdb1 = XrmGetFileDatabase (fname)))
823	{	805	{
824	XrmMergeDatabases (rdb1, &database);	806	XrmMergeDatabases (rdb1, &database);
825	# ifndef HAVE_BOTH_XRESOURCE_FILES	807	# ifndef HAVE_BOTH_XRESOURCE_FILES
826	break;	808	break;
827	# endif	809	# endif
…		…
978	# ifdef RESFALLBACK	960	# ifdef RESFALLBACK
979	get_xdefaults (fd, RESFALLBACK);	961	get_xdefaults (fd, RESFALLBACK);
980	# endif	962	# endif
981		963
982	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)	964	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
983
984	{	965	{
985	FILE *ad = NULL;	966	FILE *ad = NULL;
986		967
987	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	968	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
988	if (localepath == NULL \|\| (ad = fopen (localepath, "r")) == NULL)	969	if (localepath == NULL \|\| (ad = fopen (localepath, "r")) == NULL)
989	# endif	970	# endif
990	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");	971	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
…		…
1011	free (localepath);	992	free (localepath);
1012	# endif	993	# endif
1013	# endif	994	# endif
1014		995
1015	#endif /* NO_RESOURCES */	996	#endif /* NO_RESOURCES */
1016
1017	/*
1018	* even without resources, at least do this setup for command-line
1019	* options and command-line long options
1020	*/
1021
1022	#if defined (HOTKEY_CTRL) \|\| defined (HOTKEY_META)
1023	KeySym sym;
1024
1025	if (rs[Rs_bigfont_key]
1026	&& ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
1027	ks_bigfont = sym;
1028	if (rs[Rs_smallfont_key]
1029	&& ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
1030	ks_smallfont = sym;
1031	#endif
1032	}	997	}
1033		998
1034	/}}} /	999	/}}} /
1035	/----------------------- end-of-file (C source) -----------------------/	1000	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.16 by pcg, Thu Mar 4 00:59:10 2004 UTC vs. Revision 1.29 by root, Tue Aug 3 22:19:51 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.16 by pcg, Thu Mar 4 00:59:10 2004 UTC vs.
Revision 1.29 by root, Tue Aug 3 22:19:51 2004 UTC