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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.180 by sf-exg, Sat Aug 16 10:51:23 2014 UTC vs.
Revision 1.199 by root, Wed Jul 14 09:28:18 2021 UTC

…		…
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 <schmorp@schmorp.de>	9	* Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	10	* Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
11	*	11	*
12	* 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
13	* 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
14	* the Free Software Foundation; either version 3 of the License, or	14	* the Free Software Foundation; either version 3 of the License, or
15	* (at your option) any later version.	15	* (at your option) any later version.
…		…
99	SWCH ("ic", Opt_iconic, 0, NULL), /* short form */	99	SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
100	STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),	100	STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
101	SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),	101	SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
102	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),	102	BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
103	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),	103	BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104	STRG (Rs_multiClickTime, "multiClickTime", "mc", "number", "Maximum time (in ms) between multi-click selections"),	104	STRG (Rs_multiClickTime, "multiClickTime", "mc", "number", "maximum time (in ms) between multi-click selections"),
105	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),	105	BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
106	BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),	106	BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
107	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),	107	BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
108	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),	108	RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
109	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),	109	BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
…		…
113	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),	113	STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
114	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),	114	BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
115	BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),	115	BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
116	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),	116	BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
117	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),	117	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
118	#if BG_IMAGE_FROM_ROOT
119	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
120	BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
121	STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
122	STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
123	STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
124	#endif
125	#if OFF_FOCUS_FADING	118	#if OFF_FOCUS_FADING
126	STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),	119	STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
127	STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),	120	STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
128	#endif	121	#endif
129	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),	122	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
…		…
141	#endif	134	#endif
142	#ifdef MOUSE_WHEEL	135	#ifdef MOUSE_WHEEL
143	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),	136	BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
144	#endif	137	#endif
145	#if ENABLE_FRILLS	138	#if ENABLE_FRILLS
		139	BOOL (Rs_disablePasteBrackets, "disablePasteBrackets", "dpb", Opt_disablePasteBrackets, 0, "paste bracket suppression"),
146	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),	140	BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
147	BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),	141	BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
148	BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),	142	BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
149	#endif	143	#endif
150	#if CURSOR_BLINK	144	#if CURSOR_BLINK
…		…
194	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),	188	RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
195	#endif /* NO_CURSORCOLOR */	189	#endif /* NO_CURSORCOLOR */
196	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),	190	STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
197	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),	191	STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
198	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),	192	STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
199	#if BG_IMAGE_FROM_FILE
200	RSTRG (Rs_path, "path", "search path"),
201	STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
202	#endif
203	#if ENABLE_EWMH	193	#if ENABLE_EWMH
204	STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),	194	STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
		195	#endif
		196	#ifdef HAVE_XMU
		197	RSTRG (Rs_pointerShape, "pointerShape", "string"),
205	#endif	198	#endif
206	/* fonts: command-line option = resource name */	199	/* fonts: command-line option = resource name */
207	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),	200	STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
208	#if ENABLE_STYLES	201	#if ENABLE_STYLES
209	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),	202	STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
…		…
230	#endif	223	#endif
231	#if ENABLE_FRILLS	224	#if ENABLE_FRILLS
232	STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),	225	STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
233	STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),	226	STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
234	RSTRG (Rs_transient_for, "transient-for", "windowid"),	227	RSTRG (Rs_transient_for, "transient-for", "windowid"),
235	BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),	228	BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "override-redirect on the terminal window"),
236	STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),	229	STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
237	BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),	230	BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
238	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	231	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
239	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	232	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
240	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	233	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
…		…
242	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),	235	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
243	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),	236	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
244	STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),	237	STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
245	#endif	238	#endif
246	#ifdef BUILTIN_GLYPHS	239	#ifdef BUILTIN_GLYPHS
247	BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),	240	BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "use of font glyphs instead of internal glyphs"),
248	#endif	241	#endif
249	#ifdef POINTER_BLANK	242	#ifdef POINTER_BLANK
250	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),	243	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
251	#endif	244	#endif
252	#ifndef NO_BACKSPACE_KEY	245	#ifndef NO_BACKSPACE_KEY
…		…
260	#endif	253	#endif
261	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),	254	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),
262	RSTRG (Rs_cutchars, "cutchars", "string"),	255	RSTRG (Rs_cutchars, "cutchars", "string"),
263	RSTRG (Rs_answerbackstring, "answerbackString", "string"),	256	RSTRG (Rs_answerbackstring, "answerbackString", "string"),
264	#ifndef NO_SECONDARY_SCREEN	257	#ifndef NO_SECONDARY_SCREEN
265	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),	258	BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "secondary screen"),
266	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),	259	BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "secondary screen scroll"),
		260	#endif
		261	#if ENABLE_FRILLS
		262	STRG (Rs_rewrapMode, "rewrapMode", "rm", "string", "rewrap mode (auto, always, never)"),
267	#endif	263	#endif
268	#if ENABLE_PERL	264	#if ENABLE_PERL
269	RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO	265	RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
270	RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO	266	RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
271	RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO	267	RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
…		…
625	return 0;	621	return 0;
626	}	622	}
627		623
628	/}}} /	624	/}}} /
629		625
630	#ifndef NO_RESOURCES
631	/----------------------------------------------------------------------/	626	/----------------------------------------------------------------------/
632		627
633	# ifdef KEYSYM_RESOURCE	628	#ifdef KEYSYM_RESOURCE
634	static void	629	static void
635	rxvt_define_key (rxvt_term term, const char k, const char *v)	630	rxvt_define_key (rxvt_term term, const char k, const char *v)
636	{	631	{
637	term->bind_action (k, v);	632	term->bind_action (k, v);
638	}
639
640	/*
641	* Define key from XrmEnumerateDatabase.
642	* quarks will be something like
643	* "rxvt" "keysym" "0xFF01"
644	* value will be a string
645	*/
646	static int
647	rxvt_keysym_enumerate_helper (
648	XrmDatabase *database ecb_unused,
649	XrmBindingList bindings ecb_unused,
650	XrmQuarkList quarks,
651	XrmRepresentation *type ecb_unused,
652	XrmValue *value,
653	XPointer closure
654	)
655	{
656	int last;
657
658	for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
659	;
660
661	rxvt_term term = (rxvt_term )(((void **)closure)[0]);
662	void (cb)(rxvt_term , const char , const char )
663	= (void ()(rxvt_term , const char , const char ))
664	(((void **)closure)[1]);
665
666	cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
667
668	return False;
669	}	633	}
670		634
671	/*	635	/*
672	* look for something like this (XK_Delete)	636	* look for something like this (XK_Delete)
673	* rxvt*keysym.0xFFFF: "\177"	637	* rxvt*keysym.0xFFFF: "\177"
…		…
707	{ "4", 1, Mod4Mask },	671	{ "4", 1, Mod4Mask },
708	{ "5", 1, Mod5Mask },	672	{ "5", 1, Mod5Mask },
709	};	673	};
710		674
711	int	675	int
712	rxvt_term::bind_action (const char str, const char arg)	676	rxvt_term::parse_keysym (const char *str, unsigned int &state)
713	{	677	{
714	int sym;	678	int sym;
715	unsigned int state = 0;
716	const char *key = strrchr (str, '-');	679	const char *key = strrchr (str, '-');
		680
		681	state = 0;
717		682
718	if (!key)	683	if (!key)
719	key = str;	684	key = str;
720	else	685	else
721	key++;	686	key++;
722		687
723	// string or key is empty	688	// string or key is empty
724	if (arg == '\0' \|\| key == '\0')	689	if (*key == '\0')
725	return -1;	690	return -1;
726		691
727	// parse modifiers	692	// parse modifiers
728	while (str < key)	693	while (str < key)
729	{	694	{
…		…
754	sym = strtol (str, &end, 16);	719	sym = strtol (str, &end, 16);
755	if (*end)	720	if (*end)
756	return -1;	721	return -1;
757	}	722	}
758		723
		724	return sym;
		725	}
		726
		727	int
		728	rxvt_term::bind_action (const char str, const char arg)
		729	{
		730	int sym;
		731	unsigned int state;
		732
		733	if (*arg == '\0' \|\| (sym = parse_keysym (str, state)) == -1)
		734	return -1;
		735
759	wchar_t *ws = rxvt_mbstowcs (arg);	736	wchar_t *ws = rxvt_mbstowcs (arg);
760	if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))	737	if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
761	keyboard->register_action (sym, state, ws);	738	keyboard->register_action (sym, state, ws);
762		739
763	free (ws);	740	free (ws);
764	return 1;	741	return 1;
765	}	742	}
766		743
767	# endif /* KEYSYM_RESOURCE */	744	#endif /* KEYSYM_RESOURCE */
768	#endif /* NO_RESOURCES */
769		745
770	static char *	746	static char *
771	get_res (XrmDatabase database, const char program, const char option)	747	get_res (XrmDatabase database, const char program, const char option)
772	{	748	{
773	char resource[512];	749	char resource[512];
…		…
844	}	820	}
845	}	821	}
846	#endif /* NO_RESOURCES */	822	#endif /* NO_RESOURCES */
847	}	823	}
848		824
		825	struct rxvt_enumerate_closure
		826	{
		827	rxvt_term *term;
		828	void (cb)(rxvt_term , const char , const char );
		829	int specific; // iterate over only a specific subhierarchy
		830	};
		831
		832	/*
		833	* Define key from XrmEnumerateDatabase.
		834	* quarks will be something like
		835	* "rxvt" "keysym" "0xFF01"
		836	* value will be a string
		837	*/
		838	static int
		839	rxvt_enumerate_helper (
		840	XrmDatabase *database ecb_unused,
		841	XrmBindingList bindings ecb_unused,
		842	XrmQuarkList quarks,
		843	XrmRepresentation *type ecb_unused,
		844	XrmValue *value,
		845	XPointer closure
		846	)
		847	{
		848	const rxvt_enumerate_closure data = (const rxvt_enumerate_closure )closure;
		849
		850	if (*quarks == NULLQUARK) return False;
		851
		852	// if the quark list starts with a tightly bound quark, we skip it,
		853	// as it exactly matched the prefix. Otherwise, it matched because
		854	// it started with "*", in which case we assume the prefix is part
		855	// of the "*".
		856	if (*bindings == XrmBindTightly)
		857	{
		858	++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
		859	if (*quarks == NULLQUARK) return False;
		860	}
		861
		862	// specific, a bit misleadingly named, is used when a specific "subclass"
		863	// is iterated over, e.g. "keysym", and is used to skip one more
		864	// component, as well as all generic prefixes
		865	// this is a bit of a hack, ideally, keysym (the only user) should use its
		866	// own iteration function, but this ought to be less bloated
		867	if (data->specific)
		868	{
		869	++quarks, ++bindings;
		870	if (*quarks == NULLQUARK) return False;
		871	}
		872
		873	char *pattern;
		874	if (quarks[1] == NULLQUARK)
		875	pattern = XrmQuarkToString (quarks[0]); // single component, fast path
		876	else
		877	{
		878	// multiple components, slow path - should be rare, don't optimize for speed
		879	int size = 0;
		880
		881	for (int i = 0; quarks[i] != NULLQUARK; ++i)
		882	size += strlen (XrmQuarkToString (quarks[i])) + 1;
		883
		884	pattern = rxvt_temp_buf<char> (size + 1);
		885
		886	// now print all components
		887	{
		888	char *cur = pattern;
		889
		890	for (int i = 0; quarks[i] != NULLQUARK; ++i)
		891	cur += sprintf (cur, ".%s", XrmQuarkToString (quarks[i]));
		892	}
		893
		894	++pattern; // skip initial dot
		895	}
		896
		897	data->cb (data->term, pattern, (char *)value->addr);
		898
		899	return False;
		900	}
		901
849	void	902	void
850	rxvt_term::enumerate_keysym_resources (void (cb)(rxvt_term , const char , const char ))	903	rxvt_term::enumerate_resources (void (cb)(rxvt_term , const char , const char ), const char name_p, const char class_p)
851	{	904	{
852	#ifndef NO_RESOURCES
853	/*	905	/*
854	* [R5 or later]: enumerate the resource database	906	* [R5 or later]: enumerate the resource database
855	*/	907	*/
		908	assert (!name_p == !class_p); // both must be specified, or missing
		909
856	# ifdef KEYSYM_RESOURCE	910	#ifdef KEYSYM_RESOURCE
857	void *closure[2] = {	911	rxvt_enumerate_closure closure = { this, cb, name_p ? 1 : 0 };
858	(void *)this,
859	(void *)cb,
860	};
861		912
862	XrmDatabase database = XrmGetDatabase (dpy);	913	XrmDatabase database = XrmGetDatabase (dpy);
863	XrmName name_prefix[3];	914	XrmName name_prefix[3];
864	XrmClass class_prefix[3];	915	XrmClass class_prefix[3];
865		916
866	name_prefix[0] = XrmStringToName (rs[Rs_name]);	917	name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
867	name_prefix[1] = XrmStringToName ("keysym");
868	name_prefix[2] = NULLQUARK;	918	name_prefix[2] = NULLQUARK;
869	class_prefix[0] = XrmStringToName (RESCLASS);	919	class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
870	class_prefix[1] = XrmStringToName ("Keysym");
871	class_prefix[2] = NULLQUARK;	920	class_prefix[2] = NULLQUARK;
872	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */	921
		922	# ifdef RESFALLBACK
		923	name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
873	XrmEnumerateDatabase (database, name_prefix, class_prefix,	924	XrmEnumerateDatabase (database, name_prefix, class_prefix,
874	XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);	925	XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
875	# ifdef RESFALLBACK	926	# endif
		927
876	name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);	928	name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
877	/* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
878	XrmEnumerateDatabase (database, name_prefix, class_prefix,	929	XrmEnumerateDatabase (database, name_prefix, class_prefix,
879	XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);	930	XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
880	# endif	931
		932	name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
		933	XrmEnumerateDatabase (database, name_prefix, class_prefix,
		934	XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
881	# endif	935	#endif
882
883	#endif /* NO_RESOURCES */
884	}	936	}
885		937
886	void	938	void
887	rxvt_term::extract_keysym_resources ()	939	rxvt_term::extract_keysym_resources ()
888	{	940	{
		941	#ifdef KEYSYM_RESOURCE
889	enumerate_keysym_resources (rxvt_define_key);	942	enumerate_keysym_resources (rxvt_define_key);
		943	#endif
890	}	944	}
891		945
892	/----------------------- end-of-file (C source) -----------------------/	946	/----------------------- end-of-file (C source) -----------------------/
893		947

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.180 by sf-exg, Sat Aug 16 10:51:23 2014 UTC vs. Revision 1.199 by root, Wed Jul 14 09:28:18 2021 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.180 by sf-exg, Sat Aug 16 10:51:23 2014 UTC vs.
Revision 1.199 by root, Wed Jul 14 09:28:18 2021 UTC