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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.49 by root, Thu Feb 3 10:24:10 2005 UTC vs.
Revision 1.74 by root, Sun Jan 8 01:02:15 2006 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-2004 Marc Lehmann <pcg@goof.com>	9	* Copyright (c) 2003-2006 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.
…		…
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		33
		34	#include <sys/utsname.h>
		35
34	#ifdef KEYSYM_RESOURCE	36	#ifdef KEYSYM_RESOURCE
35	#include "keyboard.h"	37	#include "keyboard.h"
36	#endif	38	#endif
37		39
		40	/* place holders used for parsing command-line options */
		41	#define Optflag_Reverse 0x40000000UL
		42	#define Optflag_Boolean 0x80000000UL
		43	#define Optflag_mask 0x3fffffffUL
		44
38	/* #define DEBUG_RESOURCES */	45	/* #define DEBUG_RESOURCES */
39
40	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
41		46
42	/{{{ monolithic option/resource structure: /	47	/{{{ monolithic option/resource structure: /
43	/*	48	/*
44	* `string' options MUST have a usage argument	49	* `string' options MUST have a usage argument
45	* `switch' and `boolean' options have no argument	50	* `switch' and `boolean' options have no argument
…		…
58	#define RSTRG(rsp, kw, arg) \	63	#define RSTRG(rsp, kw, arg) \
59	{0, (rsp), (kw), NULL, (arg), NULL}	64	{0, (rsp), (kw), NULL, (arg), NULL}
60		65
61	/* BOOL () - regular boolean `-/+' flag */	66	/* BOOL () - regular boolean `-/+' flag */
62	#define BOOL(rsp, kw, opt, flag, desc) \	67	#define BOOL(rsp, kw, opt, flag, desc) \
63	{ (Opt_Boolean\| (flag)), (rsp), (kw), (opt), NULL, (desc)}	68	{ (Optflag_Boolean \| (flag)), (rsp), (kw), (opt), NULL, (desc)}
64		69
65	/* SWCH () - `-' flag */	70	/* SWCH () - `-' flag */
66	#define SWCH(opt, flag, desc) \	71	#define SWCH(opt, flag, desc) \
67	{ (flag), -1, NULL, (opt), NULL, (desc)}	72	{ (flag), -1, NULL, (opt), NULL, (desc)}
68		73
69	/* convenient macros */	74	/* convenient macros */
70	#define optList_strlen(i) \	75	#define optList_strlen(i) \
71	(optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))	76	(optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1))
72	#define optList_isBool(i) \	77	#define optList_isBool(i) \
73	(optList[i].flag & Opt_Boolean)	78	(optList[i].flag & Optflag_Boolean)
74	#define optList_isReverse(i) \	79	#define optList_isReverse(i) \
75	(optList[i].flag & Opt_Reverse)	80	(optList[i].flag & Optflag_Reverse)
76	#define optList_size() \	81	#define optList_size \
77	(sizeof (optList) / sizeof (optList[0]))	82	(sizeof (optList) / sizeof (optList[0]))
78		83
79	static const struct	84	static const struct
80	{	85	{
81	const unsigned long flag; /* Option flag */	86	const unsigned long flag; /* Option flag */
…		…
96	SWCH ("ic", Opt_iconic, NULL), /* short form */	101	SWCH ("ic", Opt_iconic, NULL), /* short form */
97	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),	102	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
98	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),	103	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),	104	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
100	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),	105	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
101	#ifdef HAVE_SCROLLBARS	106	#if HAVE_SCROLLBARS
102	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),	107	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
103	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),	108	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
104	BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),	109	BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
105	BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),	110	BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
106	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),	111	RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
107	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),	112	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108	#endif	113	#endif
109	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),	114	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
110	BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse \| Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),	115	BOOL (Rs_scrollTtyOutput, NULL, "si", Optflag_Reverse \| Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
111	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),	116	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),	117	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
113	#ifdef TRANSPARENT	118	#if TRANSPARENT
114	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),	119	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
115	BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
116	SWCH ("tr", Opt_transparent, NULL),	120	SWCH ("tr", Opt_transparent, NULL),
		121	# if TINTING
		122	STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
		123	# endif
		124	#endif
		125	#if OFF_FOCUS_FADING
		126	STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
		127	STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
		128	#endif
117	#if TINTING	129	#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."),	130	STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
126	#endif	131	#endif
127	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),	132	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
128	#ifndef NO_BELL	133	#ifndef NO_BELL
129	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),	134	BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
…		…
138	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),	143	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
139	#endif	144	#endif
140	#if ENABLE_FRILLS	145	#if ENABLE_FRILLS
141	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),	146	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
142	BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),	147	BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
		148	BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"),
143	#endif	149	#endif
144	#ifdef CURSOR_BLINK	150	#if CURSOR_BLINK
145	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),	151	BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
146	#endif	152	#endif
147	#ifdef POINTER_BLANK	153	#ifdef POINTER_BLANK
148	BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),	154	BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
149	#endif	155	#endif
…		…
155	RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),	161	RSTRG (Rs_color + minCOLOR + 3, "color3", "color"),
156	RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),	162	RSTRG (Rs_color + minCOLOR + 4, "color4", "color"),
157	RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),	163	RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
158	RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),	164	RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
159	RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),	165	RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
160	#ifndef NO_BRIGHTCOLOR
161	RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),	166	RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
162	RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),	167	RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
163	RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),	168	RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),
164	RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),	169	RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"),
165	RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),	170	RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"),
166	RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),	171	RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
167	RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),	172	RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
168	RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),	173	RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
169	#endif /* NO_BRIGHTCOLOR */
170	#ifndef NO_BOLD_UNDERLINE_REVERSE	174	#ifndef NO_BOLD_UNDERLINE_REVERSE
171	RSTRG (Rs_color + Color_BD, "colorBD", "color"),	175	RSTRG (Rs_color + Color_BD, "colorBD", "color"),
172	RSTRG (Rs_color + Color_IT, "colorIT", "color"),	176	RSTRG (Rs_color + Color_IT, "colorIT", "color"),
173	RSTRG (Rs_color + Color_UL, "colorUL", "color"),	177	RSTRG (Rs_color + Color_UL, "colorUL", "color"),
174	RSTRG (Rs_color + Color_RV, "colorRV", "color"),	178	RSTRG (Rs_color + Color_RV, "colorRV", "color"),
…		…
204	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),	208	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
205	#if ENABLE_STYLES	209	#if ENABLE_STYLES
206	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),	210	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
207	STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),	211	STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
208	STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),	212	STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
		213	BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, "font styles imply intensity changes"),
209	#endif	214	#endif
210	#ifdef USE_XIM	215	#ifdef USE_XIM
211	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),	216	STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
212	STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot\|OffTheSpot\|Root"),	217	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"),	218	STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
…		…
216	STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),	221	STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
217	STRG (Rs_title, "title", "title", "string", "title name for window"),	222	STRG (Rs_title, "title", "title", "string", "title name for window"),
218	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */	223	STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
219	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),	224	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
220	STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),	225	STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
		226	#if ENABLE_XEMBED
		227	STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
		228	#endif
221	#if ENABLE_FRILLS	229	#if ENABLE_FRILLS
		230	RSTRG (Rs_transient_for, "transient-for", "windowid"),
		231	STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
		232	BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
222	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	233	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
223	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	234	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
224	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	235	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
225	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),	236	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
226	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),	237	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
		238	BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, "do not use internal glyphs"),
227	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),	239	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
228	#endif	240	#endif
229	#ifdef POINTER_BLANK	241	#ifdef POINTER_BLANK
230	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),	242	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
231	#endif	243	#endif
…		…
246	RSTRG (Rs_answerbackstring, "answerbackString", "string"),	258	RSTRG (Rs_answerbackstring, "answerbackString", "string"),
247	#ifndef NO_SECONDARY_SCREEN	259	#ifndef NO_SECONDARY_SCREEN
248	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),	260	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
249	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),	261	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
250	#endif	262	#endif
		263	#if ENABLE_PERL
		264	RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
		265	RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
		266	RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
		267	STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
		268	#endif
		269	#if 0 && TODO
251	#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)	270	#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
252	INFO ("xrm", "string", "X resource"),	271	INFO ("xrm", "string", "X resource"),
		272	#endif
253	#endif	273	#endif
254	INFO ("e", "command arg ...", "command to execute")	274	INFO ("e", "command arg ...", "command to execute")
255	};	275	};
256		276
257	#undef INFO	277	#undef INFO
…		…
407	switch (type)	427	switch (type)
408	{	428	{
409	case 0: /* brief listing */	429	case 0: /* brief listing */
410	rxvt_log (" [-help] [--help]\n");	430	rxvt_log (" [-help] [--help]\n");
411		431
412	for (col = 1, i = 0; i < optList_size (); i++)	432	for (col = 1, i = 0; i < optList_size; i++)
413	if (optList[i].desc != NULL)	433	if (optList[i].desc != NULL)
414	{	434	{
415	int len = 0;	435	int len = 0;
416		436
417	if (!optList_isBool (i))	437	if (!optList_isBool (i))
…		…
440	break;	460	break;
441		461
442	case 1: /* full command-line listing */	462	case 1: /* full command-line listing */
443	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");	463	rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
444		464
445	for (i = 0; i < optList_size (); i++)	465	for (i = 0; i < optList_size; i++)
446	if (optList[i].desc != NULL)	466	if (optList[i].desc != NULL)
447	{	467	{
448	#ifdef DEBUG_STRICT	468	#ifdef DEBUG_STRICT
449	assert (optList[i].opt != NULL);	469	assert (optList[i].opt != NULL);
450	#endif	470	#endif
…		…
461		481
462	case 2: /* full resource listing */	482	case 2: /* full resource listing */
463	rxvt_log (" [options] [-e command args]\n\n"	483	rxvt_log (" [options] [-e command args]\n\n"
464	"where resources (long-options) include:\n");	484	"where resources (long-options) include:\n");
465		485
466	for (i = 0; i < optList_size (); i++)	486	for (i = 0; i < optList_size; i++)
467	if (optList[i].kw != NULL)	487	if (optList[i].kw != NULL)
468	rxvt_log (" %s: %*s%s\n",	488	rxvt_log (" %s: %*s%s\n",
469	optList[i].kw,	489	optList[i].kw,
470	(INDENT - strlen (optList[i].kw)), "", /* XXX */	490	(INDENT - strlen (optList[i].kw)), "", /* XXX */
471	(optList_isBool (i) ? "boolean" : optList[i].arg));	491	(optList_isBool (i) ? "boolean" : optList[i].arg));
…		…
492	int i, bad_option = 0;	512	int i, bad_option = 0;
493	static const char On[3] = "ON", Off[4] = "OFF";	513	static const char On[3] = "ON", Off[4] = "OFF";
494		514
495	for (i = 1; i < argc; i++)	515	for (i = 1; i < argc; i++)
496	{	516	{
497	unsigned int entry, longopt = 0;	517	unsigned int entry, longopt = 0;
498	const char flag, opt;	518	const char flag, opt;
499		519
500	opt = argv[i];	520	opt = argv[i];
501	#ifdef DEBUG_RESOURCES	521	#ifdef DEBUG_RESOURCES
502	fprintf (stderr, "argv[%d] = %s: ", i, opt);	522	fprintf (stderr, "argv[%d] = %s: ", i, opt);
503	#endif	523	#endif
…		…
524	rxvt_usage (longopt ? 2 : 1);	544	rxvt_usage (longopt ? 2 : 1);
525	if (!strcmp (opt, "h"))	545	if (!strcmp (opt, "h"))
526	rxvt_usage (0);	546	rxvt_usage (0);
527		547
528	/* feature: always try to match long-options */	548	/* feature: always try to match long-options */
529	for (entry = 0; entry < optList_size (); entry++)	549	for (entry = 0; entry < optList_size; entry++)
530	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))	550	if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
531	\|\| (!longopt	551	\|\| (!longopt
532	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))	552	&& optList[entry].opt && !strcmp (opt, optList[entry].opt)))
533	break;	553	break;
534		554
535	if (entry < optList_size ())	555	if (entry < optList_size)
536	{	556	{
537	if (optList_isReverse (entry))	557	if (optList_isReverse (entry))
538	flag = flag == On ? Off : On;	558	flag = flag == On ? Off : On;
539		559
540	if (optList_strlen (entry))	560	if (optList_strlen (entry))
…		…
553	{ /* boolean value */	573	{ /* boolean value */
554	#ifdef DEBUG_RESOURCES	574	#ifdef DEBUG_RESOURCES
555	fprintf (stderr, "boolean (%s,%s) = %s\n",	575	fprintf (stderr, "boolean (%s,%s) = %s\n",
556	optList[entry].opt, optList[entry].kw, flag);	576	optList[entry].opt, optList[entry].kw, flag);
557	#endif	577	#endif
558	if (flag == On)	578	set_option (optList[entry].flag & Optflag_mask, flag == On);
559	options \|= (optList[entry].flag);
560	else
561	options &= ~ (optList[entry].flag);
562		579
563	if (optList[entry].doff != -1)	580	if (optList[entry].doff != -1)
564	rs[optList[entry].doff] = flag;	581	rs[optList[entry].doff] = flag;
565	}	582	}
566	}	583	}
…		…
781	return;	798	return;
782		799
783	len = strlen (name);	800	len = strlen (name);
784	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)	801	while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
785	{	802	{
786	unsigned int entry, n;	803	unsigned int entry, n;
787		804
788	while (str && isspace (str))	805	while (str && isspace (str))
789	str++; /* leading whitespace */	806	str++; /* leading whitespace */
790		807
791	if ((str[len] != '*' && str[len] != '.')	808	if ((str[len] != '*' && str[len] != '.')
…		…
794	str += (len + 1); /* skip `name' or `name.' /	811	str += (len + 1); /* skip `name' or `name.' /
795		812
796	# ifdef KEYSYM_RESOURCE	813	# ifdef KEYSYM_RESOURCE
797	if (!parse_keysym (str, NULL))	814	if (!parse_keysym (str, NULL))
798	# endif /* KEYSYM_RESOURCE */	815	# endif /* KEYSYM_RESOURCE */
799	for (entry = 0; entry < optList_size (); entry++)	816	for (entry = 0; entry < optList_size; entry++)
800	{	817	{
801	const char *kw = optList[entry].kw;	818	const char *kw = optList[entry].kw;
802		819
803	if (kw == NULL)	820	if (kw == NULL)
804	continue;	821	continue;
…		…
808	{	825	{
809	/* skip `keyword:' */	826	/* skip `keyword:' */
810	str += n + 1;	827	str += n + 1;
811	rxvt_Str_trim (str);	828	rxvt_Str_trim (str);
812	n = strlen (str);	829	n = strlen (str);
		830
813	if (n && rs[optList[entry].doff] == NULL)	831	if (n && rs[optList[entry].doff] == NULL)
814	{	832	{
815	/* not already set */	833	/* not already set */
816	int s;	834	int s;
817	char *p = 0;	835	char *p = 0;
…		…
838	rs[optList[entry].doff] = p;	856	rs[optList[entry].doff] = p;
839	allocated.push_back (p);	857	allocated.push_back (p);
840		858
841	if (optList_isBool (entry))	859	if (optList_isBool (entry))
842	{	860	{
843	s = strcasecmp (str, "TRUE") == 0	861	s = strcasecmp (str, "true") == 0
844	\|\| strcasecmp (str, "YES") == 0	862	\|\| strcasecmp (str, "yes") == 0
845	\|\| strcasecmp (str, "ON") == 0	863	\|\| strcasecmp (str, "on") == 0
846	\|\| strcasecmp (str, "1") == 0;	864	\|\| strcmp (str, "1") == 0;
847		865
848	if (optList_isReverse (entry))	866	if (optList_isReverse (entry))
849	s = !s;	867	s = !s;
850		868
851	if (s)
852	options \|= optList[entry].flag;	869	set_option (optList[entry].flag & Optflag_mask, s);
853	else
854	options &= ~optList[entry].flag;
855	}	870	}
856	}	871	}
857		872
858	break;	873	break;
859	}	874	}
…		…
871	/*	886	/*
872	* using XGetDefault () or the hand-rolled replacement	887	* using XGetDefault () or the hand-rolled replacement
873	*/	888	*/
874	/* ARGSUSED */	889	/* ARGSUSED */
875	void	890	void
876	rxvt_term::extract_resources (Display display __attribute__ ((unused)), const char name)	891	rxvt_term::extract_resources ()
877	{	892	{
		893	dDisp;
		894
878	#ifndef NO_RESOURCES	895	#ifndef NO_RESOURCES
		896
		897	char homedir = (char )getenv ("HOME");
		898	char fname[1024];
879		899
880	# if defined XAPPLOADDIR	900	# if defined XAPPLOADDIR
881	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	901	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
882	/* Compute the path of the possibly available localized Rxvt file */	902	/* Compute the path of the possibly available localized Rxvt file */
883	char *localepath = NULL;	903	char localepath[1024];
884		904
885	if (locale != NULL)	905	if (locale)
886	{ /* XXX: must limit length of string */
887	localepath = (char *)rxvt_malloc (256);
888	sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,	906	snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale);
889	(int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),	907	else
890	locale); /* 258 = 255 + 4 (-.s) - 1 (/) /	908	localepath[0] = 0;
891	}
892
893	{
894	# endif	909	# endif
895	# endif	910	# endif
896		911
897	# ifdef USE_XGETDEFAULT	912	# ifdef USE_XGETDEFAULT
898	/*	913	/*
899	* get resources using the X library function	914	* get resources using the X library function
900	*/	915	*/
901	int entry;	916	int entry;
902		917
903	# ifdef XrmEnumOneLevel	918	# ifdef XrmEnumOneLevel
904	int i;
905	char displayResource, xe;	919	char displayResource, xe;
906	XrmName name_prefix[3];	920	XrmName name_prefix[3];
907	XrmClass class_prefix[3];	921	XrmClass class_prefix[3];
908	XrmDatabase database, rdb1;	922	XrmDatabase database, rdb1;
909	char fname[1024];
910		923
911	XrmInitialize ();	924	XrmInitialize ();
912	database = NULL;	925	database = NULL;
913		926
		927	// for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
		928
		929	// 6. System wide per application default file.
		930	/* Add in Rxvt file */
		931	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
		932	if (*localepath
		933	&& ((rdb1 = XrmGetFileDatabase (localepath))
		934	\|\| (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS))))
		935	# endif
		936	XrmMergeDatabases (rdb1, &database);
		937
		938	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
		939	if ((xe = (char *)getenv ("XAPPLRESDIR")))
		940	{
		941	snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
		942
		943	if ((rdb1 = XrmGetFileDatabase (fname)))
		944	XrmMergeDatabases (rdb1, &database);
		945	}
		946
		947	// 5. User's per application default file.
		948	// none
		949
		950	// 4. User's defaults file.
914	/* Get any Xserver defaults */	951	/* Get any Xserver defaults */
915
916	displayResource = XResourceManagerString (display);	952	displayResource = XResourceManagerString (disp);
917	if (displayResource != NULL)	953	if (displayResource != NULL)
		954	{
918	database = XrmGetStringDatabase (displayResource);	955	if ((rdb1 = XrmGetStringDatabase (displayResource)))
919		956	XrmMergeDatabases (rdb1, &database);
920	# ifdef HAVE_EXTRA_XRESOURCE_FILES
921	/* Add in ~/.Xdefaults or ~/.Xresources */
922	{	957	}
923	char *ptr;	958	else if (homedir)
		959	{
		960	snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
924		961
925	if ((ptr = (char *)getenv ("HOME")) == NULL)	962	if ((rdb1 = XrmGetFileDatabase (fname)))
926	ptr = ".";	963	XrmMergeDatabases (rdb1, &database);
		964	}
927		965
928	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)	966	/* Get screen specific resources */
		967	displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen));
		968	if (displayResource != NULL)
		969	{
		970	if ((rdb1 = XrmGetStringDatabase (displayResource)))
		971	/* Merge with screen-independent resources */
		972	XrmMergeDatabases (rdb1, &database);
		973
		974	XFree (displayResource);
		975	}
		976
		977	// 3. User's per host defaults file
		978	/* Add in XENVIRONMENT file */
		979	if ((xe = (char *)getenv ("XENVIRONMENT"))
		980	&& (rdb1 = XrmGetFileDatabase (xe)))
		981	XrmMergeDatabases (rdb1, &database);
		982	else if (homedir)
		983	{
		984	struct utsname un;
		985
		986	if (!uname (&un))
929	{	987	{
930	sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2,	988	snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
931	ptr, xnames[i]);	989
932	if ((rdb1 = XrmGetFileDatabase (fname)))	990	if ((rdb1 = XrmGetFileDatabase (fname)))
		991	XrmMergeDatabases (rdb1, &database);
		992	}
		993	}
		994
		995	XrmSetDatabase (disp, database);
		996	# endif
		997
		998	/*
		999	* Query resources for options that affect us
		1000	*/
		1001	for (entry = 0; entry < optList_size; entry++)
		1002	{
		1003	int s;
		1004	char p, p0;
		1005	const char *kw = optList[entry].kw;
		1006
		1007	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
		1008	continue; /* previously set */
		1009
		1010	p = XGetDefault (disp, rs[Rs_name], kw);
		1011	p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
		1012	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		1013	{
		1014	p = XGetDefault (disp, RESCLASS, kw);
		1015	#ifdef RESFALLBACK
		1016	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		1017	p = XGetDefault (disp, RESFALLBACK, kw);
		1018	#endif
		1019	}
		1020
		1021	if (p == NULL && p0)
		1022	p = p0;
		1023
		1024	if (p)
		1025	{
		1026	rs[optList[entry].doff] = p;
		1027
		1028	if (optList_isBool (entry))
933	{	1029	{
934	XrmMergeDatabases (rdb1, &database);	1030	s = strcasecmp (p, "TRUE") == 0
935	# ifndef HAVE_BOTH_XRESOURCE_FILES	1031	\|\| strcasecmp (p, "YES") == 0
936	break;	1032	\|\| strcasecmp (p, "ON") == 0
937	# endif	1033	\|\| strcasecmp (p, "1") == 0;
		1034
		1035	if (optList_isReverse (entry))
		1036	s = !s;
		1037
		1038	set_option (optList[entry].flag & Optflag_mask, s);
938	}	1039	}
939	}	1040	}
940	}	1041	}
941	# endif
942		1042
943	/* Add in XENVIRONMENT file */
944
945	if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL
946	&& (rdb1 = XrmGetFileDatabase (xe)) != NULL)
947	XrmMergeDatabases (rdb1, &database);
948
949	/* Add in Rxvt file */
950	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
951	if (localepath == NULL \|\| (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
952	# endif
953	rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
954
955	if (rdb1 != NULL)
956	XrmMergeDatabases (rdb1, &database);
957
958	/* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
959	if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
960	{
961	sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
962	- sizeof (RESCLASS) - 2, xe);
963	if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
964	XrmMergeDatabases (rdb1, &database);
965	}
966
967	XrmSetDatabase (display, database);
968	# endif
969
970	/*	1043	/*
971	* Query resources for options that affect us
972	*/
973	for (entry = 0; entry < optList_size (); entry++)
974	{
975	int s;
976	char p, p0;
977	const char *kw = optList[entry].kw;
978
979	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
980	continue; /* previously set */
981
982	p = XGetDefault (display, name, kw);
983	p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
984	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
985	{
986	p = XGetDefault (display, RESCLASS, kw);
987	#ifdef RESFALLBACK
988	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
989	p = XGetDefault (display, RESFALLBACK, kw);
990	#endif
991	}
992
993	if (p == NULL && p0)
994	p = p0;
995
996	if (p)
997	{
998	rs[optList[entry].doff] = p;
999
1000	if (optList_isBool (entry))
1001	{
1002	s = strcasecmp (p, "TRUE") == 0
1003	\|\| strcasecmp (p, "YES") == 0
1004	\|\| strcasecmp (p, "ON") == 0
1005	\|\| strcasecmp (p, "1") == 0;
1006	if (optList_isReverse (entry))
1007	s = !s;
1008	if (s)
1009	options \|= (optList[entry].flag);
1010	else
1011	options &= ~ (optList[entry].flag);
1012	}
1013	}
1014	}
1015
1016	/*
1017	* [R5 or later]: enumerate the resource database	1044	* [R5 or later]: enumerate the resource database
1018	*/	1045	*/
1019	# ifdef XrmEnumOneLevel
1020	# ifdef KEYSYM_RESOURCE	1046	# ifdef KEYSYM_RESOURCE
1021	name_prefix[0] = XrmStringToName (name);	1047	name_prefix[0] = XrmStringToName (rs[Rs_name]);
1022	name_prefix[1] = XrmStringToName ("keysym");	1048	name_prefix[1] = XrmStringToName ("keysym");
1023	name_prefix[2] = NULLQUARK;	1049	name_prefix[2] = NULLQUARK;
1024	class_prefix[0] = XrmStringToName (RESCLASS);	1050	class_prefix[0] = XrmStringToName (RESCLASS);
1025	class_prefix[1] = XrmStringToName ("Keysym");	1051	class_prefix[1] = XrmStringToName ("Keysym");
1026	class_prefix[2] = NULLQUARK;	1052	class_prefix[2] = NULLQUARK;
1027	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1053	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1028	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1054	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
1029	XrmEnumOneLevel, rxvt_define_key, NULL);	1055	XrmEnumOneLevel, rxvt_define_key, NULL);
1030	# ifdef RESFALLBACK	1056	# ifdef RESFALLBACK
1031	name_prefix[0] = XrmStringToName (RESFALLBACK);	1057	name_prefix[0] = XrmStringToName (RESFALLBACK);
1032	name_prefix[1] = XrmStringToName ("keysym");	1058	name_prefix[1] = XrmStringToName ("keysym");
1033	class_prefix[0] = XrmStringToName (RESFALLBACK);	1059	class_prefix[0] = XrmStringToName (RESFALLBACK);
1034	class_prefix[1] = XrmStringToName ("Keysym");	1060	class_prefix[1] = XrmStringToName ("Keysym");
1035	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	1061	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
1036	XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,	1062	XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
1037	XrmEnumOneLevel, rxvt_define_key, NULL);	1063	XrmEnumOneLevel, rxvt_define_key, NULL);
1038	# endif
1039	# endif	1064	# endif
1040	# endif	1065	# endif
1041		1066
1042	# else /* USE_XGETDEFAULT */	1067	# else /* USE_XGETDEFAULT */
1043	/* get resources the hard way, but save lots of memory */	1068	/* get resources the hard way, but save lots of memory */
		1069	FILE *fd = NULL;
		1070
		1071	if (homedir)
		1072	{
		1073	static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
		1074
		1075	for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++)
		1076	{
		1077	snprintf (fname, sizeof (fname), "%s/%s", homedir, xnames [i]);
		1078
		1079	if ((fd = fopen (fname, "r")) != NULL)
		1080	break;
		1081	}
		1082	}
		1083	/*
		1084	* The normal order to match resources is the following:
		1085	* @ global resources (partial match, ~/.Xdefaults)
		1086	* @ application file resources (XAPPLOADDIR/Rxvt)
		1087	* @ class resources (~/.Xdefaults)
		1088	* @ private resources (~/.Xdefaults)
		1089	*
		1090	* However, for the hand-rolled resources, the matching algorithm
		1091	* checks if a resource string value has already been allocated
		1092	* and won't overwrite it with (in this case) a less specific
		1093	* resource value.
		1094	*
		1095	* This avoids multiple allocation. Also, when we've called this
		1096	* routine command-line string options have already been applied so we
		1097	* needn't to allocate for those resources.
		1098	*
		1099	* So, search in resources from most to least specific.
		1100	*
		1101	* Also, use a special sub-class so that we can use either or both of
		1102	* "XTerm" and "Rxvt" as class names.
		1103	*/
		1104
		1105	get_xdefaults (fd, rs[Rs_name]);
		1106	get_xdefaults (fd, RESCLASS);
		1107	# ifdef RESFALLBACK
		1108	get_xdefaults (fd, RESFALLBACK);
		1109	# endif
		1110
		1111	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
		1112	{
1044	FILE *fd = NULL;	1113	FILE *ad = NULL;
1045	char *home;
1046		1114
1047	if ((home = getenv ("HOME")) != NULL)	1115	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
		1116	if (!*localepath \|\| (ad = fopen (localepath, "r")) == NULL)
		1117	# endif
		1118	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
		1119	if (ad != NULL)
1048	{	1120	{
1049	unsigned int i, len = strlen (home) + 2;	1121	get_xdefaults (ad, RESCLASS);
1050	char *f = NULL;	1122	get_xdefaults (ad, "");
1051
1052	for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
1053	{
1054	f = (char *)rxvt_realloc (f, len + strlen (xnames[i]));
1055
1056	sprintf (f, "%s/%s", home, xnames[i]);
1057
1058	if ((fd = fopen (f, "r")) != NULL)
1059	break;
1060	}
1061
1062	free (f);	1123	fclose (ad);
1063	}	1124	}
1064	/*
1065	* The normal order to match resources is the following:
1066	* @ global resources (partial match, ~/.Xdefaults)
1067	* @ application file resources (XAPPLOADDIR/Rxvt)
1068	* @ class resources (~/.Xdefaults)
1069	* @ private resources (~/.Xdefaults)
1070	*
1071	* However, for the hand-rolled resources, the matching algorithm
1072	* checks if a resource string value has already been allocated
1073	* and won't overwrite it with (in this case) a less specific
1074	* resource value.
1075	*
1076	* This avoids multiple allocation. Also, when we've called this
1077	* routine command-line string options have already been applied so we
1078	* needn't to allocate for those resources.
1079	*
1080	* So, search in resources from most to least specific.
1081	*
1082	* Also, use a special sub-class so that we can use either or both of
1083	* "XTerm" and "Rxvt" as class names.
1084	*/
1085
1086	get_xdefaults (fd, name);
1087	get_xdefaults (fd, RESCLASS);
1088	# ifdef RESFALLBACK
1089	get_xdefaults (fd, RESFALLBACK);
1090	# endif
1091
1092	# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
1093	{
1094	FILE *ad = NULL;
1095
1096	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1097	if (localepath == NULL \|\| (ad = fopen (localepath, "r")) == NULL)
1098	# endif
1099	ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
1100	if (ad != NULL)
1101	{
1102	get_xdefaults (ad, RESCLASS);
1103	get_xdefaults (ad, "");
1104	fclose (ad);
1105	}
1106	}	1125	}
1107	# endif /* XAPPLOADDIR */	1126	# endif /* XAPPLOADDIR */
1108		1127
1109	get_xdefaults (fd, ""); /* partial match */	1128	get_xdefaults (fd, ""); /* partial match */
1110	if (fd != NULL)	1129	if (fd != NULL)
1111	fclose (fd);	1130	fclose (fd);
1112	# endif /* USE_XGETDEFAULT */	1131	# endif /* USE_XGETDEFAULT */
1113
1114	# if defined XAPPLOADDIR
1115	# if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1116
1117	}
1118
1119	/* Free the path of the possibly available localized Rxvt file */
1120	free (localepath);
1121	# endif
1122	# endif
1123		1132
1124	#endif /* NO_RESOURCES */	1133	#endif /* NO_RESOURCES */
1125	}	1134	}
1126		1135
1127	/}}} /	1136	/}}} /

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.49 by root, Thu Feb 3 10:24:10 2005 UTC vs. Revision 1.74 by root, Sun Jan 8 01:02:15 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.49 by root, Thu Feb 3 10:24:10 2005 UTC vs.
Revision 1.74 by root, Sun Jan 8 01:02:15 2006 UTC