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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.11 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.55 by root, Mon Feb 14 18:47:54 2005 UTC

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

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.11 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.55 by root, Mon Feb 14 18:47:54 2005 UTC