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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.16 by pcg, Thu Mar 4 00:59:10 2004 UTC vs.
Revision 1.68 by root, Wed Jan 4 03:16:15 2006 UTC

…		…
1	/---------------------------------C----------------------------------	1	/---------------------------------C----------------------------------
2	* File: xdefaults.c	2	* File: xdefaults.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* $Id: xdefaults.C,v 1.16 2004/03/04 00:59:10 pcg Exp $
5	*	4	*
6	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
7	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	6	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
8	* - original version	7	* - original version
9	* Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>	8	* Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
		9	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
10	*	10	*
11	* This program is free software; you can redistribute it and/or modify	11	* This program is free software; you can redistribute it and/or modify
12	* it under the terms of the GNU General Public License as published by	12	* it under the terms of the GNU General Public License as published by
13	* the Free Software Foundation; either version 2 of the License, or	13	* the Free Software Foundation; either version 2 of the License, or
14	* (at your option) any later version.	14	* (at your option) any later version.
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	#if defined (HOTKEY_CTRL) \|\| defined (HOTKEY_META)	254	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),
246	RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"),
247	RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"),
248	#endif
249	STRG (Rs_modifier, "modifier", "mod", "modifier",
250	"meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),
251	INFO ("xrm", "string", "X resource"),
252	#ifdef CUTCHAR_RESOURCE	255	#ifdef CUTCHAR_RESOURCE
253	RSTRG (Rs_cutchars, "cutchars", "string"),	256	RSTRG (Rs_cutchars, "cutchars", "string"),
254	#endif /* CUTCHAR_RESOURCE */	257	#endif /* CUTCHAR_RESOURCE */
255	#ifdef ACS_ASCII
256	RSTRG (Rs_acs_chars, "acsChars", "string"),
257	#endif /* ACS_ASCII */
258	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", "perl-lib", "string", "colon-separated directories with extension scripts"),
		265	STRG (Rs_perl_eval, "perl-eval", "perl-eval", "string", "code to be evaluated after all extensions have been loaded"),
		266	STRG (Rs_perl_ext, "perl-ext", "pe", "string", "colon-separated 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
259	INFO ("e", "command arg ...", "command to execute")	273	INFO ("e", "command arg ...", "command to execute")
260	};	274	};
261		275
262	#undef INFO	276	#undef INFO
263	#undef STRG	277	#undef STRG
264	#undef RSTRG	278	#undef RSTRG
265	#undef SWCH	279	#undef SWCH
266	#undef BOOL	280	#undef BOOL
267	/}}} /	281	/}}} /
268		282
269	static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";	283	static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
270	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
271	#if defined(XPM_BACKGROUND)	323	#if defined(XPM_BACKGROUND)
272	"XPM,"	324	"XPM,"
273	#endif	325	#endif
274	#if defined(TRANSPARENT)	326	#if defined(TRANSPARENT)
275	"transparent,"	327	"transparent,"
276	#endif	328	#endif
		329	#if TINTING
		330	"tint,"
		331	#endif
277	#if defined(UTMP_SUPPORT)	332	#if defined(UTMP_SUPPORT)
278	"utmp,"	333	"utmp,"
279	#endif	334	#endif
280	#if defined(MENUBAR)	335	#if defined(MENUBAR)
281	"menubar,"	336	"menubar,"
282	#endif
283	#if !defined(NO_FRILLS)
284	"frills,"
285	#endif
286	#if !defined(NO_LINESPACE)
287	"linespace,"
288	#endif
289	#if defined(PREFER_24BIT)
290	"24bit,"
291	#endif	337	#endif
292	#if defined(USE_XIM)	338	#if defined(USE_XIM)
293	"XIM,"	339	"XIM,"
294	#endif	340	#endif
295	"scrollbars="	341	"scrollbars="
…		…
323	"no_backspace,"	369	"no_backspace,"
324	#endif	370	#endif
325	#if defined(NO_DELETE_KEY)	371	#if defined(NO_DELETE_KEY)
326	"no_delete,"	372	"no_delete,"
327	#endif	373	#endif
		374	#if EIGHT_BIT_CONTROLS
		375	"8bitctrls,"
		376	#endif
328	#if !defined(NO_STRINGS)	377	#if !defined(NO_STRINGS)
329	"strings,"	378	"strings,"
330	#endif	379	#endif
331	#if defined(TTY_256COLOR)	380	#if defined(ENABLE_FRILLS)
		381	"frills,"
		382	#endif
		383	#if defined(PREFER_24BIT)
332	"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,"
333	#endif	403	#endif
334	#if defined(NO_RESOURCES)	404	#if defined(NO_RESOURCES)
335	"NoResources"	405	"NoResources"
336	#else	406	#else
337	# if defined(USE_XGETDEFAULT)	407	# if defined(USE_XGETDEFAULT)
…		…
347	/{{{ usage: /	417	/{{{ usage: /
348	/----------------------------------------------------------------------/	418	/----------------------------------------------------------------------/
349	static void	419	static void
350	rxvt_usage (int type)	420	rxvt_usage (int type)
351	{	421	{
352	unsigned int i, col;	422	unsigned int i, col;
353		423
354	write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1);	424	rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
355	write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
356	write (STDERR_FILENO, RESNAME, sizeof (RESNAME) - 1);
357		425
358	switch (type)	426	switch (type)
359	{	427	{
360	case 0: /* brief listing */	428	case 0: /* brief listing */
361	fprintf (stderr, " [-help] [--help]\n");	429	rxvt_log (" [-help] [--help]\n");
		430
362	for (col = 1, i = 0; i < optList_size (); i++)	431	for (col = 1, i = 0; i < optList_size; i++)
363	if (optList[i].desc != NULL)	432	if (optList[i].desc != NULL)
364	{	433	{
365	int len = 0;	434	int len = 0;
366		435
367	if (!optList_isBool (i))	436	if (!optList_isBool (i))
…		…
371	len++; /* account for space */	440	len++; /* account for space */
372	}	441	}
373	#ifdef DEBUG_STRICT	442	#ifdef DEBUG_STRICT
374	assert (optList[i].opt != NULL);	443	assert (optList[i].opt != NULL);
375	#endif	444	#endif
376	len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);	445	len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
377	col += len;	446	col += len;
378	if (col > 79)	447	if (col > 79)
379	{ /* assume regular width */	448	{ /* assume regular width */
380	putc ('\n', stderr);	449	rxvt_log ("\n");
381	col = 1 + len;	450	col = 1 + len;
382	}	451	}
		452
383	fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""),	453	rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
384	optList[i].opt);
385	if (optList_strlen (i))	454	if (optList_strlen (i))
386	fprintf (stderr, " %s]", optList[i].arg);	455	rxvt_log (" %s]", optList[i].arg);
387	else	456	else
388	fprintf (stderr, "]");	457	rxvt_log ("]");
389	}	458	}
390	break;	459	break;
391		460
392	case 1: /* full command-line listing */	461	case 1: /* full command-line listing */
393	fprintf (stderr, " [options] [-e command args]\n\n"	462	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
394	"where options include:\n");	463
395	for (i = 0; i < optList_size (); i++)	464	for (i = 0; i < optList_size; i++)
396	if (optList[i].desc != NULL)	465	if (optList[i].desc != NULL)
397	{	466	{
398	#ifdef DEBUG_STRICT	467	#ifdef DEBUG_STRICT
399	assert (optList[i].opt != NULL);	468	assert (optList[i].opt != NULL);
400	#endif	469	#endif
401	fprintf (stderr, " %s%s %-*s%s%s\n",	470	rxvt_log (" %s%s %-*s%s%s\n",
402	(optList_isBool (i) ? "-/+" : "-"), optList[i].opt,	471	(optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
403	(INDENT - STRLEN (optList[i].opt)	472	(INDENT - strlen (optList[i].opt)
404	+ (optList_isBool (i) ? 0 : 2)),	473	+ (optList_isBool (i) ? 0 : 2)),
405	(optList[i].arg ? optList[i].arg : ""),	474	(optList[i].arg ? optList[i].arg : ""),
406	(optList_isBool (i) ? "turn on/off " : ""),	475	(optList_isBool (i) ? "turn on/off " : ""),
407	optList[i].desc);	476	optList[i].desc);
408	}	477	}
409	fprintf (stderr, "\n --help to list long-options");	478	rxvt_log ("\n --help to list long-options");
410	break;	479	break;
411		480
412	case 2: /* full resource listing */	481	case 2: /* full resource listing */
413	fprintf (stderr,
414	" [options] [-e command args]\n\n"	482	rxvt_log (" [options] [-e command args]\n\n"
415	"where resources (long-options) include:\n");	483	"where resources (long-options) include:\n");
416		484
417	for (i = 0; i < optList_size (); i++)	485	for (i = 0; i < optList_size; i++)
418	if (optList[i].kw != NULL)	486	if (optList[i].kw != NULL)
419	fprintf (stderr, " %s: %*s%s\n",	487	rxvt_log (" %s: %*s%s\n",
420	optList[i].kw,	488	optList[i].kw,
421	(INDENT - STRLEN (optList[i].kw)), "", /* XXX */	489	(INDENT - strlen (optList[i].kw)), "", /* XXX */
422	(optList_isBool (i) ? "boolean" : optList[i].arg));	490	(optList_isBool (i) ? "boolean" : optList[i].arg));
423	#ifdef KEYSYM_RESOURCE	491	#ifdef KEYSYM_RESOURCE
424	fprintf (stderr, " " "keysym.sym" ": %*s%s\n",	492	rxvt_log (" " "keysym.sym" ": %*s%s\n",
425	(INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */	493	(INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
426	"keysym");	494	"keysym");
427	#endif	495	#endif
428	fprintf (stderr, "\n -help to list options");	496	rxvt_log ("\n -help to list options");
429	break;	497	break;
430	}	498	}
431	fprintf (stderr, "\n\n");	499
432	exit (EXIT_FAILURE);	500	rxvt_log ("\n\n");
		501	rxvt_exit_failure ();
433	/* NOTREACHED */	502	/* NOTREACHED */
434	}	503	}
435		504
436	/}}} /	505	/}}} /
437		506
…		…
442	int i, bad_option = 0;	511	int i, bad_option = 0;
443	static const char On[3] = "ON", Off[4] = "OFF";	512	static const char On[3] = "ON", Off[4] = "OFF";
444		513
445	for (i = 1; i < argc; i++)	514	for (i = 1; i < argc; i++)
446	{	515	{
447	unsigned int entry, longopt = 0;	516	unsigned int entry, longopt = 0;
448	const char flag, opt;	517	const char flag, opt;
449		518
450	opt = argv[i];	519	opt = argv[i];
451	#ifdef DEBUG_RESOURCES	520	#ifdef DEBUG_RESOURCES
452	fprintf (stderr, "argv[%d] = %s: ", i, opt);	521	fprintf (stderr, "argv[%d] = %s: ", i, opt);
453	#endif	522	#endif
…		…
464	longopt = opt++; / long option */	533	longopt = opt++; / long option */
465	}	534	}
466	else	535	else
467	{	536	{
468	bad_option = 1;	537	bad_option = 1;
469	rxvt_print_error ("bad option \"%s\"", opt);	538	rxvt_warn ("\"%s\": malformed option.\n", opt);
470	continue;	539	continue;
471	}	540	}
472		541
473	if (!STRCMP (opt, "help"))	542	if (!strcmp (opt, "help"))
474	rxvt_usage (longopt ? 2 : 1);	543	rxvt_usage (longopt ? 2 : 1);
475	if (!STRCMP (opt, "h"))	544	if (!strcmp (opt, "h"))
476	rxvt_usage (0);	545	rxvt_usage (0);
477		546
478	/* feature: always try to match long-options */	547	/* feature: always try to match long-options */
479	for (entry = 0; entry < optList_size (); entry++)	548	for (entry = 0; entry < optList_size; entry++)
480	if ((optList[entry].kw && !STRCMP (opt, optList[entry].kw))	549	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
481	\|\| (!longopt	550	\|\| (!longopt
482	&& optList[entry].opt && !STRCMP (opt, optList[entry].opt)))	551	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))
483	break;	552	break;
484		553
485	if (entry < optList_size ())	554	if (entry < optList_size)
486	{	555	{
487	if (optList_isReverse (entry))	556	if (optList_isReverse (entry))
488	flag = flag == On ? Off : On;	557	flag = flag == On ? Off : On;
		558
489	if (optList_strlen (entry))	559	if (optList_strlen (entry))
490	{ /* string value */
491	const char *str = argv[++i];
492
493	#ifdef DEBUG_RESOURCES
494	fprintf (stderr, "string (%s,%s) = ",
495	optList[entry].opt ? optList[entry].opt : "nil",
496	optList[entry].kw ? optList[entry].kw : "nil");
497	#endif
498	if (flag == On && str && (optList[entry].doff != -1))
499	{	560	{
500	#ifdef DEBUG_RESOURCES
501	fprintf (stderr, "\"%s\"\n", str);
502	#endif
503	rs[optList[entry].doff] = str;
504	/*	561	/*
505	* special cases are handled in main.c:main () to allow	562	* special cases are handled in main.c:main () to allow
506	* X resources to set these values before we settle for	563	* X resources to set these values before we settle for
507	* default values	564	* default values
508	*/	565	*/
509	}
510	#ifdef DEBUG_RESOURCES
511	else
512	fprintf (stderr, "???\n");
513	#endif
514		566
		567	if (optList[entry].doff != -1)
		568	rs[optList[entry].doff] = flag == On && argv[i+1]
		569	? argv[++i] : 0;
515	}	570	}
516	else	571	else
517	{ /* boolean value */	572	{ /* boolean value */
518	#ifdef DEBUG_RESOURCES	573	#ifdef DEBUG_RESOURCES
519	fprintf (stderr, "boolean (%s,%s) = %s\n",	574	fprintf (stderr, "boolean (%s,%s) = %s\n",
520	optList[entry].opt, optList[entry].kw, flag);	575	optList[entry].opt, optList[entry].kw, flag);
521	#endif	576	#endif
522	if (flag == On)	577	if (flag == On)
523	Options \|= (optList[entry].flag);	578	SET_OPTION (optList[entry].flag & Optflag_mask);
524	else	579	else
525	Options &= ~ (optList[entry].flag);	580	CLR_OPTION (optList[entry].flag & Optflag_mask);
526		581
527	if (optList[entry].doff != -1)	582	if (optList[entry].doff != -1)
528	rs[optList[entry].doff] = flag;	583	rs[optList[entry].doff] = flag;
529	}	584	}
530	}	585	}
531	else	586	else
532	#ifdef KEYSYM_RESOURCE	587	#ifdef KEYSYM_RESOURCE
533	/* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */	588	/* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
534	if (rxvt_Str_match (opt, "keysym."))	589	if (rxvt_Str_match (opt, "keysym."))
535	{	590	{
536	const char *str = argv[++i];	591	const char *str = argv[++i];
537		592
538	if (str != NULL)	593	if (str != NULL)
539	parse_keysym (opt + sizeof ("keysym.") - 1, str);	594	parse_keysym (opt + sizeof ("keysym.") - 1, str);
540	}	595	}
541	else	596	else
542	#endif	597	#endif
		598	{
543	bad_option = 1;	599	bad_option = 1;
		600	rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
		601	}
544	}	602	}
545		603
546	if (bad_option)	604	if (bad_option)
547	rxvt_usage (0);	605	rxvt_usage (0);
548	}	606	}
…		…
566	XrmQuarkList quarks,	624	XrmQuarkList quarks,
567	XrmRepresentation *type __attribute__((unused)),	625	XrmRepresentation *type __attribute__((unused)),
568	XrmValue *value,	626	XrmValue *value,
569	XPointer closure __attribute__((unused)))	627	XPointer closure __attribute__((unused)))
570	{	628	{
571	int last;	629	int last;
572		630
573	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 */
574	;	632	;
		633
575	last--;	634	last--;
576	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
577	return False;	636	return False;
578	}	637	}
579		638
…		…
584	* arg will be	643	* arg will be
585	* NULL for ~/.Xdefaults and	644	* NULL for ~/.Xdefaults and
586	* non-NULL for command-line options (need to allocate)	645	* non-NULL for command-line options (need to allocate)
587	*/	646	*/
588	#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
589	int	684	int
590	rxvt_term::parse_keysym (const char str, const char arg)	685	rxvt_term::parse_keysym (const char str, const char arg)
591	{	686	{
592	int n, sym;	687	int n, sym;
593	char key_string, newarg = NULL;	688	unsigned int state = 0;
		689	const char *pmodend = NULL;
		690	char *newarg = NULL;
594	char newargstr[NEWARGLIM];	691	char newargstr[NEWARGLIM];
595		692
596	if (arg == NULL)	693	if (arg == NULL)
597	{	694	{
598	if ((n = rxvt_Str_match (str, "keysym.")) == 0)	695	if ((n = rxvt_Str_match (str, "keysym.")) == 0)
599	return 0;	696	return 0;
		697
600	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)
601	}	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
602	/* some scanf () have trouble with a 0x prefix */	730	/* some scanf () have trouble with a 0x prefix */
603	if (isdigit (str[0]))
604	{
605	if (str[0] == '0' && toupper (str[1]) == 'X')	731	if (str[0] == '0' && toupper (str[1]) == 'X')
		732	{
606	str += 2;	733	str += 2;
		734
607	if (arg)	735	if (arg)
608	{	736	{
609	if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1)	737	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
610	return -1;	738	return -1;
611	}	739	}
612	else	740	else
613	{	741	{
614	if (sscanf (str, "%x:", &sym) != 1)	742	if (sscanf (str, "%x:", &sym) != 1)
615	return -1;	743	return -1;
616		744
617	/* cue to ':', it's there since sscanf () worked */	745	/* cue to ':', it's there since sscanf () worked */
618	STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1);	746	strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
619	newargstr[NEWARGLIM - 1] = '\0';	747	newargstr[NEWARGLIM - 1] = '\0';
620	newarg = newargstr;	748	newarg = newargstr;
621	}	749	}
622	}	750	}
623	else	751	else
624	{	752	{
625	/*	753	/*
626	* convert keysym name to keysym number	754	* convert keysym name to keysym number
627	*/	755	*/
628	STRNCPY (newargstr, str, NEWARGLIM - 1);	756	strncpy (newargstr, str, NEWARGLIM - 1);
629	newargstr[NEWARGLIM - 1] = '\0';	757	newargstr[NEWARGLIM - 1] = '\0';
		758
630	if (arg == NULL)	759	if (arg == NULL)
631	{	760	{
632	if ((newarg = STRCHR (newargstr, ':')) == NULL)	761	if ((newarg = strchr (newargstr, ':')) == NULL)
633	return -1;	762	return -1;
		763
634	newarg++ = '\0'; / terminate keysym name */	764	newarg++ = '\0'; / terminate keysym name */
635	}	765	}
		766
636	if ((sym = XStringToKeysym (newargstr)) == None)	767	if ((sym = XStringToKeysym (newargstr)) == None)
637	return -1;	768	return -1;
638	}	769	}
639		770
640	if (sym < 0xFF00 \|\| sym > 0xFFFF) /* we only do extended keys */
641	return -1;
642	sym &= 0xFF;
643	if (Keysym_map[sym] != NULL) /* already set ? */
644	return -1;
645
646	if (newarg == NULL)	771	if (newarg == NULL)
647	{	772	{
648	STRNCPY (newargstr, arg, NEWARGLIM - 1);	773	strncpy (newargstr, arg, NEWARGLIM - 1);
649	newargstr[NEWARGLIM - 1] = '\0';	774	newargstr[NEWARGLIM - 1] = '\0';
650	newarg = newargstr;	775	newarg = newargstr;
651	}	776	}
		777
652	rxvt_Str_trim (newarg);	778	rxvt_Str_trim (newarg);
653	if (*newarg == '\0' \|\| (n = rxvt_Str_escaped (newarg)) == 0)	779	if (*newarg == '\0' \|\| (n = rxvt_Str_escaped (newarg)) == 0)
654	return -1;	780	return -1;
655	MIN_IT (n, 255);
656	key_string = (char )rxvt_malloc ((n + 1) sizeof (char));
657		781
658	key_string[0] = n;	782	keyboard->register_user_translation (sym, state, newarg);
659	STRNCPY (key_string + 1, newarg, n);
660	Keysym_map[sym] = (unsigned char *)key_string;
661
662	return 1;	783	return 1;
663	}	784	}
664		785
665	# endif /* KEYSYM_RESOURCE */	786	# endif /* KEYSYM_RESOURCE */
666		787
…		…
675	unsigned int len;	796	unsigned int len;
676	char *str, buffer[256];	797	char *str, buffer[256];
677		798
678	if (stream == NULL)	799	if (stream == NULL)
679	return;	800	return;
680	len = STRLEN (name);	801
		802	len = strlen (name);
681	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)	803	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
682	{	804	{
683	unsigned int entry, n;	805	unsigned int entry, n;
684		806
685	while (str && isspace (str))	807	while (str && isspace (str))
686	str++; /* leading whitespace */	808	str++; /* leading whitespace */
687		809
688	if ((str[len] != '*' && str[len] != '.')	810	if ((str[len] != '*' && str[len] != '.')
689	\|\| (len && STRNCMP (str, name, len)))	811	\|\| (len && strncmp (str, name, len)))
690	continue;	812	continue;
691	str += (len + 1); /* skip `name' or `name.' /	813	str += (len + 1); /* skip `name' or `name.' /
692		814
693	# ifdef KEYSYM_RESOURCE	815	# ifdef KEYSYM_RESOURCE
694	if (!parse_keysym (str, NULL))	816	if (!parse_keysym (str, NULL))
695	# endif /* KEYSYM_RESOURCE */	817	# endif /* KEYSYM_RESOURCE */
696	for (entry = 0; entry < optList_size (); entry++)	818	for (entry = 0; entry < optList_size; entry++)
697	{	819	{
698	const char *kw = optList[entry].kw;	820	const char *kw = optList[entry].kw;
699		821
700	if (kw == NULL)	822	if (kw == NULL)
701	continue;	823	continue;
		824
702	n = STRLEN (kw);	825	n = strlen (kw);
703	if (str[n] == ':' && rxvt_Str_match (str, kw))	826	if (str[n] == ':' && rxvt_Str_match (str, kw))
704	{	827	{
705	/* skip `keyword:' */	828	/* skip `keyword:' */
706	str += n + 1;	829	str += n + 1;
707	rxvt_Str_trim (str);	830	rxvt_Str_trim (str);
708	n = STRLEN (str);	831	n = strlen (str);
		832
709	if (n && rs[optList[entry].doff] == NULL)	833	if (n && rs[optList[entry].doff] == NULL)
710	{	834	{
711	/* not already set */	835	/* not already set */
712	int s;	836	int s;
713	char *p = 0;	837	char *p = 0;
714		838
715	for (int o = 0;;)	839	for (int o = 0;;)
716	{	840	{
717	p = (char *)rxvt_realloc (p, o + n + 1);	841	p = (char *)rxvt_realloc (p, o + n + 1);
718	MEMCPY (p + o, str, n);	842	memcpy (p + o, str, n);
719	o += n;	843	o += n;
720	p[o] = 0;	844	p[o] = 0;
721		845
722	if (o == 0 \|\| p[o - 1] != '\\') // continuation line	846	if (o == 0 \|\| p[o - 1] != '\\') // continuation line
723	break;	847	break;
…		…
726		850
727	if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)	851	if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
728	break;	852	break;
729		853
730	rxvt_Str_trim (str);	854	rxvt_Str_trim (str);
731	n = STRLEN (str);	855	n = strlen (str);
732	}	856	}
733		857
734	rs[optList[entry].doff] = p;	858	rs[optList[entry].doff] = p;
		859	allocated.push_back (p);
		860
735	if (optList_isBool (entry))	861	if (optList_isBool (entry))
736	{	862	{
737	s = STRCASECMP (str, "TRUE") == 0	863	s = strcasecmp (str, "true") == 0
738	\|\| STRCASECMP (str, "YES") == 0	864	\|\| strcasecmp (str, "yes") == 0
739	\|\| STRCASECMP (str, "ON") == 0	865	\|\| strcasecmp (str, "on") == 0
740	\|\| STRCASECMP (str, "1") == 0;	866	\|\| strcmp (str, "1") == 0;
		867
741	if (optList_isReverse (entry))	868	if (optList_isReverse (entry))
742	s = !s;	869	s = !s;
		870
743	if (s)	871	if (s)
744	Options \|= (optList[entry].flag);	872	SET_OPTION (optList[entry].flag & Optflag_mask);
745	else	873	else
746	Options &= ~ (optList[entry].flag);	874	CLR_OPTION (optList[entry].flag & Optflag_mask);
747	}	875	}
748	}	876	}
		877
749	break;	878	break;
750	}	879	}
751	}	880	}
752	}	881	}
		882
753	rewind (stream);	883	rewind (stream);
754	}	884	}
755		885
756	/}}} /	886	/}}} /
757	# endif /* ! USE_XGETDEFAULT */	887	# endif /* ! USE_XGETDEFAULT */
…		…
761	/*	891	/*
762	* using XGetDefault () or the hand-rolled replacement	892	* using XGetDefault () or the hand-rolled replacement
763	*/	893	*/
764	/* ARGSUSED */	894	/* ARGSUSED */
765	void	895	void
766	rxvt_term::extract_resources (Display display __attribute__ ((unused)), const char name)	896	rxvt_term::extract_resources ()
767	{	897	{
		898	dDisp;
		899
768	#ifndef NO_RESOURCES	900	#ifndef NO_RESOURCES
		901
		902	char homedir = (char )getenv ("HOME");
		903	char fname[1024];
769		904
770	# if defined XAPPLOADDIR	905	# if defined XAPPLOADDIR
771	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	906	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
772	/* Compute the path of the possibly available localized Rxvt file */	907	/* Compute the path of the possibly available localized Rxvt file */
773	char *localepath = NULL;	908	char localepath[1024];
774		909
775	if (locale != NULL)	910	if (locale)
776	{ /* XXX: must limit length of string */
777	localepath = (char *)rxvt_malloc (256);
778	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,	911	snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
779	(int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),	912	else
780	locale); /* 258 = 255 + 4 (-.s) - 1 (/) /	913	localepath[0] = 0;
781	}
782
783	{
784	# endif	914	# endif
785	# endif	915	# endif
786		916
787	# ifdef USE_XGETDEFAULT	917	# ifdef USE_XGETDEFAULT
788	/*	918	/*
789	* get resources using the X library function	919	* get resources using the X library function
790	*/	920	*/
791	int entry;	921	int entry;
792		922
793	# ifdef XrmEnumOneLevel	923	# ifdef XrmEnumOneLevel
794	int i;
795	char displayResource, xe;	924	char displayResource, xe;
796	XrmName name_prefix[3];	925	XrmName name_prefix[3];
797	XrmClass class_prefix[3];	926	XrmClass class_prefix[3];
798	XrmDatabase database, rdb1;	927	XrmDatabase database, rdb1;
799	char fname[1024];
800		928
801	XrmInitialize ();	929	XrmInitialize ();
802	database = NULL;	930	database = NULL;
803		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.
804	/* Get any Xserver defaults */	956	/* Get any Xserver defaults */
805
806	displayResource = XResourceManagerString (display);	957	displayResource = XResourceManagerString (disp);
807	if (displayResource != NULL)	958	if (displayResource != NULL)
		959	{
808	database = XrmGetStringDatabase (displayResource);	960	if ((rdb1 = XrmGetStringDatabase (displayResource)))
809		961	XrmMergeDatabases (rdb1, &database);
810	# ifdef HAVE_EXTRA_XRESOURCE_FILES
811	/* Add in ~/.Xdefaults or ~/.Xresources */
812	{	962	}
813	char *ptr;	963	else if (homedir)
		964	{
		965	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
814		966
815	if ((ptr = (char *)getenv ("HOME")) == NULL)	967	if ((rdb1 = XrmGetFileDatabase (fname)))
816	ptr = ".";	968	XrmMergeDatabases (rdb1, &database);
		969	}
817		970
818	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))
819	{	992	{
820	sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,	993	snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
821	ptr, xnames[i]);	994
822	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))
823	{	1034	{
824	XrmMergeDatabases (rdb1, &database);	1035	s = strcasecmp (p, "TRUE") == 0
825	# 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);
826	break;	1045	else
827	# endif	1046	CLR_OPTION (optList[entry].flag & Optflag_mask);
828
829	}	1047	}
830	}	1048	}
831	}	1049	}
832	# endif
833		1050
834	/* Add in XENVIRONMENT file */
835
836	if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
837	&& (rdb1 = XrmGetFileDatabase (xe)) != NULL)
838	XrmMergeDatabases (rdb1, &database);
839
840	/* Add in Rxvt file */
841	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
842	if (localepath == NULL \|\| (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
843	# endif
844	rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
845
846	if (rdb1 != NULL)
847	XrmMergeDatabases (rdb1, &database);
848
849	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
850	if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
851	{
852	sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
853	- sizeof (RESCLASS) - 2, xe);
854	if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
855	XrmMergeDatabases (rdb1, &database);
856	}
857
858	XrmSetDatabase (display, database);
859	# endif
860
861	/*	1051	/*
862	* Query resources for options that affect us
863	*/
864	for (entry = 0; entry < optList_size (); entry++)
865	{
866	int s;
867	char p, p0;
868	const char *kw = optList[entry].kw;
869
870	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
871	continue; /* previously set */
872
873	p = XGetDefault (display, name, kw);
874	p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
875	if (p == NULL \|\| (p0 && STRCMP (p, p0) == 0))
876	{
877	p = XGetDefault (display, RESCLASS, kw);
878	#ifdef RESFALLBACK
879	if (p == NULL \|\| (p0 && STRCMP (p, p0) == 0))
880	p = XGetDefault (display, RESFALLBACK, kw);
881	#endif
882	}
883
884	if (p == NULL && p0)
885	p = p0;
886
887	if (p)
888	{
889	rs[optList[entry].doff] = p;
890
891	if (optList_isBool (entry))
892	{
893	s = STRCASECMP (p, "TRUE") == 0
894	\|\| STRCASECMP (p, "YES") == 0
895	\|\| STRCASECMP (p, "ON") == 0
896	\|\| STRCASECMP (p, "1") == 0;
897	if (optList_isReverse (entry))
898	s = !s;
899	if (s)
900	Options \|= (optList[entry].flag);
901	else
902	Options &= ~ (optList[entry].flag);
903	}
904	}
905	}
906
907	/*
908	* [R5 or later]: enumerate the resource database	1052	* [R5 or later]: enumerate the resource database
909	*/	1053	*/
910	# ifdef XrmEnumOneLevel
911	# ifdef KEYSYM_RESOURCE	1054	# ifdef KEYSYM_RESOURCE
912	name_prefix[0] = XrmStringToName (name);	1055	name_prefix[0] = XrmStringToName (rs[Rs_name]);
913	name_prefix[1] = XrmStringToName ("keysym");	1056	name_prefix[1] = XrmStringToName ("keysym");
914	name_prefix[2] = NULLQUARK;	1057	name_prefix[2] = NULLQUARK;
915	class_prefix[0] = XrmStringToName (RESCLASS);	1058	class_prefix[0] = XrmStringToName (RESCLASS);
916	class_prefix[1] = XrmStringToName ("Keysym");	1059	class_prefix[1] = XrmStringToName ("Keysym");
917	class_prefix[2] = NULLQUARK;	1060	class_prefix[2] = NULLQUARK;
918	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1061	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
919	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1062	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
920	XrmEnumOneLevel, rxvt_define_key, NULL);	1063	XrmEnumOneLevel, rxvt_define_key, NULL);
921	# ifdef RESFALLBACK	1064	# ifdef RESFALLBACK
922	name_prefix[0] = XrmStringToName (RESFALLBACK);	1065	name_prefix[0] = XrmStringToName (RESFALLBACK);
923	name_prefix[1] = XrmStringToName ("keysym");	1066	name_prefix[1] = XrmStringToName ("keysym");
924	class_prefix[0] = XrmStringToName (RESFALLBACK);	1067	class_prefix[0] = XrmStringToName (RESFALLBACK);
925	class_prefix[1] = XrmStringToName ("Keysym");	1068	class_prefix[1] = XrmStringToName ("Keysym");
926	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1069	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
927	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1070	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
928	XrmEnumOneLevel, rxvt_define_key, NULL);	1071	XrmEnumOneLevel, rxvt_define_key, NULL);
929	# endif
930	# endif	1072	# endif
931	# endif	1073	# endif
932		1074
933	# else /* USE_XGETDEFAULT */	1075	# else /* USE_XGETDEFAULT */
934	/* 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	{
935	FILE *fd = NULL;	1121	FILE *ad = NULL;
936	char *home;
937		1122
938	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)
939	{	1128	{
940	unsigned int i, len = STRLEN (home) + 2;	1129	get_xdefaults (ad, RESCLASS);
941	char *f = NULL;	1130	get_xdefaults (ad, "");
942
943	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
944	{
945	f = (char )rxvt_realloc (f, (len + STRLEN (xnames[i])) sizeof (char));
946
947	sprintf (f, "%s/%s", home, xnames[i]);
948
949	if ((fd = fopen (f, "r")) != NULL)
950	break;
951	}
952	free (f);	1131	fclose (ad);
953	}	1132	}
954	/*
955	* The normal order to match resources is the following:
956	* @ global resources (partial match, ~/.Xdefaults)
957	* @ application file resources (XAPPLOADDIR/Rxvt)
958	* @ class resources (~/.Xdefaults)
959	* @ private resources (~/.Xdefaults)
960	*
961	* However, for the hand-rolled resources, the matching algorithm
962	* checks if a resource string value has already been allocated
963	* and won't overwrite it with (in this case) a less specific
964	* resource value.
965	*
966	* This avoids multiple allocation. Also, when we've called this
967	* routine command-line string options have already been applied so we
968	* needn't to allocate for those resources.
969	*
970	* So, search in resources from most to least specific.
971	*
972	* Also, use a special sub-class so that we can use either or both of
973	* "XTerm" and "Rxvt" as class names.
974	*/
975
976	get_xdefaults (fd, name);
977	get_xdefaults (fd, RESCLASS);
978	# ifdef RESFALLBACK
979	get_xdefaults (fd, RESFALLBACK);
980	# endif
981
982	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
983
984	{
985	FILE *ad = NULL;
986
987	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
988	if (localepath == NULL \|\| (ad = fopen (localepath, "r")) == NULL)
989	# endif
990	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
991	if (ad != NULL)
992	{
993	get_xdefaults (ad, RESCLASS);
994	get_xdefaults (ad, "");
995	fclose (ad);
996	}
997	}	1133	}
998	# endif /* XAPPLOADDIR */	1134	# endif /* XAPPLOADDIR */
999		1135
1000	get_xdefaults (fd, ""); /* partial match */	1136	get_xdefaults (fd, ""); /* partial match */
1001	if (fd != NULL)	1137	if (fd != NULL)
1002	fclose (fd);	1138	fclose (fd);
1003	# endif /* USE_XGETDEFAULT */	1139	# endif /* USE_XGETDEFAULT */
1004		1140
1005	# if defined XAPPLOADDIR
1006	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1007
1008	}
1009
1010	/* Free the path of the possibly available localized Rxvt file */
1011	free (localepath);
1012	# endif
1013	# endif
1014
1015	#endif /* NO_RESOURCES */	1141	#endif /* NO_RESOURCES */
1016
1017	/*
1018	* even without resources, at least do this setup for command-line
1019	* options and command-line long options
1020	*/
1021
1022	#if defined (HOTKEY_CTRL) \|\| defined (HOTKEY_META)
1023	KeySym sym;
1024
1025	if (rs[Rs_bigfont_key]
1026	&& ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
1027	ks_bigfont = sym;
1028	if (rs[Rs_smallfont_key]
1029	&& ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
1030	ks_smallfont = sym;
1031	#endif
1032	}	1142	}
1033		1143
1034	/}}} /	1144	/}}} /
1035	/----------------------- end-of-file (C source) -----------------------/	1145	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.16 by pcg, Thu Mar 4 00:59:10 2004 UTC vs. Revision 1.68 by root, Wed Jan 4 03:16:15 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.16 by pcg, Thu Mar 4 00:59:10 2004 UTC vs.
Revision 1.68 by root, Wed Jan 4 03:16:15 2006 UTC