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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.12 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.54 by root, Fri Feb 11 17:19:30 2005 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.12 by pcg, Sun Feb 22 08:09:38 2004 UTC vs. Revision 1.54 by root, Fri Feb 11 17:19:30 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.12 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.54 by root, Fri Feb 11 17:19:30 2005 UTC