From: Pierre Habouzit <madcoder@debian.org>
Date: Thu, 24 Jun 2010 15:24:22 +0000 (+0200)
Subject: Allow tig to parse control-modified chars in tigrc
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=af62b665f0d33070a1d6d71be31576d5dd569e17;p=tig.git

Allow tig to parse control-modified chars in tigrc

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

[ jf: s/0x32/0x20/ per request from Pierre ]

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
---

diff --git a/tig.c b/tig.c
index ae33518..a501db0 100644
--- a/tig.c
+++ b/tig.c
@@ -1620,16 +1620,17 @@ get_key_value(const char *name)
 		if (!strcasecmp(key_table[i].name, name))
 			return key_table[i].value;
 
+	if (strlen(name) == 2 && name[0] == '^' && isprint(*name))
+		return (int)name[1] & 0x1f;
 	if (strlen(name) == 1 && isprint(*name))
 		return (int) *name;
-
 	return ERR;
 }
 
 static const char *
 get_key_name(int key_value)
 {
-	static char key_char[] = "'X'";
+	static char key_char[] = "'X'\0";
 	const char *seq = NULL;
 	int key;
 
@@ -1637,10 +1638,17 @@ get_key_name(int key_value)
 		if (key_table[key].value == key_value)
 			seq = key_table[key].name;
 
-	if (seq == NULL &&
-	    key_value < 127 &&
-	    isprint(key_value)) {
-		key_char[1] = (char) key_value;
+	if (seq == NULL && key_value < 0x7f) {
+		char *s = key_char + 1;
+
+		if (key_value >= 0x20) {
+			*s++ = key_value;
+		} else {
+			*s++ = '^';
+			*s++ = 0x40 | (key_value & 0x1f);
+		}
+		*s++ = '\'';
+		*s++ = '\0';
 		seq = key_char;
 	}