[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.66 by root, Mon Jan 2 20:35:39 2006 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.
28	----------------------------------------------------------------------/	28	----------------------------------------------------------------------/
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	#include "xdefaults.intpro" /* PROTOS for internal routines */	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
34		44
35	/* #define DEBUG_RESOURCES */	45	/* #define DEBUG_RESOURCES */
36
37	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
38		46
39	/{{{ monolithic option/resource structure: /	47	/{{{ monolithic option/resource structure: /
40	/*	48	/*
41	* `string' options MUST have a usage argument	49	* `string' options MUST have a usage argument
42	* `switch' and `boolean' options have no argument	50	* `switch' and `boolean' options have no argument
…		…
55	#define RSTRG(rsp, kw, arg) \	63	#define RSTRG(rsp, kw, arg) \
56	{0, (rsp), (kw), NULL, (arg), NULL}	64	{0, (rsp), (kw), NULL, (arg), NULL}
57		65
58	/* BOOL () - regular boolean `-/+' flag */	66	/* BOOL () - regular boolean `-/+' flag */
59	#define BOOL(rsp, kw, opt, flag, desc) \	67	#define BOOL(rsp, kw, opt, flag, desc) \
60	{ (Opt_Boolean\| (flag)), (rsp), (kw), (opt), NULL, (desc)}	68	{ (Optflag_Boolean \| (flag)), (rsp), (kw), (opt), NULL, (desc)}
61		69
62	/* SWCH () - `-' flag */	70	/* SWCH () - `-' flag */
63	#define SWCH(opt, flag, desc) \	71	#define SWCH(opt, flag, desc) \
64	{ (flag), -1, NULL, (opt), NULL, (desc)}	72	{ (flag), -1, NULL, (opt), NULL, (desc)}
65		73
66	/* convenient macros */	74	/* convenient macros */
67	#define optList_strlen(i) \	75	#define optList_strlen(i) \
68	(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))
69	#define optList_isBool(i) \	77	#define optList_isBool(i) \
70	(optList[i].flag & Opt_Boolean)	78	(optList[i].flag & Optflag_Boolean)
71	#define optList_isReverse(i) \	79	#define optList_isReverse(i) \
72	(optList[i].flag & Opt_Reverse)	80	(optList[i].flag & Optflag_Reverse)
73	#define optList_size() \	81	#define optList_size \
74	(sizeof (optList) / sizeof (optList[0]))	82	(sizeof (optList) / sizeof (optList[0]))
75		83
76	static const struct	84	static const struct
77	{	85	{
78	const unsigned long flag; /* Option flag */	86	const unsigned long flag; /* Option flag */
…		…
83	const char desc; / description */	91	const char desc; / description */
84	}	92	}
85	optList[] = {	93	optList[] = {
86	STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */	94	STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87	STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),	95	STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88	STRG (Rs_term_name, "termName", "tn", "string",	96	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 */	97	STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91	STRG (Rs_geometry, "geometry", "geometry", "geometry",	98	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"),	99	SWCH ("C", Opt_console, "intercept console messages"),
94	SWCH ("iconic", Opt_iconic, "start iconic"),	100	SWCH ("iconic", Opt_iconic, "start iconic"),
95	SWCH ("ic", Opt_iconic, NULL), /* short form */	101	SWCH ("ic", Opt_iconic, NULL), /* short form */
96	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo,	102	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
97	"reverse video"),
98	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),	103	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99	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"),
100	#ifdef HAVE_SCROLLBARS	106	#if HAVE_SCROLLBARS
		107	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
101	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),	108	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
102	BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right,	109	BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
103	"scrollbar right"),	110	BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
104	BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st",	111	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
105	Opt_scrollBar_floating, "scrollbar without a trough"),	112	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
106	#endif	113	#endif
107	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput,	114	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
108	NULL),
109	BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse \| Opt_scrollTtyOutput,	115	BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse \| Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
110	"scroll-on-tty-output inhibit"),
111	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress,	116	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112	"scroll-on-keypress"),
113	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer,	117	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
114	"scroll-with-buffer"),
115	#ifdef TRANSPARENT	118	#if TRANSPARENT
116	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent,	119	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
117	"inherit parent pixmap"),
118	BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all,
119	"forcefully inherit root pixmap"),
120	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
		129	#if TINTING
		130	STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
121	#endif	131	#endif
122	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),	132	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
123	#ifndef NO_BELL	133	#ifndef NO_BELL
124	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),	134	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
125	# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)	135	# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
…		…
128	#endif	138	#endif
129	#ifdef META8_OPTION	139	#ifdef META8_OPTION
130	BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),	140	BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
131	#endif	141	#endif
132	#ifdef MOUSE_WHEEL	142	#ifdef MOUSE_WHEEL
133	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage,	143	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
134	NULL),
135	#endif	144	#endif
136	#ifndef NO_FRILLS	145	#if ENABLE_FRILLS
137	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords,	146	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
138	"triple click word selection"),	147	BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
		148	BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"),
139	#endif	149	#endif
140	#ifdef CURSOR_BLINK	150	#if CURSOR_BLINK
141	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),	151	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
142	#endif	152	#endif
143	#ifdef POINTER_BLANK	153	#ifdef POINTER_BLANK
144	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"),
145	#endif	155	#endif
…		…
163	RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),	173	RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
164	RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),	174	RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
165	#endif /* NO_BRIGHTCOLOR */	175	#endif /* NO_BRIGHTCOLOR */
166	#ifndef NO_BOLD_UNDERLINE_REVERSE	176	#ifndef NO_BOLD_UNDERLINE_REVERSE
167	RSTRG (Rs_color + Color_BD, "colorBD", "color"),	177	RSTRG (Rs_color + Color_BD, "colorBD", "color"),
		178	RSTRG (Rs_color + Color_IT, "colorIT", "color"),
168	RSTRG (Rs_color + Color_UL, "colorUL", "color"),	179	RSTRG (Rs_color + Color_UL, "colorUL", "color"),
169	RSTRG (Rs_color + Color_RV, "colorRV", "color"),	180	RSTRG (Rs_color + Color_RV, "colorRV", "color"),
170	#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
171	#ifdef KEEP_SCROLLCOLOR	185	#ifdef KEEP_SCROLLCOLOR
172	RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),	186	RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
173	RSTRG (Rs_color + Color_trough, "troughColor", "color"),	187	RSTRG (Rs_color + Color_trough, "troughColor", "color"),
174	#endif /* KEEP_SCROLLCOLOR */	188	#endif /* KEEP_SCROLLCOLOR */
175	#ifdef OPTION_HC	189	#ifdef OPTION_HC
176	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),	190	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
177	#endif	191	#endif
178	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
179	RSTRG (Rs_path, "path", "search path"),
180	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */
181	#ifdef XPM_BACKGROUND
182	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]",
183	"background pixmap"),
184	#endif /* XPM_BACKGROUND */
185	#if (MENUBAR_MAX)
186	RSTRG (Rs_menu, "menu", "name[;tag]"),
187	#endif
188	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
189	/* fonts: command-line option = resource name */
190	#ifdef USE_XIM
191	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
192	STRG (Rs_preeditType, "preeditType", "pt", "style",
193	"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"),
196	#endif
197	#endif /* USE_XIM */
198	STRG (Rs_name, NULL, "name", "string",
199	"client instance, icon, and title strings"),
200	STRG (Rs_title, "title", "title", "string", "title name for window"),
201	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
202	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
203	#ifndef NO_CURSORCOLOR	192	#ifndef NO_CURSORCOLOR
204	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),	193	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
205	/* command-line option = resource name */	194	/* command-line option = resource name */
206	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),	195	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
207	#endif /* NO_CURSORCOLOR */	196	#endif /* NO_CURSORCOLOR */
208	STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color",	197	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
209	"pointer color"),	198	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
210	STRG (Rs_color + Color_border, "borderColor", "bd", "color",	199	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
211	"border color"),	200	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)
		201	RSTRG (Rs_path, "path", "search path"),
		202	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */
		203	#ifdef XPM_BACKGROUND
		204	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
		205	#endif /* XPM_BACKGROUND */
		206	#if (MENUBAR_MAX)
		207	RSTRG (Rs_menu, "menu", "name[;tag]"),
		208	#endif
		209	/* fonts: command-line option = resource name */
		210	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
		211	#if ENABLE_STYLES
		212	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
		213	STRG (Rs_italicFont, "italicFont", "fi", "fontname", "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"),
		216	#endif
		217	#ifdef USE_XIM
		218	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
		219	STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot\|OffTheSpot\|Root"),
		220	STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
		221	STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
		222	#endif /* USE_XIM */
		223	STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
		224	STRG (Rs_title, "title", "title", "string", "title name for window"),
		225	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
		226	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
212	STRG (Rs_saveLines, "saveLines", "sl", "number",	227	STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213	"number of scrolled lines to save"),	228	#if ENABLE_XEMBED
214	#ifndef NO_FRILLS	229	STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
		230	#endif
		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"),
215	STRG (Rs_ext_bwidth, "externalBorder", "w", "number",	234	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),	235	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
218	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	236	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
219	STRG (Rs_int_bwidth, "internalBorder", "b", "number",	237	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
220	"internal border in pixels"),	238	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
221	#endif
222	#ifndef NO_LINESPACE
223	STRG (Rs_lineSpace, "lineSpace", "lsp", "number",	239	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
224	"number of extra pixels between rows"),
225	#endif	240	#endif
226	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number",
227	"scrollbar thickness/width in pixels"),
228	#ifdef POINTER_BLANK	241	#ifdef POINTER_BLANK
229	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),	242	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
230	#endif	243	#endif
231	#ifndef NO_BACKSPACE_KEY	244	#ifndef NO_BACKSPACE_KEY
232	RSTRG (Rs_backspace_key, "backspacekey", "string"),	245	RSTRG (Rs_backspace_key, "backspacekey", "string"),
233	#endif	246	#endif
234	#ifndef NO_DELETE_KEY	247	#ifndef NO_DELETE_KEY
235	RSTRG (Rs_delete_key, "deletekey", "string"),	248	RSTRG (Rs_delete_key, "deletekey", "string"),
236	#endif	249	#endif
237	RSTRG (Rs_selectstyle, "selectstyle", "mode"),	250	RSTRG (Rs_selectstyle, "selectstyle", "mode"),
238	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
239	#ifdef HAVE_SCROLLBARS
240	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
241	#endif
242	#ifdef PRINTPIPE	251	#ifdef PRINTPIPE
243	RSTRG (Rs_print_pipe, "print-pipe", "string"),	252	RSTRG (Rs_print_pipe, "print-pipe", "string"),
244	#endif	253	#endif
245	STRG (Rs_modifier, "modifier", "mod", "modifier",	254	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"),
248	#ifdef CUTCHAR_RESOURCE	255	#ifdef CUTCHAR_RESOURCE
249	RSTRG (Rs_cutchars, "cutchars", "string"),	256	RSTRG (Rs_cutchars, "cutchars", "string"),
250	#endif /* CUTCHAR_RESOURCE */	257	#endif /* CUTCHAR_RESOURCE */
251	RSTRG (Rs_answerbackstring, "answerbackString", "string"),	258	RSTRG (Rs_answerbackstring, "answerbackString", "string"),
		259	#ifndef NO_SECONDARY_SCREEN
		260	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
		261	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
		262	#endif
		263	#if ENABLE_PERL
		264	STRG (Rs_perl_lib, "perl-lib", 0, "string", "colon-separated directories with extension scripts"),
		265	STRG (Rs_perl_eval, "perl-eval", 0, "string", "code to be evaluated after all extensions have been loaded"),
		266	STRG (Rs_perl_ext, "perl-ext", "pe", "string", "colon-sepaated list of perl extensions to enable"),
		267	#endif
		268	#if 0 && TODO
		269	#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
		270	INFO ("xrm", "string", "X resource"),
		271	#endif
		272	#endif
252	INFO ("e", "command arg ...", "command to execute")	273	INFO ("e", "command arg ...", "command to execute")
253	};	274	};
254		275
255	#undef INFO	276	#undef INFO
256	#undef STRG	277	#undef STRG
257	#undef RSTRG	278	#undef RSTRG
258	#undef SWCH	279	#undef SWCH
259	#undef BOOL	280	#undef BOOL
260	/}}} /	281	/}}} /
261		282
262	static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";	283	static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
263	static const char optionsstring[] = "Options: "	284	static const char optionsstring[] = "options: "
		285	#if XFT
		286	"xft,"
		287	#endif
		288	#if ENABLE_STYLES
		289	"styles,"
		290	#endif
		291	#if ENABLE_COMBINING
		292	"combining,"
		293	#endif
		294	#if TEXT_BLINK
		295	"blink,"
		296	#endif
		297	#if ISO_14755
		298	"iso14755,"
		299	#endif
		300	#if UNICODE_3
		301	"unicode3,"
		302	#endif
		303	"encodings=eu+vn"
		304	#if ENCODING_JP
		305	"+jp"
		306	#endif
		307	#if ENCODING_JP_EXT
		308	"+jp-ext"
		309	#endif
		310	#if ENCODING_KR
		311	"+kr"
		312	#endif
		313	#if ENCODING_ZH
		314	"+zh"
		315	#endif
		316	#if ENCODING_ZH_EXT
		317	"+zh-ext"
		318	#endif
		319	","
		320	#if OFF_FOCUS_FADING
		321	"fade,"
		322	#endif
264	#if defined(XPM_BACKGROUND)	323	#if defined(XPM_BACKGROUND)
265	"XPM,"	324	"XPM,"
266	#endif	325	#endif
267	#if defined(TRANSPARENT)	326	#if defined(TRANSPARENT)
268	"transparent,"	327	"transparent,"
269	#endif	328	#endif
		329	#if TINTING
		330	"tint,"
		331	#endif
270	#if defined(UTMP_SUPPORT)	332	#if defined(UTMP_SUPPORT)
271	"utmp,"	333	"utmp,"
272	#endif	334	#endif
273	#if defined(MENUBAR)	335	#if defined(MENUBAR)
274	"menubar,"	336	"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	337	#endif
285	#if defined(USE_XIM)	338	#if defined(USE_XIM)
286	"XIM,"	339	"XIM,"
287	#endif	340	#endif
288	"scrollbars="	341	"scrollbars="
…		…
316	"no_backspace,"	369	"no_backspace,"
317	#endif	370	#endif
318	#if defined(NO_DELETE_KEY)	371	#if defined(NO_DELETE_KEY)
319	"no_delete,"	372	"no_delete,"
320	#endif	373	#endif
		374	#if EIGHT_BIT_CONTROLS
		375	"8bitctrls,"
		376	#endif
321	#if !defined(NO_STRINGS)	377	#if !defined(NO_STRINGS)
322	"strings,"	378	"strings,"
323	#endif	379	#endif
324	#if defined(TTY_256COLOR)	380	#if defined(ENABLE_FRILLS)
		381	"frills,"
		382	#endif
		383	#if defined(PREFER_24BIT)
325	"256colour,"	384	"24bit,"
		385	#endif
		386	#if defined(SELECTION_SCROLLING)
		387	"selectionscrolling,"
		388	#endif
		389	#if MOUSE_WHEEL
		390	"wheel,"
		391	#endif
		392	#if MOUSE_SLIP_WHEELING
		393	"slipwheel,"
		394	#endif
		395	#if defined(SMART_RESIZE)
		396	"smart-resize,"
		397	#endif
		398	#if defined(CURSOR_BLINK)
		399	"cursorBlink,"
		400	#endif
		401	#if defined(POINTER_BLANK)
		402	"pointerBlank,"
326	#endif	403	#endif
327	#if defined(NO_RESOURCES)	404	#if defined(NO_RESOURCES)
328	"NoResources"	405	"NoResources"
329	#else	406	#else
330	# if defined(USE_XGETDEFAULT)	407	# if defined(USE_XGETDEFAULT)
…		…
340	/{{{ usage: /	417	/{{{ usage: /
341	/----------------------------------------------------------------------/	418	/----------------------------------------------------------------------/
342	static void	419	static void
343	rxvt_usage (int type)	420	rxvt_usage (int type)
344	{	421	{
345	unsigned int i, col;	422	unsigned int i, col;
346		423
347	write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1);	424	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		425
351	switch (type)	426	switch (type)
352	{	427	{
353	case 0: /* brief listing */	428	case 0: /* brief listing */
354	fprintf (stderr, " [-help] [--help]\n");	429	rxvt_log (" [-help] [--help]\n");
		430
355	for (col = 1, i = 0; i < optList_size (); i++)	431	for (col = 1, i = 0; i < optList_size; i++)
356	if (optList[i].desc != NULL)	432	if (optList[i].desc != NULL)
357	{	433	{
358	int len = 0;	434	int len = 0;
359		435
360	if (!optList_isBool (i))	436	if (!optList_isBool (i))
…		…
364	len++; /* account for space */	440	len++; /* account for space */
365	}	441	}
366	#ifdef DEBUG_STRICT	442	#ifdef DEBUG_STRICT
367	assert (optList[i].opt != NULL);	443	assert (optList[i].opt != NULL);
368	#endif	444	#endif
369	len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);	445	len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
370	col += len;	446	col += len;
371	if (col > 79)	447	if (col > 79)
372	{ /* assume regular width */	448	{ /* assume regular width */
373	putc ('\n', stderr);	449	rxvt_log ("\n");
374	col = 1 + len;	450	col = 1 + len;
375	}	451	}
		452
376	fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""),	453	rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
377	optList[i].opt);
378	if (optList_strlen (i))	454	if (optList_strlen (i))
379	fprintf (stderr, " %s]", optList[i].arg);	455	rxvt_log (" %s]", optList[i].arg);
380	else	456	else
381	fprintf (stderr, "]");	457	rxvt_log ("]");
382	}	458	}
383	break;	459	break;
384		460
385	case 1: /* full command-line listing */	461	case 1: /* full command-line listing */
386	fprintf (stderr, " [options] [-e command args]\n\n"	462	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
387	"where options include:\n");	463
388	for (i = 0; i < optList_size (); i++)	464	for (i = 0; i < optList_size; i++)
389	if (optList[i].desc != NULL)	465	if (optList[i].desc != NULL)
390	{	466	{
391	#ifdef DEBUG_STRICT	467	#ifdef DEBUG_STRICT
392	assert (optList[i].opt != NULL);	468	assert (optList[i].opt != NULL);
393	#endif	469	#endif
394	fprintf (stderr, " %s%s %-*s%s%s\n",	470	rxvt_log (" %s%s %-*s%s%s\n",
395	(optList_isBool (i) ? "-/+" : "-"), optList[i].opt,	471	(optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
396	(INDENT - STRLEN (optList[i].opt)	472	(INDENT - strlen (optList[i].opt)
397	+ (optList_isBool (i) ? 0 : 2)),	473	+ (optList_isBool (i) ? 0 : 2)),
398	(optList[i].arg ? optList[i].arg : ""),	474	(optList[i].arg ? optList[i].arg : ""),
399	(optList_isBool (i) ? "turn on/off " : ""),	475	(optList_isBool (i) ? "turn on/off " : ""),
400	optList[i].desc);	476	optList[i].desc);
401	}	477	}
402	fprintf (stderr, "\n --help to list long-options");	478	rxvt_log ("\n --help to list long-options");
403	break;	479	break;
404		480
405	case 2: /* full resource listing */	481	case 2: /* full resource listing */
406	fprintf (stderr,
407	" [options] [-e command args]\n\n"	482	rxvt_log (" [options] [-e command args]\n\n"
408	"where resources (long-options) include:\n");	483	"where resources (long-options) include:\n");
409		484
410	for (i = 0; i < optList_size (); i++)	485	for (i = 0; i < optList_size; i++)
411	if (optList[i].kw != NULL)	486	if (optList[i].kw != NULL)
412	fprintf (stderr, " %s: %*s%s\n",	487	rxvt_log (" %s: %*s%s\n",
413	optList[i].kw,	488	optList[i].kw,
414	(INDENT - STRLEN (optList[i].kw)), "", /* XXX */	489	(INDENT - strlen (optList[i].kw)), "", /* XXX */
415	(optList_isBool (i) ? "boolean" : optList[i].arg));	490	(optList_isBool (i) ? "boolean" : optList[i].arg));
416	#ifdef KEYSYM_RESOURCE	491	#ifdef KEYSYM_RESOURCE
417	fprintf (stderr, " " "keysym.sym" ": %*s%s\n",	492	rxvt_log (" " "keysym.sym" ": %*s%s\n",
418	(INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */	493	(INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
419	"keysym");	494	"keysym");
420	#endif	495	#endif
421	fprintf (stderr, "\n -help to list options");	496	rxvt_log ("\n -help to list options");
422	break;	497	break;
423	}	498	}
424	fprintf (stderr, "\n\n");	499
425	exit (EXIT_FAILURE);	500	rxvt_log ("\n\n");
		501	rxvt_exit_failure ();
426	/* NOTREACHED */	502	/* NOTREACHED */
427	}	503	}
428		504
429	/}}} /	505	/}}} /
430		506
…		…
435	int i, bad_option = 0;	511	int i, bad_option = 0;
436	static const char On[3] = "ON", Off[4] = "OFF";	512	static const char On[3] = "ON", Off[4] = "OFF";
437		513
438	for (i = 1; i < argc; i++)	514	for (i = 1; i < argc; i++)
439	{	515	{
440	unsigned int entry, longopt = 0;	516	unsigned int entry, longopt = 0;
441	const char flag, opt;	517	const char flag, opt;
442		518
443	opt = argv[i];	519	opt = argv[i];
444	#ifdef DEBUG_RESOURCES	520	#ifdef DEBUG_RESOURCES
445	fprintf (stderr, "argv[%d] = %s: ", i, opt);	521	fprintf (stderr, "argv[%d] = %s: ", i, opt);
446	#endif	522	#endif
…		…
457	longopt = opt++; / long option */	533	longopt = opt++; / long option */
458	}	534	}
459	else	535	else
460	{	536	{
461	bad_option = 1;	537	bad_option = 1;
462	rxvt_print_error ("bad option \"%s\"", opt);	538	rxvt_warn ("\"%s\": malformed option.\n", opt);
463	continue;	539	continue;
464	}	540	}
465		541
466	if (!STRCMP (opt, "help"))	542	if (!strcmp (opt, "help"))
467	rxvt_usage (longopt ? 2 : 1);	543	rxvt_usage (longopt ? 2 : 1);
468	if (!STRCMP (opt, "h"))	544	if (!strcmp (opt, "h"))
469	rxvt_usage (0);	545	rxvt_usage (0);
470		546
471	/* feature: always try to match long-options */	547	/* feature: always try to match long-options */
472	for (entry = 0; entry < optList_size (); entry++)	548	for (entry = 0; entry < optList_size; entry++)
473	if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw))	549	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
474	\|\| (!longopt	550	\|\| (!longopt
475	&& optList[entry].opt && !STRCMP (opt, optList[entry].opt)))	551	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))
476	break;	552	break;
477		553
478	if (entry < optList_size ())	554	if (entry < optList_size)
479	{	555	{
480	if (optList_isReverse (entry))	556	if (optList_isReverse (entry))
481	flag = flag == On ? Off : On;	557	flag = flag == On ? Off : On;
		558
482	if (optList_strlen (entry))	559	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	{	560	{
493	#ifdef DEBUG_RESOURCES
494	fprintf (stderr, "\"%s\"\n", str);
495	#endif
496	rs[optList[entry].doff] = str;
497	/*	561	/*
498	* special cases are handled in main.c:main () to allow	562	* special cases are handled in main.c:main () to allow
499	* X resources to set these values before we settle for	563	* X resources to set these values before we settle for
500	* default values	564	* default values
501	*/	565	*/
502	}
503	#ifdef DEBUG_RESOURCES
504	else
505	fprintf (stderr, "???\n");
506	#endif
507		566
		567	if (optList[entry].doff != -1)
		568	rs[optList[entry].doff] = flag == On && argv[i+1]
		569	? argv[++i] : 0;
508	}	570	}
509	else	571	else
510	{ /* boolean value */	572	{ /* boolean value */
511	#ifdef DEBUG_RESOURCES	573	#ifdef DEBUG_RESOURCES
512	fprintf (stderr, "boolean (%s,%s) = %s\n",	574	fprintf (stderr, "boolean (%s,%s) = %s\n",
513	optList[entry].opt, optList[entry].kw, flag);	575	optList[entry].opt, optList[entry].kw, flag);
514	#endif	576	#endif
515	if (flag == On)	577	if (flag == On)
516	Options \|= (optList[entry].flag);	578	SET_OPTION (optList[entry].flag & Optflag_mask);
517	else	579	else
518	Options &= ~ (optList[entry].flag);	580	CLR_OPTION (optList[entry].flag & Optflag_mask);
519		581
520	if (optList[entry].doff != -1)	582	if (optList[entry].doff != -1)
521	rs[optList[entry].doff] = flag;	583	rs[optList[entry].doff] = flag;
522	}	584	}
523	}	585	}
524	else	586	else
525	#ifdef KEYSYM_RESOURCE	587	#ifdef KEYSYM_RESOURCE
526	/* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */	588	/* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
527	if (rxvt_Str_match (opt, "keysym."))	589	if (rxvt_Str_match (opt, "keysym."))
528	{	590	{
529	const char *str = argv[++i];	591	const char *str = argv[++i];
530		592
531	if (str != NULL)	593	if (str != NULL)
532	parse_keysym (opt + sizeof ("keysym.") - 1, str);	594	parse_keysym (opt + sizeof ("keysym.") - 1, str);
533	}	595	}
534	else	596	else
535	#endif	597	#endif
		598	{
536	bad_option = 1;	599	bad_option = 1;
		600	rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
		601	}
537	}	602	}
538		603
539	if (bad_option)	604	if (bad_option)
540	rxvt_usage (0);	605	rxvt_usage (0);
541	}	606	}
…		…
559	XrmQuarkList quarks,	624	XrmQuarkList quarks,
560	XrmRepresentation *type __attribute__((unused)),	625	XrmRepresentation *type __attribute__((unused)),
561	XrmValue *value,	626	XrmValue *value,
562	XPointer closure __attribute__((unused)))	627	XPointer closure __attribute__((unused)))
563	{	628	{
564	int last;	629	int last;
565		630
566	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */	631	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
567	;	632	;
		633
568	last--;	634	last--;
569	GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO	635	GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
570	return False;	636	return False;
571	}	637	}
572		638
…		…
577	* arg will be	643	* arg will be
578	* NULL for ~/.Xdefaults and	644	* NULL for ~/.Xdefaults and
579	* non-NULL for command-line options (need to allocate)	645	* non-NULL for command-line options (need to allocate)
580	*/	646	*/
581	#define NEWARGLIM 500 /* `reasonable' size */	647	#define NEWARGLIM 500 /* `reasonable' size */
		648
		649	struct keysym_vocabulary_t
		650	{
		651	const char *name;
		652	unsigned short len;
		653	unsigned short value;
		654	};
		655	keysym_vocabulary_t keysym_vocabulary[] =
		656	{
		657	{ "ISOLevel3", 9, Level3Mask },
		658	{ "AppKeypad", 9, AppKeypadMask },
		659	{ "Control", 7, ControlMask },
		660	{ "NumLock", 7, NumLockMask },
		661	{ "Shift", 5, ShiftMask },
		662	{ "Meta", 4, MetaMask },
		663	{ "Lock", 4, LockMask },
		664	{ "Mod1", 4, Mod1Mask },
		665	{ "Mod2", 4, Mod2Mask },
		666	{ "Mod3", 4, Mod3Mask },
		667	{ "Mod4", 4, Mod4Mask },
		668	{ "Mod5", 4, Mod5Mask },
		669	{ "I", 1, Level3Mask },
		670	{ "K", 1, AppKeypadMask },
		671	{ "C", 1, ControlMask },
		672	{ "N", 1, NumLockMask },
		673	{ "S", 1, ShiftMask },
		674	{ "M", 1, MetaMask },
		675	{ "A", 1, MetaMask },
		676	{ "L", 1, LockMask },
		677	{ "1", 1, Mod1Mask },
		678	{ "2", 1, Mod2Mask },
		679	{ "3", 1, Mod3Mask },
		680	{ "4", 1, Mod4Mask },
		681	{ "5", 1, Mod5Mask },
		682	};
		683
582	int	684	int
583	rxvt_term::parse_keysym (const char str, const char arg)	685	rxvt_term::parse_keysym (const char str, const char arg)
584	{	686	{
585	int n, sym;	687	int n, sym;
586	char key_string, newarg = NULL;	688	unsigned int state = 0;
		689	const char *pmodend = NULL;
		690	char *newarg = NULL;
587	char newargstr[NEWARGLIM];	691	char newargstr[NEWARGLIM];
588		692
589	if (arg == NULL)	693	if (arg == NULL)
590	{	694	{
591	if ((n = rxvt_Str_match (str, "keysym.")) == 0)	695	if ((n = rxvt_Str_match (str, "keysym.")) == 0)
592	return 0;	696	return 0;
		697
593	str += n; /* skip `keysym.' */	698	str += n; /* skip `keysym.' */
		699	if ((pmodend = strchr (str, ':')) < str)
		700	return -1;
		701	}
		702	else
		703	pmodend = str + strlen(str);
		704
		705	for (--pmodend; str < pmodend; --pmodend)
		706	if (*pmodend == '-')
		707	break;
		708
		709	while (str < pmodend)
594	}	710	{
		711	unsigned int i;
		712
		713	for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
		714	{
		715	if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
		716	{
		717	state \|= keysym_vocabulary[i].value;
		718	str += keysym_vocabulary[i].len;
		719	break;
		720	}
		721	}
		722
		723	if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
		724	return -1;
		725
		726	if (*str == '-')
		727	++str;
		728	}
		729
595	/* some scanf () have trouble with a 0x prefix */	730	/* some scanf () have trouble with a 0x prefix */
596	if (isdigit (str[0]))
597	{
598	if (str[0] == '0' && toupper (str[1]) == 'X')	731	if (str[0] == '0' && toupper (str[1]) == 'X')
		732	{
599	str += 2;	733	str += 2;
		734
600	if (arg)	735	if (arg)
601	{	736	{
602	if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1)	737	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
603	return -1;	738	return -1;
604	}	739	}
605	else	740	else
606	{	741	{
607	if (sscanf (str, "%x:", &sym) != 1)	742	if (sscanf (str, "%x:", &sym) != 1)
608	return -1;	743	return -1;
609		744
610	/* cue to ':', it's there since sscanf () worked */	745	/* cue to ':', it's there since sscanf () worked */
611	STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1);	746	strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
612	newargstr[NEWARGLIM - 1] = '\0';	747	newargstr[NEWARGLIM - 1] = '\0';
613	newarg = newargstr;	748	newarg = newargstr;
614	}	749	}
615	}	750	}
616	else	751	else
617	{	752	{
618	/*	753	/*
619	* convert keysym name to keysym number	754	* convert keysym name to keysym number
620	*/	755	*/
621	STRNCPY (newargstr, str, NEWARGLIM - 1);	756	strncpy (newargstr, str, NEWARGLIM - 1);
622	newargstr[NEWARGLIM - 1] = '\0';	757	newargstr[NEWARGLIM - 1] = '\0';
		758
623	if (arg == NULL)	759	if (arg == NULL)
624	{	760	{
625	if ((newarg = STRCHR (newargstr, ':')) == NULL)	761	if ((newarg = strchr (newargstr, ':')) == NULL)
626	return -1;	762	return -1;
		763
627	newarg++ = '\0'; / terminate keysym name */	764	newarg++ = '\0'; / terminate keysym name */
628	}	765	}
		766
629	if ((sym = XStringToKeysym (newargstr)) == None)	767	if ((sym = XStringToKeysym (newargstr)) == None)
630	return -1;	768	return -1;
631	}	769	}
632		770
633	if (sym < 0xFF00 \|\| sym > 0xFFFF) /* we only do extended keys */
634	return -1;
635	sym &= 0xFF;
636	if (Keysym_map[sym] != NULL) /* already set ? */
637	return -1;
638
639	if (newarg == NULL)	771	if (newarg == NULL)
640	{	772	{
641	STRNCPY (newargstr, arg, NEWARGLIM - 1);	773	strncpy (newargstr, arg, NEWARGLIM - 1);
642	newargstr[NEWARGLIM - 1] = '\0';	774	newargstr[NEWARGLIM - 1] = '\0';
643	newarg = newargstr;	775	newarg = newargstr;
644	}	776	}
		777
645	rxvt_Str_trim (newarg);	778	rxvt_Str_trim (newarg);
646	if (*newarg == '\0' \|\| (n = rxvt_Str_escaped (newarg)) == 0)	779	if (*newarg == '\0' \|\| (n = rxvt_Str_escaped (newarg)) == 0)
647	return -1;	780	return -1;
648	MIN_IT (n, 255);
649	key_string = (char )rxvt_malloc ((n + 1) sizeof (char));
650		781
651	key_string[0] = n;	782	keyboard->register_user_translation (sym, state, newarg);
652	STRNCPY (key_string + 1, newarg, n);
653	Keysym_map[sym] = (unsigned char *)key_string;
654
655	return 1;	783	return 1;
656	}	784	}
657		785
658	# endif /* KEYSYM_RESOURCE */	786	# endif /* KEYSYM_RESOURCE */
659		787
…		…
668	unsigned int len;	796	unsigned int len;
669	char *str, buffer[256];	797	char *str, buffer[256];
670		798
671	if (stream == NULL)	799	if (stream == NULL)
672	return;	800	return;
673	len = STRLEN (name);	801
		802	len = strlen (name);
674	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)	803	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
675	{	804	{
676	unsigned int entry, n;	805	unsigned int entry, n;
677		806
678	while (str && isspace (str))	807	while (str && isspace (str))
679	str++; /* leading whitespace */	808	str++; /* leading whitespace */
680		809
681	if ((str[len] != '*' && str[len] != '.')	810	if ((str[len] != '*' && str[len] != '.')
682	\|\| (len && STRNCMP (str, name, len)))	811	\|\| (len && strncmp (str, name, len)))
683	continue;	812	continue;
684	str += (len + 1); /* skip `name' or `name.' /	813	str += (len + 1); /* skip `name' or `name.' /
685		814
686	# ifdef KEYSYM_RESOURCE	815	# ifdef KEYSYM_RESOURCE
687	if (!parse_keysym (str, NULL))	816	if (!parse_keysym (str, NULL))
688	# endif /* KEYSYM_RESOURCE */	817	# endif /* KEYSYM_RESOURCE */
689	for (entry = 0; entry < optList_size (); entry++)	818	for (entry = 0; entry < optList_size; entry++)
690	{	819	{
691	const char *kw = optList[entry].kw;	820	const char *kw = optList[entry].kw;
692		821
693	if (kw == NULL)	822	if (kw == NULL)
694	continue;	823	continue;
		824
695	n = STRLEN (kw);	825	n = strlen (kw);
696	if (str[n] == ':' && rxvt_Str_match (str, kw))	826	if (str[n] == ':' && rxvt_Str_match (str, kw))
697	{	827	{
698	/* skip `keyword:' */	828	/* skip `keyword:' */
699	str += n + 1;	829	str += n + 1;
700	rxvt_Str_trim (str);	830	rxvt_Str_trim (str);
701	n = STRLEN (str);	831	n = strlen (str);
		832
702	if (n && rs[optList[entry].doff] == NULL)	833	if (n && rs[optList[entry].doff] == NULL)
703	{	834	{
704	/* not already set */	835	/* not already set */
705	int s;	836	int s;
706	char *p = 0;	837	char *p = 0;
707		838
708	for (int o = 0;;)	839	for (int o = 0;;)
709	{	840	{
710	p = (char *)rxvt_realloc (p, o + n + 1);	841	p = (char *)rxvt_realloc (p, o + n + 1);
711	MEMCPY (p + o, str, n);	842	memcpy (p + o, str, n);
712	o += n;	843	o += n;
713	p[o] = 0;	844	p[o] = 0;
714		845
715	if (o == 0 \|\| p[o - 1] != '\\') // continuation line	846	if (o == 0 \|\| p[o - 1] != '\\') // continuation line
716	break;	847	break;
…		…
719		850
720	if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)	851	if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
721	break;	852	break;
722		853
723	rxvt_Str_trim (str);	854	rxvt_Str_trim (str);
724	n = STRLEN (str);	855	n = strlen (str);
725	}	856	}
726		857
727	rs[optList[entry].doff] = p;	858	rs[optList[entry].doff] = p;
		859	allocated.push_back (p);
		860
728	if (optList_isBool (entry))	861	if (optList_isBool (entry))
729	{	862	{
730	s = STRCASECMP (str, "TRUE") == 0	863	s = strcasecmp (str, "true") == 0
731	\|\| STRCASECMP (str, "YES") == 0	864	\|\| strcasecmp (str, "yes") == 0
732	\|\| STRCASECMP (str, "ON") == 0	865	\|\| strcasecmp (str, "on") == 0
733	\|\| STRCASECMP (str, "1") == 0;	866	\|\| strcmp (str, "1") == 0;
		867
734	if (optList_isReverse (entry))	868	if (optList_isReverse (entry))
735	s = !s;	869	s = !s;
		870
736	if (s)	871	if (s)
737	Options \|= (optList[entry].flag);	872	SET_OPTION (optList[entry].flag & Optflag_mask);
738	else	873	else
739	Options &= ~ (optList[entry].flag);	874	CLR_OPTION (optList[entry].flag & Optflag_mask);
740	}	875	}
741	}	876	}
		877
742	break;	878	break;
743	}	879	}
744	}	880	}
745	}	881	}
		882
746	rewind (stream);	883	rewind (stream);
747	}	884	}
748		885
749	/}}} /	886	/}}} /
750	# endif /* ! USE_XGETDEFAULT */	887	# endif /* ! USE_XGETDEFAULT */
…		…
754	/*	891	/*
755	* using XGetDefault () or the hand-rolled replacement	892	* using XGetDefault () or the hand-rolled replacement
756	*/	893	*/
757	/* ARGSUSED */	894	/* ARGSUSED */
758	void	895	void
759	rxvt_term::extract_resources (Display display __attribute__ ((unused)), const char name)	896	rxvt_term::extract_resources ()
760	{	897	{
		898	dDisp;
		899
761	#ifndef NO_RESOURCES	900	#ifndef NO_RESOURCES
		901
		902	char homedir = (char )getenv ("HOME");
		903	char fname[1024];
762		904
763	# if defined XAPPLOADDIR	905	# if defined XAPPLOADDIR
764	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	906	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
765	/* Compute the path of the possibly available localized Rxvt file */	907	/* Compute the path of the possibly available localized Rxvt file */
766	char *localepath = NULL;	908	char localepath[1024];
767		909
768	if (locale != NULL)	910	if (locale)
769	{ /* XXX: must limit length of string */
770	localepath = (char *)rxvt_malloc (256);
771	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,	911	snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
772	(int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),	912	else
773	locale); /* 258 = 255 + 4 (-.s) - 1 (/) /	913	localepath[0] = 0;
774	}
775
776	{
777	# endif	914	# endif
778	# endif	915	# endif
779		916
780	# ifdef USE_XGETDEFAULT	917	# ifdef USE_XGETDEFAULT
781	/*	918	/*
782	* get resources using the X library function	919	* get resources using the X library function
783	*/	920	*/
784	int entry;	921	int entry;
785		922
786	# ifdef XrmEnumOneLevel	923	# ifdef XrmEnumOneLevel
787	int i;
788	char displayResource, xe;	924	char displayResource, xe;
789	XrmName name_prefix[3];	925	XrmName name_prefix[3];
790	XrmClass class_prefix[3];	926	XrmClass class_prefix[3];
791	XrmDatabase database, rdb1;	927	XrmDatabase database, rdb1;
792	char fname[1024];
793		928
794	XrmInitialize ();	929	XrmInitialize ();
795	database = NULL;	930	database = NULL;
796		931
		932	// for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
		933
		934	// 6. System wide per application default file.
		935	/* Add in Rxvt file */
		936	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
		937	if (*localepath
		938	&& ((rdb1 = XrmGetFileDatabase (localepath))
		939	\|\| (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
		940	# endif
		941	XrmMergeDatabases (rdb1, &database);
		942
		943	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
		944	if ((xe = (char *)getenv ("XAPPLRESDIR")))
		945	{
		946	snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
		947
		948	if ((rdb1 = XrmGetFileDatabase (fname)))
		949	XrmMergeDatabases (rdb1, &database);
		950	}
		951
		952	// 5. User's per application default file.
		953	// none
		954
		955	// 4. User's defaults file.
797	/* Get any Xserver defaults */	956	/* Get any Xserver defaults */
798
799	displayResource = XResourceManagerString (display);	957	displayResource = XResourceManagerString (disp);
800	if (displayResource != NULL)	958	if (displayResource != NULL)
		959	{
801	database = XrmGetStringDatabase (displayResource);	960	if ((rdb1 = XrmGetStringDatabase (displayResource)))
802		961	XrmMergeDatabases (rdb1, &database);
803	# ifdef HAVE_EXTRA_XRESOURCE_FILES
804	/* Add in ~/.Xdefaults or ~/.Xresources */
805	{	962	}
806	char *ptr;	963	else if (homedir)
		964	{
		965	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
807		966
808	if ((ptr = (char *)getenv ("HOME")) == NULL)	967	if ((rdb1 = XrmGetFileDatabase (fname)))
809	ptr = ".";	968	XrmMergeDatabases (rdb1, &database);
		969	}
810		970
811	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)	971	/* Get screen specific resources */
		972	displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
		973	if (displayResource != NULL)
		974	{
		975	if ((rdb1 = XrmGetStringDatabase (displayResource)))
		976	/* Merge with screen-independent resources */
		977	XrmMergeDatabases (rdb1, &database);
		978
		979	XFree (displayResource);
		980	}
		981
		982	// 3. User's per host defaults file
		983	/* Add in XENVIRONMENT file */
		984	if ((xe = (char *)getenv ("XENVIRONMENT"))
		985	&& (rdb1 = XrmGetFileDatabase (xe)))
		986	XrmMergeDatabases (rdb1, &database);
		987	else if (homedir)
		988	{
		989	struct utsname un;
		990
		991	if (!uname (&un))
812	{	992	{
813	sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,	993	snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
814	ptr, xnames[i]);	994
815	if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)	995	if ((rdb1 = XrmGetFileDatabase (fname)))
		996	XrmMergeDatabases (rdb1, &database);
		997	}
		998	}
		999
		1000	XrmSetDatabase (disp, database);
		1001	# endif
		1002
		1003	/*
		1004	* Query resources for options that affect us
		1005	*/
		1006	for (entry = 0; entry < optList_size; entry++)
		1007	{
		1008	int s;
		1009	char p, p0;
		1010	const char *kw = optList[entry].kw;
		1011
		1012	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
		1013	continue; /* previously set */
		1014
		1015	p = XGetDefault (disp, rs[Rs_name], kw);
		1016	p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
		1017	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		1018	{
		1019	p = XGetDefault (disp, RESCLASS, kw);
		1020	#ifdef RESFALLBACK
		1021	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		1022	p = XGetDefault (disp, RESFALLBACK, kw);
		1023	#endif
		1024	}
		1025
		1026	if (p == NULL && p0)
		1027	p = p0;
		1028
		1029	if (p)
		1030	{
		1031	rs[optList[entry].doff] = p;
		1032
		1033	if (optList_isBool (entry))
816	{	1034	{
817	XrmMergeDatabases (rdb1, &database);	1035	s = strcasecmp (p, "TRUE") == 0
818	# ifndef HAVE_BOTH_XRESOURCE_FILES	1036	\|\| strcasecmp (p, "YES") == 0
		1037	\|\| strcasecmp (p, "ON") == 0
		1038	\|\| strcasecmp (p, "1") == 0;
		1039
		1040	if (optList_isReverse (entry))
		1041	s = !s;
		1042
		1043	if (s)
		1044	SET_OPTION (optList[entry].flag & Optflag_mask);
819	break;	1045	else
820	# endif	1046	CLR_OPTION (optList[entry].flag & Optflag_mask);
821
822	}	1047	}
823	}	1048	}
824	}	1049	}
825	# endif
826		1050
827	/* Add in XENVIRONMENT file */
828
829	if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
830	&& (rdb1 = XrmGetFileDatabase (xe)) != NULL)
831	XrmMergeDatabases (rdb1, &database);
832
833	/* Add in Rxvt file */
834	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
835	if (localepath == NULL \|\| (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
836	# endif
837	rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
838
839	if (rdb1 != NULL)
840	XrmMergeDatabases (rdb1, &database);
841
842	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
843	if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
844	{
845	sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
846	- sizeof (RESCLASS) - 2, xe);
847	if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
848	XrmMergeDatabases (rdb1, &database);
849	}
850
851	XrmSetDatabase (display, database);
852	# endif
853
854	/*	1051	/*
855	* Query resources for options that affect us
856	*/
857	for (entry = 0; entry < optList_size (); entry++)
858	{
859	int s;
860	char p, p0;
861	const char *kw = optList[entry].kw;
862
863	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
864	continue; /* previously set */
865
866	p = XGetDefault (display, name, kw);
867	p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
868	if (p == NULL \|\| (p0 && STRCMP (p, p0) == 0))
869	{
870	p = XGetDefault (display, RESCLASS, kw);
871	#ifdef RESFALLBACK
872	if (p == NULL \|\| (p0 && STRCMP (p, p0) == 0))
873	p = XGetDefault (display, RESFALLBACK, kw);
874	#endif
875	}
876
877	if (p == NULL && p0)
878	p = p0;
879
880	if (p)
881	{
882	rs[optList[entry].doff] = p;
883
884	if (optList_isBool (entry))
885	{
886	s = STRCASECMP (p, "TRUE") == 0
887	\|\| STRCASECMP (p, "YES") == 0
888	\|\| STRCASECMP (p, "ON") == 0
889	\|\| STRCASECMP (p, "1") == 0;
890	if (optList_isReverse (entry))
891	s = !s;
892	if (s)
893	Options \|= (optList[entry].flag);
894	else
895	Options &= ~ (optList[entry].flag);
896	}
897	}
898	}
899
900	/*
901	* [R5 or later]: enumerate the resource database	1052	* [R5 or later]: enumerate the resource database
902	*/	1053	*/
903	# ifdef XrmEnumOneLevel
904	# ifdef KEYSYM_RESOURCE	1054	# ifdef KEYSYM_RESOURCE
905	name_prefix[0] = XrmStringToName (name);	1055	name_prefix[0] = XrmStringToName (rs[Rs_name]);
906	name_prefix[1] = XrmStringToName ("keysym");	1056	name_prefix[1] = XrmStringToName ("keysym");
907	name_prefix[2] = NULLQUARK;	1057	name_prefix[2] = NULLQUARK;
908	class_prefix[0] = XrmStringToName (RESCLASS);	1058	class_prefix[0] = XrmStringToName (RESCLASS);
909	class_prefix[1] = XrmStringToName ("Keysym");	1059	class_prefix[1] = XrmStringToName ("Keysym");
910	class_prefix[2] = NULLQUARK;	1060	class_prefix[2] = NULLQUARK;
911	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1061	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
912	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1062	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
913	XrmEnumOneLevel, rxvt_define_key, NULL);	1063	XrmEnumOneLevel, rxvt_define_key, NULL);
914	# ifdef RESFALLBACK	1064	# ifdef RESFALLBACK
915	name_prefix[0] = XrmStringToName (RESFALLBACK);	1065	name_prefix[0] = XrmStringToName (RESFALLBACK);
916	name_prefix[1] = XrmStringToName ("keysym");	1066	name_prefix[1] = XrmStringToName ("keysym");
917	class_prefix[0] = XrmStringToName (RESFALLBACK);	1067	class_prefix[0] = XrmStringToName (RESFALLBACK);
918	class_prefix[1] = XrmStringToName ("Keysym");	1068	class_prefix[1] = XrmStringToName ("Keysym");
919	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1069	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
920	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1070	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
921	XrmEnumOneLevel, rxvt_define_key, NULL);	1071	XrmEnumOneLevel, rxvt_define_key, NULL);
922	# endif
923	# endif	1072	# endif
924	# endif	1073	# endif
925		1074
926	# else /* USE_XGETDEFAULT */	1075	# else /* USE_XGETDEFAULT */
927	/* get resources the hard way, but save lots of memory */	1076	/* get resources the hard way, but save lots of memory */
		1077	FILE *fd = NULL;
		1078
		1079	if (homedir)
		1080	{
		1081	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
		1082
		1083	for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
		1084	{
		1085	snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
		1086
		1087	if ((fd = fopen (fname, "r")) != NULL)
		1088	break;
		1089	}
		1090	}
		1091	/*
		1092	* The normal order to match resources is the following:
		1093	* @ global resources (partial match, ~/.Xdefaults)
		1094	* @ application file resources (XAPPLOADDIR/Rxvt)
		1095	* @ class resources (~/.Xdefaults)
		1096	* @ private resources (~/.Xdefaults)
		1097	*
		1098	* However, for the hand-rolled resources, the matching algorithm
		1099	* checks if a resource string value has already been allocated
		1100	* and won't overwrite it with (in this case) a less specific
		1101	* resource value.
		1102	*
		1103	* This avoids multiple allocation. Also, when we've called this
		1104	* routine command-line string options have already been applied so we
		1105	* needn't to allocate for those resources.
		1106	*
		1107	* So, search in resources from most to least specific.
		1108	*
		1109	* Also, use a special sub-class so that we can use either or both of
		1110	* "XTerm" and "Rxvt" as class names.
		1111	*/
		1112
		1113	get_xdefaults (fd, rs[Rs_name]);
		1114	get_xdefaults (fd, RESCLASS);
		1115	# ifdef RESFALLBACK
		1116	get_xdefaults (fd, RESFALLBACK);
		1117	# endif
		1118
		1119	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
		1120	{
928	FILE *fd = NULL;	1121	FILE *ad = NULL;
929	char *home;
930		1122
931	if ((home = getenv ("HOME")) != NULL)	1123	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
		1124	if (!*localepath \|\| (ad = fopen (localepath, "r")) == NULL)
		1125	# endif
		1126	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
		1127	if (ad != NULL)
932	{	1128	{
933	unsigned int i, len = STRLEN (home) + 2;	1129	get_xdefaults (ad, RESCLASS);
934	char *f = NULL;	1130	get_xdefaults (ad, "");
935
936	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
937	{
938	f = (char )rxvt_realloc (f, (len + STRLEN (xnames[i])) sizeof (char));
939
940	sprintf (f, "%s/%s", home, xnames[i]);
941
942	if ((fd = fopen (f, "r")) != NULL)
943	break;
944	}
945	free (f);	1131	fclose (ad);
946	}	1132	}
947	/*
948	* The normal order to match resources is the following:
949	* @ global resources (partial match, ~/.Xdefaults)
950	* @ application file resources (XAPPLOADDIR/Rxvt)
951	* @ class resources (~/.Xdefaults)
952	* @ private resources (~/.Xdefaults)
953	*
954	* However, for the hand-rolled resources, the matching algorithm
955	* checks if a resource string value has already been allocated
956	* and won't overwrite it with (in this case) a less specific
957	* resource value.
958	*
959	* This avoids multiple allocation. Also, when we've called this
960	* routine command-line string options have already been applied so we
961	* needn't to allocate for those resources.
962	*
963	* So, search in resources from most to least specific.
964	*
965	* Also, use a special sub-class so that we can use either or both of
966	* "XTerm" and "Rxvt" as class names.
967	*/
968
969	get_xdefaults (fd, name);
970	get_xdefaults (fd, RESCLASS);
971	# ifdef RESFALLBACK
972	get_xdefaults (fd, RESFALLBACK);
973	# endif
974
975	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
976	{
977	FILE *ad = NULL;
978
979	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
980	if (localepath == NULL \|\| (ad = fopen (localepath, "r")) == NULL)
981	# endif
982	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
983	if (ad != NULL)
984	{
985	get_xdefaults (ad, RESCLASS);
986	get_xdefaults (ad, "");
987	fclose (ad);
988	}
989	}	1133	}
990	# endif /* XAPPLOADDIR */	1134	# endif /* XAPPLOADDIR */
991		1135
992	get_xdefaults (fd, ""); /* partial match */	1136	get_xdefaults (fd, ""); /* partial match */
993	if (fd != NULL)	1137	if (fd != NULL)
994	fclose (fd);	1138	fclose (fd);
995	# endif /* USE_XGETDEFAULT */	1139	# endif /* USE_XGETDEFAULT */
996
997	# if defined XAPPLOADDIR
998	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
999
1000	}
1001
1002	/* Free the path of the possibly available localized Rxvt file */
1003	free (localepath);
1004	# endif
1005	# endif
1006		1140
1007	#endif /* NO_RESOURCES */	1141	#endif /* NO_RESOURCES */
1008	}	1142	}
1009		1143
1010	/}}} /	1144	/}}} /

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.66 by root, Mon Jan 2 20:35:39 2006 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.66 by root, Mon Jan 2 20:35:39 2006 UTC