X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2FMKkeyname.awk;h=760e1b58aba359ba3bf6894480c8f5e286ff42a6;hp=11dcfe5c23755b2080e2e670d86913269b1f1418;hb=a1aff38c9421e79f92cd4e8ab0587fdf3806cc28;hpb=027ae42953e3186daed8f3882da73de48291b606

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index 11dcfe5c..760e1b58 100644
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,6 +1,6 @@
-# $Id: MKkeyname.awk,v 1.30 2006/05/20 17:35:30 tom Exp $
+# $Id: MKkeyname.awk,v 1.35 2007/06/09 22:36:10 tom Exp $
 ##############################################################################
-# Copyright (c) 1999-2005,2006 Free Software Foundation, Inc.                #
+# Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -37,14 +37,18 @@ BEGIN {
 }
 
 /^[^#]/ {
-	printf "\t{ \"%s\", %s },\n", $1, $1;
+	printf "\t{ %d, %s },\n", offset, $1
+	offset += length($1) + 1
+	names = names"\n\t\""$1"\\0\""
 	}
 
 END {
-	printf "\t{ 0, 0 }};\n"
+	printf "\t{ -1, 0 }};\n"
+	print ""
+	print "static const char key_names[] = "names";"
 	print ""
 	print "#define SIZEOF_TABLE 256"
-	print "static char **keyname_table;"
+	print "#define MyTable _nc_globals.keyname_table"
 	print ""
 	print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)"
 	print "{"
@@ -56,21 +60,21 @@ END {
 	print "	if (c == -1) {"
 	print "		result = \"-1\";"
 	print "	} else {"
-	print "		for (i = 0; _nc_key_names[i].name != 0; i++) {"
+	print "		for (i = 0; _nc_key_names[i].offset != -1; i++) {"
 	print "			if (_nc_key_names[i].code == c) {"
-	print "				result = (NCURSES_CONST char *)_nc_key_names[i].name;"
+	print "				result = (NCURSES_CONST char *)key_names + _nc_key_names[i].offset;"
 	print "				break;"
 	print "			}"
 	print "		}"
 	print ""
 	print "		if (result == 0 && (c >= 0 && c < SIZEOF_TABLE)) {"
-	print "			if (keyname_table == 0)"
-	print "				keyname_table = typeCalloc(char *, SIZEOF_TABLE);"
-	print "			if (keyname_table != 0) {"
-	print "				if (keyname_table[c] == 0) {"
+	print "			if (MyTable == 0)"
+	print "				MyTable = typeCalloc(char *, SIZEOF_TABLE);"
+	print "			if (MyTable != 0) {"
+	print "				if (MyTable[c] == 0) {"
 	print "					int cc = c;"
 	print "					p = name;"
-	print "					if (cc >= 128) {"
+	print "					if (cc >= 128 && (SP == 0 || SP->_use_meta)) {"
 	print "						strcpy(p, \"M-\");"
 	print "						p += 2;"
 	print "						cc -= 128;"
@@ -81,9 +85,9 @@ END {
 	print "						strcpy(p, \"^?\");"
 	print "					else"
 	print "						sprintf(p, \"%c\", cc);"
-	print "					keyname_table[c] = strdup(name);"
+	print "					MyTable[c] = strdup(name);"
 	print "				}"
-	print "				result = keyname_table[c];"
+	print "				result = MyTable[c];"
 	print "			}"
 	print "#if NCURSES_EXT_FUNCS && NCURSES_XNAMES"
 	print "		} else if (result == 0 && cur_term != 0) {"
@@ -114,8 +118,24 @@ END {
 	print "#if USE_WIDEC_SUPPORT"
 	print "NCURSES_EXPORT(NCURSES_CONST char *) key_name (wchar_t c)"
 	print "{"
-	print "	NCURSES_CONST char *result = keyname((int)c);"
-	print "	if (!strncmp(result, \"M-\", 2)) result = 0;"
+	print "	cchar_t my_cchar;"
+	print "	wchar_t *my_wchars;"
+	print "	size_t len;"
+	print ""
+	print "	/* FIXME: move to _nc_globals */"
+	print "	static char result[MB_LEN_MAX + 1];"
+	print ""
+	print "	memset(&my_cchar, 0, sizeof(my_cchar));"
+	print "	my_cchar.chars[0] = c;"
+	print "	my_cchar.chars[1] = L'\\0';"
+	print ""
+	print "	my_wchars = wunctrl(&my_cchar);"
+	print "	len = wcstombs(result, my_wchars, sizeof(result)-1);"
+	print "	if (isEILSEQ(len) || (len == 0)) {"
+	print "		return \"UNKNOWN KEY\";"
+	print "	}"
+	print ""
+	print "	result[len] = '\\0';"
 	print "	return result;"
 	print "}"
 	print "#endif"
@@ -124,11 +144,11 @@ END {
 	print "void _nc_keyname_leaks(void)"
 	print "{"
 	print "	int j;"
-	print "	if (keyname_table != 0) {"
+	print "	if (MyTable != 0) {"
 	print "		for (j = 0; j < SIZEOF_TABLE; ++j) {"
-	print "			FreeIfNeeded(keyname_table[j]);"
+	print "			FreeIfNeeded(MyTable[j]);"
 	print "		}"
-	print "		FreeAndNull(keyname_table);"
+	print "		FreeAndNull(MyTable);"
 	print "	}"
 	print "}"
 	print "#endif /* NO_LEAKS */"