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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.123 by ayin, Fri Nov 23 11:17:37 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
…		…
423	assert (optList[i].opt != NULL);	425	assert (optList[i].opt != NULL);
424	#endif	426	#endif
425	len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);	427	len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
426	col += len;	428	col += len;
427	if (col > 79)	429	if (col > 79)
		430	{
428	{ /* assume regular width */	431	/* assume regular width */
429	rxvt_log ("\n");	432	rxvt_log ("\n");
430	col = 1 + len;	433	col = 1 + len;
431	}	434	}
432		435
433	rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);	436	rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
…		…
551		554
552	rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;	555	rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
553	}	556	}
554	}	557	}
555	else	558	else
		559	{
556	{ /* boolean value */	560	/* boolean value */
557	set_option (optList[entry].index, flag == resval_on);	561	set_option (optList[entry].index, flag == resval_on);
558		562
559	if (optList[entry].doff != -1)	563	if (optList[entry].doff != -1)
560	rs[optList[entry].doff] = flag;	564	rs[optList[entry].doff] = flag;
561	}	565	}
…		…
622	}	626	}
623		627
624	/*	628	/*
625	* look for something like this (XK_Delete)	629	* look for something like this (XK_Delete)
626	* rxvt*keysym.0xFFFF: "\177"	630	* rxvt*keysym.0xFFFF: "\177"
627	*
628	* arg will be
629	* NULL for ~/.Xdefaults and
630	* non-NULL for command-line options (need to allocate)
631	*/	631	*/
632	#define NEWARGLIM 500 /* `reasonable' size */
633		632
634	struct keysym_vocabulary_t	633	struct keysym_vocabulary_t
635	{	634	{
636	const char *name;	635	const char *name;
637	unsigned short len;	636	unsigned short len;
…		…
667	};	666	};
668		667
669	int	668	int
670	rxvt_term::parse_keysym (const char str, const char arg)	669	rxvt_term::parse_keysym (const char str, const char arg)
671	{	670	{
672	int n, sym;	671	int sym;
673	unsigned int state = 0;	672	unsigned int state = 0;
674	const char *pmodend = NULL;	673	const char *key = strrchr (str, '-');
675	char *newarg = NULL;
676	char newargstr[NEWARGLIM];
677		674
678	if (arg == NULL)	675	if (!key)
679	{	676	key = str;
680	n = sizeof ("keysym.") - 1;
681	if (strncmp (str, "keysym.", n))
682	return 0;
683
684	str += n; /* skip `keysym.' */
685	if (!(pmodend = strchr (str, ':')))
686	return -1;
687	}
688	else	677	else
689	pmodend = str + strlen(str);	678	key++;
690		679
691	for (--pmodend; str < pmodend; --pmodend)	680	// string or key is empty
692	if (*pmodend == '-')	681	if (arg == '\0' \|\| key == '\0')
693	break;	682	return -1;
694		683
		684	// parse modifiers
695	while (str < pmodend)	685	while (str < key)
696	{	686	{
697	unsigned int i;	687	unsigned int i;
698		688
699	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)
700	{	690	{
…		…
711		701
712	if (*str == '-')	702	if (*str == '-')
713	++str;	703	++str;
714	}	704	}
715		705
716	/* some scanf () have trouble with a 0x prefix */	706	// convert keysym name to keysym number
717	if (str[0] == '0' && toupper (str[1]) == 'X')	707	if ((sym = XStringToKeysym (str)) == None)
718	{	708	{
719	str += 2;	709	// fallback on hexadecimal parsing
720		710	char *end;
		711	sym = strtol (str, &end, 16);
721	if (arg)	712	if (*end)
722	{
723	if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
724	return -1;
725	}
726	else
727	{
728	if (sscanf (str, "%x:", &sym) != 1)
729	return -1;
730
731	/* cue to ':', it's there since sscanf () worked */
732	strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
733	newargstr[NEWARGLIM - 1] = '\0';
734	newarg = newargstr;
735	}
736	}
737	else
738	{
739	/*
740	* convert keysym name to keysym number
741	*/
742	strncpy (newargstr, str, NEWARGLIM - 1);
743	newargstr[NEWARGLIM - 1] = '\0';
744
745	if (arg == NULL)
746	{
747	if ((newarg = strchr (newargstr, ':')) == NULL)
748	return -1;
749
750	newarg++ = '\0'; / terminate keysym name */
751	}
752
753	if ((sym = XStringToKeysym (newargstr)) == None)
754	return -1;	713	return -1;
755	}	714	}
756		715
757	if (newarg == NULL)
758	{
759	strncpy (newargstr, arg, NEWARGLIM - 1);
760	newargstr[NEWARGLIM - 1] = '\0';
761	newarg = newargstr;
762	}
763
764	if (*newarg == '\0')
765	return -1;
766
767	keyboard->register_user_translation (sym, state, newarg);	716	keyboard->register_user_translation (sym, state, arg);
768	return 1;	717	return 1;
769	}	718	}
770		719
771	# endif /* KEYSYM_RESOURCE */	720	# endif /* KEYSYM_RESOURCE */
772	#endif /* NO_RESOURCES */	721	#endif /* NO_RESOURCES */

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.123 by ayin, Fri Nov 23 11:17:37 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.123 by ayin, Fri Nov 23 11:17:37 2007 UTC vs.
Revision 1.129 by ayin, Mon Jan 7 12:31:49 2008 UTC