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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.12 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.59 by root, Thu Aug 11 02:05:07 2005 UTC

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

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.12 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.59 by root, Thu Aug 11 02:05:07 2005 UTC