[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.86 by root, Wed Jan 25 21:09:22 2006 UTC

…		…
33		33
34	/* place holders used for parsing command-line options */	34	/* place holders used for parsing command-line options */
35	#define Optflag_Reverse 0x40000000UL	35	#define Optflag_Reverse 0x40000000UL
36	#define Optflag_Boolean 0x80000000UL	36	#define Optflag_Boolean 0x80000000UL
37	#define Optflag_mask 0x3fffffffUL	37	#define Optflag_mask 0x3fffffffUL
38
39	/* #define DEBUG_RESOURCES */
40		38
41	/{{{ monolithic option/resource structure: /	39	/{{{ monolithic option/resource structure: /
42	/*	40	/*
43	* `string' options MUST have a usage argument	41	* `string' options MUST have a usage argument
44	* `switch' and `boolean' options have no argument	42	* `switch' and `boolean' options have no argument
…		…
187	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),	185	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
188	#endif /* NO_CURSORCOLOR */	186	#endif /* NO_CURSORCOLOR */
189	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),	187	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
190	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),	188	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
191	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),	189	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192	#if defined (XPM_BACKGROUND) \|\| (MENUBAR_MAX)	190	#ifdef XPM_BACKGROUND
193	RSTRG (Rs_path, "path", "search path"),	191	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"),	192	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	193	#endif
201	/* fonts: command-line option = resource name */	194	/* fonts: command-line option = resource name */
202	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),	195	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
203	#if ENABLE_STYLES	196	#if ENABLE_STYLES
204	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),	197	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
…		…
220	#if ENABLE_XEMBED	213	#if ENABLE_XEMBED
221	STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),	214	STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
222	#endif	215	#endif
223	#if ENABLE_FRILLS	216	#if ENABLE_FRILLS
224	RSTRG (Rs_transient_for, "transient-for", "windowid"),	217	RSTRG (Rs_transient_for, "transient-for", "windowid"),
		218	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"),	219	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"),	220	BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
		221	STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
227	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	222	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	223	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	224	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
230	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),	225	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
231	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),	226	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
…		…
322	#if defined(TRANSPARENT)	317	#if defined(TRANSPARENT)
323	"transparent,"	318	"transparent,"
324	#endif	319	#endif
325	#if TINTING	320	#if TINTING
326	"tint,"	321	"tint,"
327	#endif
328	#if defined(UTMP_SUPPORT)
329	"utmp,"
330	#endif
331	#if defined(MENUBAR)
332	"menubar,"
333	#endif	322	#endif
334	#if defined(USE_XIM)	323	#if defined(USE_XIM)
335	"XIM,"	324	"XIM,"
336	#endif	325	#endif
337	"scrollbars="	326	"scrollbars="
…		…
368	"no_delete,"	357	"no_delete,"
369	#endif	358	#endif
370	#if EIGHT_BIT_CONTROLS	359	#if EIGHT_BIT_CONTROLS
371	"8bitctrls,"	360	"8bitctrls,"
372	#endif	361	#endif
373	#if !defined(NO_STRINGS)
374	"strings,"
375	#endif
376	#if defined(ENABLE_FRILLS)	362	#if defined(ENABLE_FRILLS)
377	"frills,"	363	"frills,"
378	#endif
379	#if defined(PREFER_24BIT)
380	"24bit,"
381	#endif	364	#endif
382	#if defined(SELECTION_SCROLLING)	365	#if defined(SELECTION_SCROLLING)
383	"selectionscrolling,"	366	"selectionscrolling,"
384	#endif	367	#endif
385	#if MOUSE_WHEEL	368	#if MOUSE_WHEEL
…		…
505	{	488	{
506	unsigned int entry, longopt = 0;	489	unsigned int entry, longopt = 0;
507	const char flag, opt;	490	const char flag, opt;
508		491
509	opt = argv[i];	492	opt = argv[i];
510	#ifdef DEBUG_RESOURCES	493
511	fprintf (stderr, "argv[%d] = %s: ", i, opt);
512	#endif
513	if (*opt == '-')	494	if (*opt == '-')
514	{	495	{
515	flag = On;	496	flag = On;
516	if (*++opt == '-')	497	if (*++opt == '-')
517	longopt = opt++; / long option */	498	longopt = opt++; / long option */
…		…
558	rs[optList[entry].doff] = flag == On && argv[i+1]	539	rs[optList[entry].doff] = flag == On && argv[i+1]
559	? argv[++i] : 0;	540	? argv[++i] : 0;
560	}	541	}
561	else	542	else
562	{ /* boolean value */	543	{ /* boolean value */
563	#ifdef DEBUG_RESOURCES
564	fprintf (stderr, "boolean (%s,%s) = %s\n",
565	optList[entry].opt, optList[entry].kw, flag);
566	#endif
567	set_option (optList[entry].flag & Optflag_mask, flag == On);	544	set_option (optList[entry].flag & Optflag_mask, flag == On);
568		545
569	if (optList[entry].doff != -1)	546	if (optList[entry].doff != -1)
570	rs[optList[entry].doff] = flag;	547	rs[optList[entry].doff] = flag;
571	}	548	}
…		…
604	* "rxvt" "keysym" "0xFF01"	581	* "rxvt" "keysym" "0xFF01"
605	* value will be a string	582	* value will be a string
606	*/	583	*/
607	/* ARGSUSED */	584	/* ARGSUSED */
608	int	585	int
609	rxvt_define_key (XrmDatabase *database __attribute__((unused)),	586	rxvt_define_key (XrmDatabase *database UNUSED,
610	XrmBindingList bindings __attribute__((unused)),	587	XrmBindingList bindings UNUSED,
611	XrmQuarkList quarks,	588	XrmQuarkList quarks,
612	XrmRepresentation *type __attribute__((unused)),	589	XrmRepresentation *type UNUSED,
613	XrmValue *value,	590	XrmValue *value,
614	XPointer closure __attribute__((unused)))	591	XPointer closure UNUSED)
615	{	592	{
616	int last;	593	int last;
617		594
618	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */	595	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
619	;	596	;
…		…
771	}	748	}
772		749
773	# endif /* KEYSYM_RESOURCE */	750	# endif /* KEYSYM_RESOURCE */
774	#endif /* NO_RESOURCES */	751	#endif /* NO_RESOURCES */
775		752
		753	static char *
776	char get_res (XrmDatabase database, const char program, const char *option)	754	get_res (XrmDatabase database, const char program, const char option)
777	{	755	{
778	char resource[512];	756	char resource[512];
779	char *type;	757	char *type;
780	XrmValue result;	758	XrmValue result;
781		759
…		…
783	XrmGetResource (database, resource, resource, &type, &result);	761	XrmGetResource (database, resource, resource, &type, &result);
784		762
785	return result.addr;	763	return result.addr;
786	}	764	}
787		765
788	/{{{ read the resources files /	766	const char *
789	/*	767	rxvt_term::x_resource (const char *name)
790	* using XGetDefault () or the hand-rolled replacement	768	{
791	*/	769	XrmDatabase database = XrmGetDatabase (xdisp);
792	/* ARGSUSED */	770
		771	const char *p = get_res (database, rs[Rs_name], name);
		772	const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
		773
		774	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		775	{
		776	p = get_res (database, RESCLASS, name);
		777	#ifdef RESFALLBACK
		778	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		779	p = get_res (database, RESFALLBACK, name);
		780	#endif
		781	}
		782
		783	if (p == NULL && p0)
		784	p = p0;
		785
		786	return p;
		787	}
		788
793	void	789	void
794	rxvt_term::extract_resources ()	790	rxvt_term::extract_resources ()
795	{	791	{
796	dDisp;
797
798	#ifndef NO_RESOURCES	792	#ifndef NO_RESOURCES
799	XrmDatabase database = XrmGetDatabase (display->display);
800
801	/*	793	/*
802	* Query resources for options that affect us	794	* Query resources for options that affect us
803	*/	795	*/
804	for (int entry = 0; entry < optList_size; entry++)	796	for (int entry = 0; entry < optList_size; entry++)
805	{	797	{
806	int s;	798	int s;
807	char p, p0;
808	const char *kw = optList[entry].kw;	799	const char *kw = optList[entry].kw;
809		800
810	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)	801	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
811	continue; // previously set	802	continue; // previously set
812		803
813	p = get_res (database, rs[Rs_name], kw);	804	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		805
827	if (p)	806	if (p)
828	{	807	{
829	p = strdup (p);	808	p = strdup (p);
830	allocated.push_back (p);	809	allocated.push_back ((void *)p);
831	rs[optList[entry].doff] = p;	810	rs[optList[entry].doff] = p;
832		811
833	if (optList_isBool (entry))	812	if (optList_isBool (entry))
834	{	813	{
835	s = strcasecmp (p, "TRUE") == 0	814	s = strcasecmp (p, "TRUE") == 0
…		…
847		826
848	/*	827	/*
849	* [R5 or later]: enumerate the resource database	828	* [R5 or later]: enumerate the resource database
850	*/	829	*/
851	# ifdef KEYSYM_RESOURCE	830	# ifdef KEYSYM_RESOURCE
		831	XrmDatabase database = XrmGetDatabase (xdisp);
852	XrmName name_prefix[3];	832	XrmName name_prefix[3];
853	XrmClass class_prefix[3];	833	XrmClass class_prefix[3];
854		834
855	name_prefix[0] = XrmStringToName (rs[Rs_name]);	835	name_prefix[0] = XrmStringToName (rs[Rs_name]);
856	name_prefix[1] = XrmStringToName ("keysym");	836	name_prefix[1] = XrmStringToName ("keysym");
…		…
873	# endif	853	# endif
874		854
875	#endif /* NO_RESOURCES */	855	#endif /* NO_RESOURCES */
876	}	856	}
877		857
878	/}}} /
879	/----------------------- end-of-file (C source) -----------------------/	858	/----------------------- 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.86 by root, Wed Jan 25 21:09:22 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.86 by root, Wed Jan 25 21:09:22 2006 UTC