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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.121 by ayin, Thu Nov 22 12:31:49 2007 UTC vs.
Revision 1.129 by ayin, Mon Jan 7 12:31:49 2008 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 <pcg@goof.com>	9	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
		10	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10	*	11	*
11	* 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
12	* 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
13	* the Free Software Foundation; either version 2 of the License, or	14	* the Free Software Foundation; either version 2 of the License, or
14	* (at your option) any later version.	15	* (at your option) any later version.
…		…
111	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),	112	BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112	#if ENABLE_TRANSPARENCY	113	#if ENABLE_TRANSPARENCY
113	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),	114	BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114	BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),	115	BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115	STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),	116	STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116	STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),	117	STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
117	#endif	118	#endif
118	#if OFF_FOCUS_FADING	119	#if OFF_FOCUS_FADING
119	STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),	120	STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120	STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),	121	STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121	#endif	122	#endif
122	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),	123	BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123	#ifndef NO_BELL	124	#ifndef NO_BELL
124	# if ENABLE_FRILLS	125	# if ENABLE_FRILLS
…		…
225	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),	226	STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),	227	STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),	228	STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),	229	STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),	230	BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
		231	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
		232	#endif
		233	#ifdef BUILTIN_GLYPHS
230	BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),	234	BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
231	STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232	#endif	235	#endif
233	#ifdef POINTER_BLANK	236	#ifdef POINTER_BLANK
234	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),	237	RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235	#endif	238	#endif
236	#ifndef NO_BACKSPACE_KEY	239	#ifndef NO_BACKSPACE_KEY
237	RSTRG (Rs_backspace_key, "backspacekey", "string"),	240	RSTRG (Rs_backspace_key, "backspacekey", "string"),
238	#endif	241	#endif
239	#ifndef NO_DELETE_KEY	242	#ifndef NO_DELETE_KEY
240	RSTRG (Rs_delete_key, "deletekey", "string"),	243	RSTRG (Rs_delete_key, "deletekey", "string"),
241	#endif	244	#endif
242	RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243	#ifdef PRINTPIPE	245	#ifdef PRINTPIPE
244	RSTRG (Rs_print_pipe, "print-pipe", "string"),	246	RSTRG (Rs_print_pipe, "print-pipe", "string"),
245	#endif	247	#endif
246	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),	248	STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt\|meta\|hyper\|super\|mod1\|...\|mod5"),
247	#ifdef CUTCHAR_RESOURCE	249	#ifdef CUTCHAR_RESOURCE
…		…
262	BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),	264	BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
263	#endif	265	#endif
264	#ifdef HAVE_AFTERIMAGE	266	#ifdef HAVE_AFTERIMAGE
265	STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),	267	STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
266	STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),	268	STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
267	#endif
268	#ifndef NO_RESOURCES
269	INFO ("xrm", "string", "X resource"),
270	#endif	269	#endif
271	INFO ("e", "command arg ...", "command to execute")	270	INFO ("e", "command arg ...", "command to execute")
272	};	271	};
273		272
274	#undef INFO	273	#undef INFO
…		…
426	assert (optList[i].opt != NULL);	425	assert (optList[i].opt != NULL);
427	#endif	426	#endif
428	len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);	427	len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
429	col += len;	428	col += len;
430	if (col > 79)	429	if (col > 79)
		430	{
431	{ /* assume regular width */	431	/* assume regular width */
432	rxvt_log ("\n");	432	rxvt_log ("\n");
433	col = 1 + len;	433	col = 1 + len;
434	}	434	}
435		435
436	rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);	436	rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
…		…
554		554
555	rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;	555	rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
556	}	556	}
557	}	557	}
558	else	558	else
		559	{
559	{ /* boolean value */	560	/* boolean value */
560	set_option (optList[entry].index, flag == resval_on);	561	set_option (optList[entry].index, flag == resval_on);
561		562
562	if (optList[entry].doff != -1)	563	if (optList[entry].doff != -1)
563	rs[optList[entry].doff] = flag;	564	rs[optList[entry].doff] = flag;
564	}	565	}
565	}	566	}
		567	#ifndef NO_RESOURCES
		568	else if (!strcmp (opt, "xrm"))
		569	{
		570	if (i+1 < argc)
		571	XrmPutLineResource (&option_db, argv[++i]);
		572	}
		573	#endif
566	#ifdef KEYSYM_RESOURCE	574	#ifdef KEYSYM_RESOURCE
567	else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))	575	else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
568	{	576	{
569	if (i+1 < argc)	577	if (i+1 < argc)
570	parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]);	578	{
		579	char res = (char )malloc (strlen (opt) + strlen (argv[++i]) + 6);
		580	sprintf (res, "*.%s: %s\n", opt, argv[i]);
		581	XrmPutLineResource (&option_db, res);
		582	free (res);
		583	}
571	}	584	}
572	#endif	585	#endif
573	else	586	else
574	{	587	{
575	bad_option = 1;	588	bad_option = 1;
…		…
613	}	626	}
614		627
615	/*	628	/*
616	* look for something like this (XK_Delete)	629	* look for something like this (XK_Delete)
617	* rxvt*keysym.0xFFFF: "\177"	630	* rxvt*keysym.0xFFFF: "\177"
618	*
619	* arg will be
620	* NULL for ~/.Xdefaults and
621	* non-NULL for command-line options (need to allocate)
622	*/	631	*/
623	#define NEWARGLIM 500 /* `reasonable' size */
624		632
625	struct keysym_vocabulary_t	633	struct keysym_vocabulary_t
626	{	634	{
627	const char *name;	635	const char *name;
628	unsigned short len;	636	unsigned short len;
…		…
658	};	666	};
659		667
660	int	668	int
661	rxvt_term::parse_keysym (const char str, const char arg)	669	rxvt_term::parse_keysym (const char str, const char arg)
662	{	670	{
663	int n, sym;	671	int sym;
664	unsigned int state = 0;	672	unsigned int state = 0;
665	const char *pmodend = NULL;	673	const char *key = strrchr (str, '-');
666	char *newarg = NULL;
667	char newargstr[NEWARGLIM];
668		674
669	if (arg == NULL)	675	if (!key)
670	{	676	key = str;
671	n = sizeof ("keysym.") - 1;
672	if (strncmp (str, "keysym.", n))
673	return 0;
674
675	str += n; /* skip `keysym.' */
676	if (!(pmodend = strchr (str, ':')))
677	return -1;
678	}
679	else	677	else
680	pmodend = str + strlen(str);	678	key++;
681		679
682	for (--pmodend; str < pmodend; --pmodend)	680	// string or key is empty
683	if (*pmodend == '-')	681	if (arg == '\0' \|\| key == '\0')
684	break;	682	return -1;
685		683
		684	// parse modifiers
686	while (str < pmodend)	685	while (str < key)
687	{	686	{
688	unsigned int i;	687	unsigned int i;
689		688
690	for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)	689	for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i)
691	{	690	{
…		…
702		701
703	if (*str == '-')	702	if (*str == '-')
704	++str;	703	++str;
705	}	704	}
706		705
707	/* some scanf () have trouble with a 0x prefix */	706	// convert keysym name to keysym number
708	if (str[0] == '0' && toupper (str[1]) == 'X')	707	if ((sym = XStringToKeysym (str)) == None)
709	{	708	{
710	str += 2;	709	// fallback on hexadecimal parsing
711		710	char *end;
		711	sym = strtol (str, &end, 16);
712	if (arg)	712	if (*end)
713	{
714	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
715	return -1;
716	}
717	else
718	{
719	if (sscanf (str, "%x:", &sym) != 1)
720	return -1;
721
722	/* cue to ':', it's there since sscanf () worked */
723	strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
724	newargstr[NEWARGLIM - 1] = '\0';
725	newarg = newargstr;
726	}
727	}
728	else
729	{
730	/*
731	* convert keysym name to keysym number
732	*/
733	strncpy (newargstr, str, NEWARGLIM - 1);
734	newargstr[NEWARGLIM - 1] = '\0';
735
736	if (arg == NULL)
737	{
738	if ((newarg = strchr (newargstr, ':')) == NULL)
739	return -1;
740
741	newarg++ = '\0'; / terminate keysym name */
742	}
743
744	if ((sym = XStringToKeysym (newargstr)) == None)
745	return -1;	713	return -1;
746	}	714	}
747		715
748	if (newarg == NULL)
749	{
750	strncpy (newargstr, arg, NEWARGLIM - 1);
751	newargstr[NEWARGLIM - 1] = '\0';
752	newarg = newargstr;
753	}
754
755	if (*newarg == '\0')
756	return -1;
757
758	keyboard->register_user_translation (sym, state, newarg);	716	keyboard->register_user_translation (sym, state, arg);
759	return 1;	717	return 1;
760	}	718	}
761		719
762	# endif /* KEYSYM_RESOURCE */	720	# endif /* KEYSYM_RESOURCE */
763	#endif /* NO_RESOURCES */	721	#endif /* NO_RESOURCES */
…		…
800		758
801	void	759	void
802	rxvt_term::extract_resources ()	760	rxvt_term::extract_resources ()
803	{	761	{
804	#ifndef NO_RESOURCES	762	#ifndef NO_RESOURCES
		763	XrmDatabase database = XrmGetDatabase (dpy);
		764	XrmMergeDatabases (option_db, &database);
		765	option_db = NULL;
805	/*	766	/*
806	* Query resources for options that affect us	767	* Query resources for options that affect us
807	*/	768	*/
808	for (int entry = 0; entry < optList_size; entry++)	769	for (int entry = 0; entry < optList_size; entry++)
809	{	770	{
…		…
838		799
839	/*	800	/*
840	* [R5 or later]: enumerate the resource database	801	* [R5 or later]: enumerate the resource database
841	*/	802	*/
842	# ifdef KEYSYM_RESOURCE	803	# ifdef KEYSYM_RESOURCE
843	XrmDatabase database = XrmGetDatabase (dpy);
844	XrmName name_prefix[3];	804	XrmName name_prefix[3];
845	XrmClass class_prefix[3];	805	XrmClass class_prefix[3];
846		806
847	name_prefix[0] = XrmStringToName (rs[Rs_name]);	807	name_prefix[0] = XrmStringToName (rs[Rs_name]);
848	name_prefix[1] = XrmStringToName ("keysym");	808	name_prefix[1] = XrmStringToName ("keysym");

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.121 by ayin, Thu Nov 22 12:31:49 2007 UTC vs. Revision 1.129 by ayin, Mon Jan 7 12:31:49 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.121 by ayin, Thu Nov 22 12:31:49 2007 UTC vs.
Revision 1.129 by ayin, Mon Jan 7 12:31:49 2008 UTC