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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.77 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.81 by root, Wed Jan 18 19:43:51 2006 UTC

…		…
187	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),	187	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
188	#endif /* NO_CURSORCOLOR */	188	#endif /* NO_CURSORCOLOR */
189	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),	189	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
190	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),	190	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
191	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),	191	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)	192	#ifdef XPM_BACKGROUND
193	RSTRG (Rs_path, "path", "search path"),	193	RSTRG (Rs_path, "path", "search path"),
194	#endif /* defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX) */
195	#ifdef XPM_BACKGROUND
196	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),	194	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
197	#endif /* XPM_BACKGROUND */
198	#if (MENUBAR_MAX)
199	RSTRG (Rs_menu, "menu", "name[;tag]"),
200	#endif	195	#endif
201	/* fonts: command-line option = resource name */	196	/* fonts: command-line option = resource name */
202	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),	197	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
203	#if ENABLE_STYLES	198	#if ENABLE_STYLES
204	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),	199	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
…		…
220	#if ENABLE_XEMBED	215	#if ENABLE_XEMBED
221	STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),	216	STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
222	#endif	217	#endif
223	#if ENABLE_FRILLS	218	#if ENABLE_FRILLS
224	RSTRG (Rs_transient_for, "transient-for", "windowid"),	219	RSTRG (Rs_transient_for, "transient-for", "windowid"),
		220	BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
225	STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),	221	STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
226	BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),	222	BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
227	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	223	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	224	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	225	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
…		…
325	#if TINTING	321	#if TINTING
326	"tint,"	322	"tint,"
327	#endif	323	#endif
328	#if defined(UTMP_SUPPORT)	324	#if defined(UTMP_SUPPORT)
329	"utmp,"	325	"utmp,"
330	#endif
331	#if defined(MENUBAR)
332	"menubar,"
333	#endif	326	#endif
334	#if defined(USE_XIM)	327	#if defined(USE_XIM)
335	"XIM,"	328	"XIM,"
336	#endif	329	#endif
337	"scrollbars="	330	"scrollbars="
…		…
367	#if defined(NO_DELETE_KEY)	360	#if defined(NO_DELETE_KEY)
368	"no_delete,"	361	"no_delete,"
369	#endif	362	#endif
370	#if EIGHT_BIT_CONTROLS	363	#if EIGHT_BIT_CONTROLS
371	"8bitctrls,"	364	"8bitctrls,"
372	#endif
373	#if !defined(NO_STRINGS)
374	"strings,"
375	#endif	365	#endif
376	#if defined(ENABLE_FRILLS)	366	#if defined(ENABLE_FRILLS)
377	"frills,"	367	"frills,"
378	#endif	368	#endif
379	#if defined(PREFER_24BIT)	369	#if defined(PREFER_24BIT)
…		…
771	}	761	}
772		762
773	# endif /* KEYSYM_RESOURCE */	763	# endif /* KEYSYM_RESOURCE */
774	#endif /* NO_RESOURCES */	764	#endif /* NO_RESOURCES */
775		765
		766	static char *
776	char get_res (XrmDatabase database, const char program, const char *option)	767	get_res (XrmDatabase database, const char program, const char option)
777	{	768	{
778	char resource[512];	769	char resource[512];
779	char *type;	770	char *type;
780	XrmValue result;	771	XrmValue result;
781		772
…		…
783	XrmGetResource (database, resource, resource, &type, &result);	774	XrmGetResource (database, resource, resource, &type, &result);
784		775
785	return result.addr;	776	return result.addr;
786	}	777	}
787		778
788	/{{{ read the resources files /	779	const char *
789	/*	780	rxvt_term::x_resource (const char *name)
790	* using XGetDefault () or the hand-rolled replacement	781	{
791	*/	782	XrmDatabase database = XrmGetDatabase (display->display);
792	/* ARGSUSED */	783
		784	const char *p = get_res (database, rs[Rs_name], name);
		785	const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
		786
		787	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		788	{
		789	p = get_res (database, RESCLASS, name);
		790	#ifdef RESFALLBACK
		791	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		792	p = get_res (database, RESFALLBACK, name);
		793	#endif
		794	}
		795
		796	if (p == NULL && p0)
		797	p = p0;
		798
		799	return p;
		800	}
		801
793	void	802	void
794	rxvt_term::extract_resources ()	803	rxvt_term::extract_resources ()
795	{	804	{
796	dDisp;
797
798	#ifndef NO_RESOURCES	805	#ifndef NO_RESOURCES
799	XrmDatabase database = XrmGetDatabase (display->display);
800
801	/*	806	/*
802	* Query resources for options that affect us	807	* Query resources for options that affect us
803	*/	808	*/
804	for (int entry = 0; entry < optList_size; entry++)	809	for (int entry = 0; entry < optList_size; entry++)
805	{	810	{
806	int s;	811	int s;
807	char p, p0;
808	const char *kw = optList[entry].kw;	812	const char *kw = optList[entry].kw;
809		813
810	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)	814	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
811	continue; // previously set	815	continue; // previously set
812		816
813	p = get_res (database, rs[Rs_name], kw);	817	const char *p = x_resource (kw);
814	p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
815	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
816	{
817	p = get_res (database, RESCLASS, kw);
818	#ifdef RESFALLBACK
819	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
820	p = get_res (database, RESFALLBACK, kw);
821	#endif
822	}
823
824	if (p == NULL && p0)
825	p = p0;
826		818
827	if (p)	819	if (p)
828	{	820	{
829	p = strdup (p);	821	p = strdup (p);
830	allocated.push_back (p);	822	allocated.push_back ((void *)p);
831	rs[optList[entry].doff] = p;	823	rs[optList[entry].doff] = p;
832		824
833	if (optList_isBool (entry))	825	if (optList_isBool (entry))
834	{	826	{
835	s = strcasecmp (p, "TRUE") == 0	827	s = strcasecmp (p, "TRUE") == 0
…		…
847		839
848	/*	840	/*
849	* [R5 or later]: enumerate the resource database	841	* [R5 or later]: enumerate the resource database
850	*/	842	*/
851	# ifdef KEYSYM_RESOURCE	843	# ifdef KEYSYM_RESOURCE
		844	XrmDatabase database = XrmGetDatabase (display->display);
852	XrmName name_prefix[3];	845	XrmName name_prefix[3];
853	XrmClass class_prefix[3];	846	XrmClass class_prefix[3];
854		847
855	name_prefix[0] = XrmStringToName (rs[Rs_name]);	848	name_prefix[0] = XrmStringToName (rs[Rs_name]);
856	name_prefix[1] = XrmStringToName ("keysym");	849	name_prefix[1] = XrmStringToName ("keysym");
…		…
873	# endif	866	# endif
874		867
875	#endif /* NO_RESOURCES */	868	#endif /* NO_RESOURCES */
876	}	869	}
877		870
878	/}}} /
879	/----------------------- end-of-file (C source) -----------------------/	871	/----------------------- 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.77 by root, Wed Jan 11 00:59:58 2006 UTC vs. Revision 1.81 by root, Wed Jan 18 19:43:51 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.77 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.81 by root, Wed Jan 18 19:43:51 2006 UTC