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

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index 760e1b58..c1d94750 100644
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,4 +1,4 @@
-# $Id: MKkeyname.awk,v 1.35 2007/06/09 22:36:10 tom Exp $
+# $Id: MKkeyname.awk,v 1.38 2007/08/18 18:41:18 tom Exp $
 ##############################################################################
 # Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -33,19 +33,36 @@ BEGIN {
 	print "#include <tic.h>"
 	print "#include <term_entry.h>"
 	print ""
-	print "const struct kn _nc_key_names[] = {"
+	first = 1;
 }
 
 /^[^#]/ {
-	printf "\t{ %d, %s },\n", offset, $1
-	offset += length($1) + 1
-	names = names"\n\t\""$1"\\0\""
+		if (bigstrings) {
+			if (first)  {
+				print "struct kn { short offset; int code; };"
+				print "static const struct kn _nc_key_names[] = {"
+			}
+			printf "\t{ %d, %s },\n", offset, $1
+			offset += length($1) + 1
+			names = names"\n\t\""$1"\\0\""
+		} else {
+			if (first) {
+				print "struct kn { const char *name; int code; };"
+				print "static const struct kn _nc_key_names[] = {"
+			}
+			printf "\t{ \"%s\", %s },\n", $1, $1;
+		}
+		first = 0;
 	}
 
 END {
-	printf "\t{ -1, 0 }};\n"
-	print ""
-	print "static const char key_names[] = "names";"
+	if (bigstrings) {
+		printf "\t{ -1, 0 }};\n"
+		print ""
+		print "static const char key_names[] = "names";"
+	} else {
+		printf "\t{ 0, 0 }};\n"
+	}
 	print ""
 	print "#define SIZEOF_TABLE 256"
 	print "#define MyTable _nc_globals.keyname_table"
@@ -60,12 +77,21 @@ END {
 	print "	if (c == -1) {"
 	print "		result = \"-1\";"
 	print "	} else {"
-	print "		for (i = 0; _nc_key_names[i].offset != -1; i++) {"
-	print "			if (_nc_key_names[i].code == c) {"
-	print "				result = (NCURSES_CONST char *)key_names + _nc_key_names[i].offset;"
-	print "				break;"
-	print "			}"
-	print "		}"
+	if (bigstrings) {
+		print "		for (i = 0; _nc_key_names[i].offset != -1; i++) {"
+		print "			if (_nc_key_names[i].code == c) {"
+		print "				result = (NCURSES_CONST char *)key_names + _nc_key_names[i].offset;"
+		print "				break;"
+		print "			}"
+		print "		}"
+	} else {
+		print "		for (i = 0; _nc_key_names[i].name != 0; i++) {"
+		print "			if (_nc_key_names[i].code == c) {"
+		print "				result = (NCURSES_CONST char *)_nc_key_names[i].name;"
+		print "				break;"
+		print "			}"
+		print "		}"
+	}
 	print ""
 	print "		if (result == 0 && (c >= 0 && c < SIZEOF_TABLE)) {"
 	print "			if (MyTable == 0)"
@@ -115,31 +141,6 @@ END {
 	print "	return result;"
 	print "}"
 	print ""
-	print "#if USE_WIDEC_SUPPORT"
-	print "NCURSES_EXPORT(NCURSES_CONST char *) key_name (wchar_t c)"
-	print "{"
-	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"
-	print ""
 	print "#if NO_LEAKS"
 	print "void _nc_keyname_leaks(void)"
 	print "{"