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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.113 by ayin, Sat Sep 8 20:54:51 2007 UTC vs.
Revision 1.159 by sf-exg, Fri Dec 2 09:03:43 2011 UTC

…		…
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	6	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7	* - original version	7	* - original version
8	* 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-2006 Marc Lehmann <pcg@goof.com>	9	* Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
		10	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10	*	11	*
11	* This program is free software; you can redistribute it and/or modify	12	* 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	13	* 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	14	* the Free Software Foundation; either version 2 of the License, or
14	* (at your option) any later version.	15	* (at your option) any later version.
…		…
62	/* SWCH () - `-' flag */	63	/* SWCH () - `-' flag */
63	#define SWCH(opt, option, flag, desc) \	64	#define SWCH(opt, option, flag, desc) \
64	{ (option), (Optflag_Switch \| (flag)), -1, NULL, (opt), NULL, (desc)}	65	{ (option), (Optflag_Switch \| (flag)), -1, NULL, (opt), NULL, (desc)}
65		66
66	/* convenient macros */	67	/* convenient macros */
67	#define optList_strlen(i) \	68	#define optList_isString(i) \
68	(optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))	69	(optList[i].flag == 0)
69	#define optList_isBool(i) \	70	#define optList_isBool(i) \
70	(optList[i].flag & Optflag_Boolean)	71	(optList[i].flag & Optflag_Boolean)
71	#define optList_isReverse(i) \	72	#define optList_isReverse(i) \
72	(optList[i].flag & Optflag_Reverse)	73	(optList[i].flag & Optflag_Reverse)
73	#define optList_size \
74	(sizeof (optList) / sizeof (optList[0]))
75		74
76	static const struct	75	static const struct
77	{	76	{
78	const uint8_t index; /* Option index */	77	const uint8_t index; /* Option index */
79	const uint8_t flag; /* Option flag */	78	const uint8_t flag; /* Option flag */
…		…
90	STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */	89	STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91	STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),	90	STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
92	SWCH ("C", Opt_console, 0, "intercept console messages"),	91	SWCH ("C", Opt_console, 0, "intercept console messages"),
93	SWCH ("iconic", Opt_iconic, 0, "start iconic"),	92	SWCH ("iconic", Opt_iconic, 0, "start iconic"),
94	SWCH ("ic", Opt_iconic, 0, NULL), /* short form */	93	SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
		94	STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
95	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),	95	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
96	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),	96	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
97	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),	97	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98	BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),	98	BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
99	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),	99	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
100	#if HAVE_SCROLLBARS
101	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),	100	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),	101	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103	BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),	102	BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
104	BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),	103	BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
105	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),	104	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),	105	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
107	#endif
108	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),	106	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109	BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),	107	BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
110	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),	108	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),	109	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112	#if ENABLE_TRANSPARENCY	110	#if ENABLE_TRANSPARENCY
113	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),	111	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114	SWCH ("tr", Opt_transparent, 0, NULL),	112	BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115	STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),	113	STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116	STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),	114	STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
		115	STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
117	#endif	116	#endif
118	#if OFF_FOCUS_FADING	117	#if OFF_FOCUS_FADING
119	STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),	118	STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120	STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),	119	STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121	#endif	120	#endif
122	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),	121	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123	#ifndef NO_BELL	122	#ifndef NO_BELL
124	# if ENABLE_FRILLS	123	# if ENABLE_FRILLS
…		…
167	#ifndef NO_BOLD_UNDERLINE_REVERSE	166	#ifndef NO_BOLD_UNDERLINE_REVERSE
168	RSTRG (Rs_color + Color_BD, "colorBD", "color"),	167	RSTRG (Rs_color + Color_BD, "colorBD", "color"),
169	RSTRG (Rs_color + Color_IT, "colorIT", "color"),	168	RSTRG (Rs_color + Color_IT, "colorIT", "color"),
170	RSTRG (Rs_color + Color_UL, "colorUL", "color"),	169	RSTRG (Rs_color + Color_UL, "colorUL", "color"),
171	RSTRG (Rs_color + Color_RV, "colorRV", "color"),	170	RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */	171	#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173	#if ENABLE_FRILLS	172	#if ENABLE_FRILLS
174	RSTRG (Rs_color + Color_underline, "underlineColor", "color"),	173	RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175	#endif	174	#endif
176	#ifdef KEEP_SCROLLCOLOR
177	RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),	175	RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
		176	#ifdef RXVT_SCROLLBAR
178	RSTRG (Rs_color + Color_trough, "troughColor", "color"),	177	RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179	#endif /* KEEP_SCROLLCOLOR */	178	#endif
180	#ifdef OPTION_HC	179	#ifdef OPTION_HC
181	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),	180	STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
		181	RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182	#endif	182	#endif
183	#ifndef NO_CURSORCOLOR	183	#ifndef NO_CURSORCOLOR
184	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),	184	STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185	/* command-line option = resource name */	185	/* command-line option = resource name */
186	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),	186	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187	#endif /* NO_CURSORCOLOR */	187	#endif /* NO_CURSORCOLOR */
188	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),	188	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),	189	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),	190	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191	#ifdef XPM_BACKGROUND	191	#ifdef BG_IMAGE_FROM_FILE
192	RSTRG (Rs_path, "path", "search path"),	192	RSTRG (Rs_path, "path", "search path"),
193	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),	193	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
		194	# if ENABLE_EWMH
		195	STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
		196	# endif
194	#endif	197	#endif
195	/* fonts: command-line option = resource name */	198	/* fonts: command-line option = resource name */
196	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),	199	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197	#if ENABLE_STYLES	200	#if ENABLE_STYLES
198	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),	201	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
…		…
203	#ifdef USE_XIM	206	#ifdef USE_XIM
204	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),	207	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
205	STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot\|OffTheSpot\|Root"),	208	STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot\|OffTheSpot\|Root"),
206	STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),	209	STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
207	STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),	210	STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
208	#endif /* USE_XIM */	211	#endif /* USE_XIM */
209	STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),	212	STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
210	STRG (Rs_title, "title", "title", "string", "title name for window"),	213	STRG (Rs_title, "title", "title", "string", "title name for window"),
211	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */	214	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
212	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),	215	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
213	STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),	216	STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
214	#if ENABLE_XEMBED	217	#if ENABLE_XEMBED
215	STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),	218	STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216	#endif	219	#endif
217	#if XFT	220	#if XFT
218	STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),	221	STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
		222	BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
219	#endif	223	#endif
220	#if ENABLE_FRILLS	224	#if ENABLE_FRILLS
221	RSTRG (Rs_transient_for, "transient-for", "windowid"),	225	RSTRG (Rs_transient_for, "transient-for", "windowid"),
222	BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),	226	BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
223	STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),	227	STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
…		…
225	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	229	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	230	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	231	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),	232	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),	233	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
		234	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
		235	STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
		236	#endif
		237	#ifdef BUILTIN_GLYPHS
230	BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),	238	BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232	#endif	239	#endif
233	#ifdef POINTER_BLANK	240	#ifdef POINTER_BLANK
234	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),	241	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235	#endif	242	#endif
236	#ifndef NO_BACKSPACE_KEY	243	#ifndef NO_BACKSPACE_KEY
237	RSTRG (Rs_backspace_key, "backspacekey", "string"),	244	RSTRG (Rs_backspace_key, "backspacekey", "string"),
238	#endif	245	#endif
239	#ifndef NO_DELETE_KEY	246	#ifndef NO_DELETE_KEY
240	RSTRG (Rs_delete_key, "deletekey", "string"),	247	RSTRG (Rs_delete_key, "deletekey", "string"),
241	#endif	248	#endif
242	RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243	#ifdef PRINTPIPE	249	#ifdef PRINTPIPE
244	RSTRG (Rs_print_pipe, "print-pipe", "string"),	250	RSTRG (Rs_print_pipe, "print-pipe", "string"),
245	#endif	251	#endif
246	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),	252	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),
247	#ifdef CUTCHAR_RESOURCE
248	RSTRG (Rs_cutchars, "cutchars", "string"),	253	RSTRG (Rs_cutchars, "cutchars", "string"),
249	#endif /* CUTCHAR_RESOURCE */
250	RSTRG (Rs_answerbackstring, "answerbackString", "string"),	254	RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251	#ifndef NO_SECONDARY_SCREEN	255	#ifndef NO_SECONDARY_SCREEN
252	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),	256	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),	257	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
254	#endif	258	#endif
…		…
257	RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO	261	RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
258	RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO	262	RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
259	STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),	263	STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
260	#endif	264	#endif
261	#if ISO_14755	265	#if ISO_14755
		266	BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262	BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),	267	BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263	#endif	268	#endif
264	#ifdef HAVE_AFTERIMAGE	269	#ifdef HAVE_AFTERIMAGE
265	STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),	270	STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266	STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
267	#endif
268	#ifndef NO_RESOURCES
269	INFO ("xrm", "string", "X resource"),
270	#endif	271	#endif
271	INFO ("e", "command arg ...", "command to execute")	272	INFO ("e", "command arg ...", "command to execute")
272	};	273	};
273		274
274	#undef INFO	275	#undef INFO
…		…
318	#endif	319	#endif
319	","	320	","
320	#if OFF_FOCUS_FADING	321	#if OFF_FOCUS_FADING
321	"fade,"	322	"fade,"
322	#endif	323	#endif
323	#if defined(XPM_BACKGROUND)
324	"XPM,"
325	#endif
326	#if defined(ENABLE_TRANSPARENCY)	324	#if defined(ENABLE_TRANSPARENCY)
327	"transparent,"	325	"transparent,"
328	"tint,"	326	"tint,"
329	#endif	327	#endif
330	#if HAVE_AFTERIMAGE	328	#if HAVE_AFTERIMAGE
331	"afterimage,"	329	"afterimage,"
332	#endif	330	#endif
		331	#if HAVE_PIXBUF
		332	"pixbuf,"
		333	#endif
333	#if defined(USE_XIM)	334	#if defined(USE_XIM)
334	"XIM,"	335	"XIM,"
335	#endif	336	#endif
336	#if defined(NO_BACKSPACE_KEY)	337	#if defined(NO_BACKSPACE_KEY)
337	"no_backspace,"	338	"no_backspace,"
…		…
364	"pointerBlank,"	365	"pointerBlank,"
365	#endif	366	#endif
366	#if defined(NO_RESOURCES)	367	#if defined(NO_RESOURCES)
367	"NoResources,"	368	"NoResources,"
368	#endif	369	#endif
369	"scrollbars="	370	"scrollbars=plain"
370	#if !defined(HAVE_SCROLLBARS)
371	"NONE"
372	#else
373	# if defined(PLAIN_SCROLLBAR)
374	"plain"
375	# if defined(RXVT_SCROLLBAR) \|\| defined(NEXT_SCROLLBAR) \|\| defined(XTERM_SCROLLBAR)
376	"+"
377	# endif
378	# endif
379	# if defined(RXVT_SCROLLBAR)	371	#if defined(RXVT_SCROLLBAR)
380	"rxvt"	372	"+rxvt"
381	# if defined(NEXT_SCROLLBAR) \|\| defined(XTERM_SCROLLBAR)
382	"+"
383	# endif
384	# endif	373	#endif
385	# if defined(NEXT_SCROLLBAR)	374	#if defined(NEXT_SCROLLBAR)
386	"NeXT"	375	"+NeXT"
387	# if defined(XTERM_SCROLLBAR)
388	"+"
389	# endif
390	# endif	376	#endif
391	# if defined(XTERM_SCROLLBAR)	377	#if defined(XTERM_SCROLLBAR)
392	"xterm"	378	"+xterm"
393	# endif
394	#endif	379	#endif
395	"\nUsage: "; /* Usage */	380	"\nUsage: "; /* Usage */
396		381
397	#define INDENT 18	382	#define INDENT 18
398		383
…		…
412	switch (type)	397	switch (type)
413	{	398	{
414	case 0: /* brief listing */	399	case 0: /* brief listing */
415	rxvt_log (" [-help] [--help]\n");	400	rxvt_log (" [-help] [--help]\n");
416		401
417	for (col = 1, i = 0; i < optList_size; i++)	402	for (col = 1, i = 0; i < ecb_array_length (optList); i++)
418	if (optList[i].desc != NULL)	403	if (optList[i].desc != NULL)
419	{	404	{
420	int len = 0;	405	int len = 0;
421		406
422	if (!optList_isBool (i))	407	if (optList[i].arg)
423	{	408	len = strlen (optList[i].arg) + 1;
424	len = optList_strlen (i);
425	if (len > 0)
426	len++; /* account for space */
427	}
428	#ifdef DEBUG_STRICT
429	assert (optList[i].opt != NULL);	409	assert (optList[i].opt != NULL);
430	#endif
431	len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);	410	len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
432	col += len;	411	col += len;
433	if (col > 79)	412	if (col > 79)
		413	{
434	{ /* assume regular width */	414	/* assume regular width */
435	rxvt_log ("\n");	415	rxvt_log ("\n");
436	col = 1 + len;	416	col = 1 + len;
437	}	417	}
438		418
439	rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);	419	rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
440	if (optList_strlen (i))	420	if (optList[i].arg)
441	rxvt_log (" %s]", optList[i].arg);	421	rxvt_log (" %s]", optList[i].arg);
442	else	422	else
443	rxvt_log ("]");	423	rxvt_log ("]");
444	}	424	}
445	break;	425	break;
446		426
447	case 1: /* full command-line listing */	427	case 1: /* full command-line listing */
448	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");	428	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
449		429
450	for (i = 0; i < optList_size; i++)	430	for (i = 0; i < ecb_array_length (optList); i++)
451	if (optList[i].desc != NULL)	431	if (optList[i].desc != NULL)
452	{	432	{
453	#ifdef DEBUG_STRICT
454	assert (optList[i].opt != NULL);	433	assert (optList[i].opt != NULL);
455	#endif
456	rxvt_log (" %s%s %-*s%s%s\n",	434	rxvt_log (" %s%s %-*s%s%s\n",
457	(optList_isBool (i) ? "-/+" : "-"), optList[i].opt,	435	(optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
458	(INDENT - strlen (optList[i].opt)	436	(INDENT - strlen (optList[i].opt)
459	+ (optList_isBool (i) ? 0 : 2)),	437	+ (optList_isBool (i) ? 0 : 2)),
460	(optList[i].arg ? optList[i].arg : ""),	438	(optList[i].arg ? optList[i].arg : ""),
…		…
466		444
467	case 2: /* full resource listing */	445	case 2: /* full resource listing */
468	rxvt_log (" [options] [-e command args]\n\n"	446	rxvt_log (" [options] [-e command args]\n\n"
469	"where resources (long-options) include:\n");	447	"where resources (long-options) include:\n");
470		448
471	for (i = 0; i < optList_size; i++)	449	for (i = 0; i < ecb_array_length (optList); i++)
472	if (optList[i].kw != NULL)	450	if (optList[i].kw != NULL)
473	rxvt_log (" %s: %*s%s\n",	451	rxvt_log (" %s: %*s%s\n",
474	optList[i].kw,	452	optList[i].kw,
475	(INDENT - strlen (optList[i].kw)), "", /* XXX */	453	(INDENT - strlen (optList[i].kw)), "", /* XXX */
476	(optList_isBool (i) ? "boolean" : optList[i].arg));	454	(optList_isBool (i) ? "boolean" : optList[i].arg));
…		…
483	break;	461	break;
484	}	462	}
485		463
486	rxvt_log ("\n\n");	464	rxvt_log ("\n\n");
487	rxvt_exit_failure ();	465	rxvt_exit_failure ();
488	/* NOTREACHED */
489	}	466	}
490		467
491	/}}} /	468	/}}} /
492		469
493	/{{{ get command-line options before getting resources /	470	/{{{ get command-line options before getting resources /
…		…
497	int i, bad_option = 0;	474	int i, bad_option = 0;
498		475
499	for (i = 1; i < argc; i++)	476	for (i = 1; i < argc; i++)
500	{	477	{
501	unsigned int entry, longopt = 0;	478	unsigned int entry, longopt = 0;
502	const char flag, opt;	479	const char *opt;
		480	int flag;
503		481
504	opt = argv[i];	482	opt = argv[i];
505		483
506	if (*opt == '-')	484	if (*opt == '-')
507	{	485	{
508	flag = resval_on;	486	flag = 1;
509		487
510	if (*++opt == '-')	488	if (*++opt == '-')
511	longopt = opt++; / long option */	489	longopt = opt++; / long option */
512	}	490	}
513	else if (*opt == '+')	491	else if (*opt == '+')
514	{	492	{
515	flag = resval_off;	493	flag = 0;
516		494
517	if (*++opt == '+')	495	if (*++opt == '+')
518	longopt = opt++; / long option */	496	longopt = opt++; / long option */
519	}	497	}
520	else	498	else
…		…
529		507
530	if (!strcmp (opt, "h"))	508	if (!strcmp (opt, "h"))
531	rxvt_usage (0);	509	rxvt_usage (0);
532		510
533	/* feature: always try to match long-options */	511	/* feature: always try to match long-options */
534	for (entry = 0; entry < optList_size; entry++)	512	for (entry = 0; entry < ecb_array_length (optList); entry++)
535	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))	513	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
536	\|\| (!longopt	514	\|\| (!longopt
537	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))	515	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))
538	break;	516	break;
539		517
540	if (entry < optList_size)	518	if (entry < ecb_array_length (optList))
541	{	519	{
542	if (optList_isReverse (entry))	520	if (optList_isReverse (entry))
543	flag = flag == resval_on ? resval_off : resval_on;	521	flag = !flag;
544		522
545	if (optList_strlen (entry))	523	if (optList_isString (entry))
546	{	524	{
547	/*	525	/*
548	* special cases are handled in main.c:main () to allow	526	* special cases are handled in init_resources () to allow
549	* X resources to set these values before we settle for	527	* X resources to set these values before we settle for
550	* default values	528	* default values
551	*/	529	*/
552		530
553	if (optList[entry].doff != -1)	531	if (optList[entry].doff != -1)
554	{	532	{
555	if (flag == resval_on && !argv [i+1])	533	if (flag && i+1 == argc)
556	rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);	534	rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
557		535
558	rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;	536	rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
559	}	537	}
560	}	538	}
561	else	539	else
		540	{
562	{ /* boolean value */	541	/* boolean value */
563	set_option (optList[entry].index, flag == resval_on);	542	set_option (optList[entry].index, flag);
564		543
565	if (optList[entry].doff != -1)	544	if (optList[entry].doff != -1)
566	rs[optList[entry].doff] = flag;	545	rs[optList[entry].doff] = flag ? resval_on : resval_off;
567	}	546	}
568	}	547	}
		548	#ifndef NO_RESOURCES
		549	else if (!strcmp (opt, "xrm"))
		550	{
		551	if (i+1 < argc)
		552	XrmPutLineResource (&option_db, argv[++i]);
		553	}
		554	#endif
		555	#ifdef KEYSYM_RESOURCE
		556	else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
		557	{
		558	if (i+1 < argc)
		559	{
		560	char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
		561	sprintf (res, "*.%s: %s\n", opt, argv[i]);
		562	XrmPutLineResource (&option_db, res);
		563	}
		564	}
		565	#endif
569	else	566	else
570	#ifdef KEYSYM_RESOURCE
571	if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
572	{	567	{
573	const char *str = argv[++i];
574
575	if (str != NULL)
576	parse_keysym (opt + sizeof ("keysym.") - 1, str);
577	}
578	else
579	#endif
580	{
581	bad_option = 1;	568	bad_option = 1;
582	rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);	569	rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
583	}	570	}
584	}	571	}
585		572
586	if (bad_option)	573	if (bad_option)
587	rxvt_usage (0);	574	rxvt_usage (0);
588	}	575	}
…		…
597	* Define key from XrmEnumerateDatabase.	584	* Define key from XrmEnumerateDatabase.
598	* quarks will be something like	585	* quarks will be something like
599	* "rxvt" "keysym" "0xFF01"	586	* "rxvt" "keysym" "0xFF01"
600	* value will be a string	587	* value will be a string
601	*/	588	*/
602	/* ARGSUSED */	589	static int
603	int
604	rxvt_define_key (XrmDatabase *database UNUSED,	590	rxvt_define_key (XrmDatabase *database ecb_unused,
605	XrmBindingList bindings UNUSED,	591	XrmBindingList bindings ecb_unused,
606	XrmQuarkList quarks,	592	XrmQuarkList quarks,
607	XrmRepresentation *type UNUSED,	593	XrmRepresentation *type ecb_unused,
608	XrmValue *value,	594	XrmValue *value,
609	XPointer closure UNUSED)	595	XPointer closure ecb_unused)
610	{	596	{
611	int last;	597	int last;
612		598
613	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */	599	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
614	;	600	;
…		…
619	}	605	}
620		606
621	/*	607	/*
622	* look for something like this (XK_Delete)	608	* look for something like this (XK_Delete)
623	* rxvt*keysym.0xFFFF: "\177"	609	* rxvt*keysym.0xFFFF: "\177"
624	*
625	* arg will be
626	* NULL for ~/.Xdefaults and
627	* non-NULL for command-line options (need to allocate)
628	*/	610	*/
629	#define NEWARGLIM 500 /* `reasonable' size */
630		611
631	struct keysym_vocabulary_t	612	struct keysym_vocabulary_t
632	{	613	{
633	const char *name;	614	const char *name;
634	unsigned short len;	615	unsigned short len;
635	unsigned short value;	616	unsigned short value;
636	};	617	};
637	keysym_vocabulary_t keysym_vocabulary[] =	618	static const keysym_vocabulary_t keysym_vocabulary[] =
638	{	619	{
639	{ "ISOLevel3", 9, Level3Mask },	620	{ "ISOLevel3", 9, Level3Mask },
640	{ "AppKeypad", 9, AppKeypadMask },	621	{ "AppKeypad", 9, AppKeypadMask },
641	{ "Control", 7, ControlMask },	622	{ "Control", 7, ControlMask },
642	{ "NumLock", 7, NumLockMask },	623	{ "NumLock", 7, NumLockMask },
…		…
664	};	645	};
665		646
666	int	647	int
667	rxvt_term::parse_keysym (const char str, const char arg)	648	rxvt_term::parse_keysym (const char str, const char arg)
668	{	649	{
669	int n, sym;	650	int sym;
670	unsigned int state = 0;	651	unsigned int state = 0;
671	const char *pmodend = NULL;	652	const char *key = strrchr (str, '-');
672	char *newarg = NULL;
673	char newargstr[NEWARGLIM];
674		653
675	if (arg == NULL)	654	if (!key)
676	{	655	key = str;
677	n = sizeof ("keysym.") - 1;
678	if (strncmp (str, "keysym.", n))
679	return 0;
680
681	str += n; /* skip `keysym.' */
682	if (!(pmodend = strchr (str, ':')))
683	return -1;
684	}
685	else	656	else
686	pmodend = str + strlen(str);	657	key++;
687		658
688	for (--pmodend; str < pmodend; --pmodend)	659	// string or key is empty
689	if (*pmodend == '-')	660	if (arg == '\0' \|\| key == '\0')
690	break;	661	return -1;
691		662
		663	// parse modifiers
692	while (str < pmodend)	664	while (str < key)
693	{	665	{
694	unsigned int i;	666	unsigned int i;
695		667
696	for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)	668	for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
697	{	669	{
698	if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)	670	if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
699	{	671	{
700	state \|= keysym_vocabulary[i].value;	672	state \|= keysym_vocabulary[i].value;
701	str += keysym_vocabulary[i].len;	673	str += keysym_vocabulary[i].len;
702	break;	674	break;
703	}	675	}
704	}	676	}
705		677
706	if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))	678	if (i >= ecb_array_length (keysym_vocabulary))
707	return -1;	679	return -1;
708		680
709	if (*str == '-')	681	if (*str == '-')
710	++str;	682	++str;
711	}	683	}
712		684
713	/* some scanf () have trouble with a 0x prefix */	685	// convert keysym name to keysym number
714	if (str[0] == '0' && toupper (str[1]) == 'X')	686	if ((sym = XStringToKeysym (str)) == None)
715	{	687	{
716	str += 2;	688	// fallback on hexadecimal parsing
717		689	char *end;
		690	sym = strtol (str, &end, 16);
718	if (arg)	691	if (*end)
719	{
720	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
721	return -1;
722	}
723	else
724	{
725	if (sscanf (str, "%x:", &sym) != 1)
726	return -1;
727
728	/* cue to ':', it's there since sscanf () worked */
729	strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
730	newargstr[NEWARGLIM - 1] = '\0';
731	newarg = newargstr;
732	}
733	}
734	else
735	{
736	/*
737	* convert keysym name to keysym number
738	*/
739	strncpy (newargstr, str, NEWARGLIM - 1);
740	newargstr[NEWARGLIM - 1] = '\0';
741
742	if (arg == NULL)
743	{
744	if ((newarg = strchr (newargstr, ':')) == NULL)
745	return -1;
746
747	newarg++ = '\0'; / terminate keysym name */
748	}
749
750	if ((sym = XStringToKeysym (newargstr)) == None)
751	return -1;	692	return -1;
752	}	693	}
753		694
754	if (newarg == NULL)	695	wchar_t *ws = rxvt_mbstowcs (arg);
755	{	696	if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
756	strncpy (newargstr, arg, NEWARGLIM - 1);
757	newargstr[NEWARGLIM - 1] = '\0';
758	newarg = newargstr;
759	}
760
761	if (*newarg == '\0')
762	return -1;
763
764	keyboard->register_user_translation (sym, state, newarg);	697	keyboard->register_user_translation (sym, state, ws);
		698	free (ws);
765	return 1;	699	return 1;
766	}	700	}
767		701
768	# endif /* KEYSYM_RESOURCE */	702	# endif /* KEYSYM_RESOURCE */
769	#endif /* NO_RESOURCES */	703	#endif /* NO_RESOURCES */
770		704
771	static char *	705	static char *
772	get_res (XrmDatabase database, const char program, const char option)	706	get_res (XrmDatabase database, const char program, const char option)
773	{	707	{
774	char resource[512];	708	char resource[512];
…		…
806		740
807	void	741	void
808	rxvt_term::extract_resources ()	742	rxvt_term::extract_resources ()
809	{	743	{
810	#ifndef NO_RESOURCES	744	#ifndef NO_RESOURCES
		745	XrmDatabase database = XrmGetDatabase (dpy);
		746	XrmMergeDatabases (option_db, &database);
		747	option_db = NULL;
811	/*	748	/*
812	* Query resources for options that affect us	749	* Query resources for options that affect us
813	*/	750	*/
814	for (int entry = 0; entry < optList_size; entry++)	751	for (int entry = 0; entry < ecb_array_length (optList); entry++)
815	{	752	{
816	int s;	753	int s;
817	const char *kw = optList[entry].kw;	754	const char *kw = optList[entry].kw;
818		755
819	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)	756	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
…		…
839		776
840	set_option (optList[entry].index, s);	777	set_option (optList[entry].index, s);
841	}	778	}
842	}	779	}
843	}	780	}
		781	#endif /* NO_RESOURCES */
		782	}
844		783
		784	void
		785	rxvt_term::extract_keysym_resources ()
		786	{
		787	#ifndef NO_RESOURCES
845	/*	788	/*
846	* [R5 or later]: enumerate the resource database	789	* [R5 or later]: enumerate the resource database
847	*/	790	*/
848	# ifdef KEYSYM_RESOURCE	791	# ifdef KEYSYM_RESOURCE
849	XrmDatabase database = XrmGetDatabase (dpy);	792	XrmDatabase database = XrmGetDatabase (dpy);
…		…
858	class_prefix[2] = NULLQUARK;	801	class_prefix[2] = NULLQUARK;
859	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	802	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
860	XrmEnumerateDatabase (database, name_prefix, class_prefix,	803	XrmEnumerateDatabase (database, name_prefix, class_prefix,
861	XrmEnumOneLevel, rxvt_define_key, NULL);	804	XrmEnumOneLevel, rxvt_define_key, NULL);
862	# ifdef RESFALLBACK	805	# ifdef RESFALLBACK
863	name_prefix[0] = XrmStringToName (RESFALLBACK);
864	name_prefix[1] = XrmStringToName ("keysym");
865	class_prefix[0] = XrmStringToName (RESFALLBACK);	806	name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
866	class_prefix[1] = XrmStringToName ("Keysym");
867	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	807	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
868	XrmEnumerateDatabase (database, name_prefix, class_prefix,	808	XrmEnumerateDatabase (database, name_prefix, class_prefix,
869	XrmEnumOneLevel, rxvt_define_key, NULL);	809	XrmEnumOneLevel, rxvt_define_key, NULL);
870	# endif	810	# endif
871	# endif	811	# endif
872		812
873	#endif /* NO_RESOURCES */	813	#endif /* NO_RESOURCES */
874	}	814	}
875		815
876	/----------------------- end-of-file (C source) -----------------------/	816	/----------------------- 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.113 by ayin, Sat Sep 8 20:54:51 2007 UTC vs. Revision 1.159 by sf-exg, Fri Dec 2 09:03:43 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.113 by ayin, Sat Sep 8 20:54:51 2007 UTC vs.
Revision 1.159 by sf-exg, Fri Dec 2 09:03:43 2011 UTC