[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.94 by root, Thu Feb 2 18:04:46 2006 UTC

…		…
21	* You should have received a copy of the GNU General Public License	21	* You should have received a copy of the GNU General Public License
22	* along with this program; if not, write to the Free Software	22	* along with this program; if not, write to the Free Software
23	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	23	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24	----------------------------------------------------------------------/	24	----------------------------------------------------------------------/
25		25
26	#include "../config.h" /* NECESSARY */	26	#include "../config.h"
27	#include "rxvt.h" /* NECESSARY */	27	#include "rxvt.h"
28	#include "version.h"	28	#include "version.h"
29		29
30	#ifdef KEYSYM_RESOURCE	30	#ifdef KEYSYM_RESOURCE
31	#include "keyboard.h"	31	# include "keyboard.h"
32	#endif	32	#endif
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		38
39	/* #define DEBUG_RESOURCES */
40
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
45	* if there's no desc (ription), it won't appear in rxvt_usage ()	43	* if there's no desc (ription), it won't appear in rxvt_usage ()
46	*/	44	*/
…		…
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"),
…		…
218	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),	211	STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
219	STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),	212	STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
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
		216	#if XFT
		217	STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
		218	#endif
223	#if ENABLE_FRILLS	219	#if ENABLE_FRILLS
224	RSTRG (Rs_transient_for, "transient-for", "windowid"),	220	RSTRG (Rs_transient_for, "transient-for", "windowid"),
		221	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"),	222	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"),	223	BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
227	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	224	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
228	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	225	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
229	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	226	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
…		…
269	#undef INFO	266	#undef INFO
270	#undef STRG	267	#undef STRG
271	#undef RSTRG	268	#undef RSTRG
272	#undef SWCH	269	#undef SWCH
273	#undef BOOL	270	#undef BOOL
274	/}}} /
275		271
276	static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";	272	static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n";
277	static const char optionsstring[] = "options: "	273	static const char optionsstring[] = "options: "
278	#if ENABLE_PERL	274	#if ENABLE_PERL
279	"perl,"	275	"perl,"
…		…
323	"transparent,"	319	"transparent,"
324	#endif	320	#endif
325	#if TINTING	321	#if TINTING
326	"tint,"	322	"tint,"
327	#endif	323	#endif
328	#if defined(UTMP_SUPPORT)
329	"utmp,"
330	#endif
331	#if defined(MENUBAR)
332	"menubar,"
333	#endif
334	#if defined(USE_XIM)	324	#if defined(USE_XIM)
335	"XIM,"	325	"XIM,"
		326	#endif
		327	#if defined(NO_BACKSPACE_KEY)
		328	"no_backspace,"
		329	#endif
		330	#if defined(NO_DELETE_KEY)
		331	"no_delete,"
		332	#endif
		333	#if EIGHT_BIT_CONTROLS
		334	"8bitctrls,"
		335	#endif
		336	#if defined(ENABLE_FRILLS)
		337	"frills,"
		338	#endif
		339	#if defined(SELECTION_SCROLLING)
		340	"selectionscrolling,"
		341	#endif
		342	#if MOUSE_WHEEL
		343	"wheel,"
		344	#endif
		345	#if MOUSE_SLIP_WHEELING
		346	"slipwheel,"
		347	#endif
		348	#if defined(SMART_RESIZE)
		349	"smart-resize,"
		350	#endif
		351	#if defined(CURSOR_BLINK)
		352	"cursorBlink,"
		353	#endif
		354	#if defined(POINTER_BLANK)
		355	"pointerBlank,"
		356	#endif
		357	#if defined(NO_RESOURCES)
		358	"NoResources,"
336	#endif	359	#endif
337	"scrollbars="	360	"scrollbars="
338	#if !defined(HAVE_SCROLLBARS)	361	#if !defined(HAVE_SCROLLBARS)
339	"NONE"	362	"NONE"
340	#else	363	#else
…		…
358	# endif	381	# endif
359	# if defined(XTERM_SCROLLBAR)	382	# if defined(XTERM_SCROLLBAR)
360	"xterm"	383	"xterm"
361	# endif	384	# endif
362	#endif	385	#endif
363	","
364	#if defined(NO_BACKSPACE_KEY)
365	"no_backspace,"
366	#endif
367	#if defined(NO_DELETE_KEY)
368	"no_delete,"
369	#endif
370	#if EIGHT_BIT_CONTROLS
371	"8bitctrls,"
372	#endif
373	#if !defined(NO_STRINGS)
374	"strings,"
375	#endif
376	#if defined(ENABLE_FRILLS)
377	"frills,"
378	#endif
379	#if defined(PREFER_24BIT)
380	"24bit,"
381	#endif
382	#if defined(SELECTION_SCROLLING)
383	"selectionscrolling,"
384	#endif
385	#if MOUSE_WHEEL
386	"wheel,"
387	#endif
388	#if MOUSE_SLIP_WHEELING
389	"slipwheel,"
390	#endif
391	#if defined(SMART_RESIZE)
392	"smart-resize,"
393	#endif
394	#if defined(CURSOR_BLINK)
395	"cursorBlink,"
396	#endif
397	#if defined(POINTER_BLANK)
398	"pointerBlank,"
399	#endif
400	#if defined(NO_RESOURCES)
401	"NoResources"
402	#endif
403	"\nUsage: "; /* Usage */	386	"\nUsage: "; /* Usage */
404		387
405	#define INDENT 18	388	#define INDENT 18
		389
		390	const char rxvt_term::resval_undef [] = "<undef>";
		391	const char rxvt_term::resval_on [] = "on";
		392	const char rxvt_term::resval_off [] = "off";
406		393
407	/{{{ usage: /	394	/{{{ usage: /
408	/----------------------------------------------------------------------/	395	/----------------------------------------------------------------------/
409	static void	396	static void
410	rxvt_usage (int type)	397	rxvt_usage (int type)
…		…
419	rxvt_log (" [-help] [--help]\n");	406	rxvt_log (" [-help] [--help]\n");
420		407
421	for (col = 1, i = 0; i < optList_size; i++)	408	for (col = 1, i = 0; i < optList_size; i++)
422	if (optList[i].desc != NULL)	409	if (optList[i].desc != NULL)
423	{	410	{
424	int len = 0;	411	int len = 0;
425		412
426	if (!optList_isBool (i))	413	if (!optList_isBool (i))
427	{	414	{
428	len = optList_strlen (i);	415	len = optList_strlen (i);
429	if (len > 0)	416	if (len > 0)
…		…
496		483
497	/{{{ get command-line options before getting resources /	484	/{{{ get command-line options before getting resources /
498	void	485	void
499	rxvt_term::get_options (int argc, const char const argv)	486	rxvt_term::get_options (int argc, const char const argv)
500	{	487	{
501	int i, bad_option = 0;	488	int i, bad_option = 0;
502	static const char On[3] = "ON", Off[4] = "OFF";
503		489
504	for (i = 1; i < argc; i++)	490	for (i = 1; i < argc; i++)
505	{	491	{
506	unsigned int entry, longopt = 0;	492	unsigned int entry, longopt = 0;
507	const char flag, opt;	493	const char flag, opt;
508		494
509	opt = argv[i];	495	opt = argv[i];
510	#ifdef DEBUG_RESOURCES	496
511	fprintf (stderr, "argv[%d] = %s: ", i, opt);
512	#endif
513	if (*opt == '-')	497	if (*opt == '-')
514	{	498	{
515	flag = On;	499	flag = resval_on;
		500
516	if (*++opt == '-')	501	if (*++opt == '-')
517	longopt = opt++; / long option */	502	longopt = opt++; / long option */
518	}	503	}
519	else if (*opt == '+')	504	else if (*opt == '+')
520	{	505	{
521	flag = Off;	506	flag = resval_off;
		507
522	if (*++opt == '+')	508	if (*++opt == '+')
523	longopt = opt++; / long option */	509	longopt = opt++; / long option */
524	}	510	}
525	else	511	else
526	{	512	{
…		…
529	continue;	515	continue;
530	}	516	}
531		517
532	if (!strcmp (opt, "help"))	518	if (!strcmp (opt, "help"))
533	rxvt_usage (longopt ? 2 : 1);	519	rxvt_usage (longopt ? 2 : 1);
		520
534	if (!strcmp (opt, "h"))	521	if (!strcmp (opt, "h"))
535	rxvt_usage (0);	522	rxvt_usage (0);
536		523
537	/* feature: always try to match long-options */	524	/* feature: always try to match long-options */
538	for (entry = 0; entry < optList_size; entry++)	525	for (entry = 0; entry < optList_size; entry++)
…		…
542	break;	529	break;
543		530
544	if (entry < optList_size)	531	if (entry < optList_size)
545	{	532	{
546	if (optList_isReverse (entry))	533	if (optList_isReverse (entry))
547	flag = flag == On ? Off : On;	534	flag = flag == resval_on ? resval_off : resval_on;
548		535
549	if (optList_strlen (entry))	536	if (optList_strlen (entry))
550	{	537	{
551	/*	538	/*
552	* special cases are handled in main.c:main () to allow	539	* special cases are handled in main.c:main () to allow
553	* X resources to set these values before we settle for	540	* X resources to set these values before we settle for
554	* default values	541	* default values
555	*/	542	*/
556		543
557	if (optList[entry].doff != -1)	544	if (optList[entry].doff != -1)
		545	{
		546	if (flag == resval_on && !argv [i+1])
		547	rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
		548
558	rs[optList[entry].doff] = flag == On && argv[i+1]	549	rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
559	? argv[++i] : 0;	550	}
560	}	551	}
561	else	552	else
562	{ /* boolean value */	553	{ /* 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);	554	set_option (optList[entry].flag & Optflag_mask, flag == resval_on);
568		555
569	if (optList[entry].doff != -1)	556	if (optList[entry].doff != -1)
570	rs[optList[entry].doff] = flag;	557	rs[optList[entry].doff] = flag;
571	}	558	}
572	}	559	}
…		…
604	* "rxvt" "keysym" "0xFF01"	591	* "rxvt" "keysym" "0xFF01"
605	* value will be a string	592	* value will be a string
606	*/	593	*/
607	/* ARGSUSED */	594	/* ARGSUSED */
608	int	595	int
609	rxvt_define_key (XrmDatabase *database __attribute__((unused)),	596	rxvt_define_key (XrmDatabase *database UNUSED,
610	XrmBindingList bindings __attribute__((unused)),	597	XrmBindingList bindings UNUSED,
611	XrmQuarkList quarks,	598	XrmQuarkList quarks,
612	XrmRepresentation *type __attribute__((unused)),	599	XrmRepresentation *type UNUSED,
613	XrmValue *value,	600	XrmValue *value,
614	XPointer closure __attribute__((unused)))	601	XPointer closure UNUSED)
615	{	602	{
616	int last;	603	int last;
617		604
618	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */	605	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
619	;	606	;
…		…
771	}	758	}
772		759
773	# endif /* KEYSYM_RESOURCE */	760	# endif /* KEYSYM_RESOURCE */
774	#endif /* NO_RESOURCES */	761	#endif /* NO_RESOURCES */
775		762
		763	static char *
776	char get_res (XrmDatabase database, const char program, const char *option)	764	get_res (XrmDatabase database, const char program, const char option)
777	{	765	{
778	char resource[512];	766	char resource[512];
779	char *type;	767	char *type;
780	XrmValue result;	768	XrmValue result;
781		769
…		…
783	XrmGetResource (database, resource, resource, &type, &result);	771	XrmGetResource (database, resource, resource, &type, &result);
784		772
785	return result.addr;	773	return result.addr;
786	}	774	}
787		775
788	/{{{ read the resources files /	776	const char *
789	/*	777	rxvt_term::x_resource (const char *name)
790	* using XGetDefault () or the hand-rolled replacement	778	{
791	*/	779	XrmDatabase database = XrmGetDatabase (dpy);
792	/* ARGSUSED */	780
		781	const char *p = get_res (database, rs[Rs_name], name);
		782	const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
		783
		784	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		785	{
		786	p = get_res (database, RESCLASS, name);
		787	#ifdef RESFALLBACK
		788	if (p == NULL \|\| (p0 && strcmp (p, p0) == 0))
		789	p = get_res (database, RESFALLBACK, name);
		790	#endif
		791	}
		792
		793	if (p == NULL && p0)
		794	p = p0;
		795
		796	return p;
		797	}
		798
793	void	799	void
794	rxvt_term::extract_resources ()	800	rxvt_term::extract_resources ()
795	{	801	{
796	dDisp;
797
798	#ifndef NO_RESOURCES	802	#ifndef NO_RESOURCES
799	XrmDatabase database = XrmGetDatabase (display->display);
800
801	/*	803	/*
802	* Query resources for options that affect us	804	* Query resources for options that affect us
803	*/	805	*/
804	for (int entry = 0; entry < optList_size; entry++)	806	for (int entry = 0; entry < optList_size; entry++)
805	{	807	{
806	int s;	808	int s;
807	char p, p0;
808	const char *kw = optList[entry].kw;	809	const char *kw = optList[entry].kw;
809		810
810	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)	811	if (kw == NULL \|\| rs[optList[entry].doff] != NULL)
811	continue; // previously set	812	continue; // previously set
812		813
813	p = get_res (database, rs[Rs_name], kw);	814	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		815
827	if (p)	816	if (p)
828	{	817	{
829	p = strdup (p);	818	p = strdup (p);
830	allocated.push_back (p);	819	allocated.push_back ((void *)p);
831	rs[optList[entry].doff] = p;	820	rs[optList[entry].doff] = p;
832		821
833	if (optList_isBool (entry))	822	if (optList_isBool (entry))
834	{	823	{
835	s = strcasecmp (p, "TRUE") == 0	824	s = strcasecmp (p, "TRUE") == 0
…		…
847		836
848	/*	837	/*
849	* [R5 or later]: enumerate the resource database	838	* [R5 or later]: enumerate the resource database
850	*/	839	*/
851	# ifdef KEYSYM_RESOURCE	840	# ifdef KEYSYM_RESOURCE
		841	XrmDatabase database = XrmGetDatabase (dpy);
852	XrmName name_prefix[3];	842	XrmName name_prefix[3];
853	XrmClass class_prefix[3];	843	XrmClass class_prefix[3];
854		844
855	name_prefix[0] = XrmStringToName (rs[Rs_name]);	845	name_prefix[0] = XrmStringToName (rs[Rs_name]);
856	name_prefix[1] = XrmStringToName ("keysym");	846	name_prefix[1] = XrmStringToName ("keysym");
…		…
873	# endif	863	# endif
874		864
875	#endif /* NO_RESOURCES */	865	#endif /* NO_RESOURCES */
876	}	866	}
877		867
878	/}}} /
879	/----------------------- end-of-file (C source) -----------------------/	868	/----------------------- 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.94 by root, Thu Feb 2 18:04:46 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.94 by root, Thu Feb 2 18:04:46 2006 UTC