X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2FMKkeyname.awk;h=68903e434a4a4e8f78527ea821d4e34c21205411;hp=9ac65837a519d7f4b248591344135fdfedd90cf6;hb=2c829dd4faf4c7933e06804793e84079300e34e9;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index 9ac65837..68903e43 100644
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,6 +1,6 @@
-# $Id: MKkeyname.awk,v 1.28 2005/04/30 19:26:25 tom Exp $
+# $Id: MKkeyname.awk,v 1.33 2007/05/26 20:58:24 tom Exp $
 ##############################################################################
-# Copyright (c) 1999-2002,2005 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,15 +37,21 @@ 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 "#define MyTable _nc_globals.keyname_table"
 	print ""
 	print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)"
 	print "{"
-	print "	static char **table;"
 	print "	int i;"
 	print "	char name[20];"
 	print "	char *p;"
@@ -54,33 +60,34 @@ 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 < 256)) {"
-	print "			if (table == 0)"
-	print "				table = typeCalloc(char *, 256);"
-	print "			if (table != 0) {"
-	print "				if (table[c] == 0) {"
+	print "		if (result == 0 && (c >= 0 && c < SIZEOF_TABLE)) {"
+	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 (c >= 128) {"
+	print "					if (cc >= 128 && (SP == 0 || SP->_use_meta)) {"
 	print "						strcpy(p, \"M-\");"
 	print "						p += 2;"
-	print "						c -= 128;"
+	print "						cc -= 128;"
 	print "					}"
-	print "					if (c < 32)"
-	print "						sprintf(p, \"^%c\", c + '@');"
-	print "					else if (c == 127)"
+	print "					if (cc < 32)"
+	print "						sprintf(p, \"^%c\", cc + '@');"
+	print "					else if (cc == 127)"
 	print "						strcpy(p, \"^?\");"
 	print "					else"
-	print "						sprintf(p, \"%c\", c);"
-	print "					table[c] = strdup(name);"
+	print "						sprintf(p, \"%c\", cc);"
+	print "					MyTable[c] = strdup(name);"
 	print "				}"
-	print "				result = table[c];"
+	print "				result = MyTable[c];"
 	print "			}"
 	print "#if NCURSES_EXT_FUNCS && NCURSES_XNAMES"
 	print "		} else if (result == 0 && cur_term != 0) {"
@@ -97,6 +104,7 @@ END {
 	print "						break;"
 	print "					}"
 	print "				}"
+	print "				free(bound);"
 	print "				if (result != 0)"
 	print "					break;"
 	print "			}"
@@ -115,4 +123,17 @@ END {
 	print "	return result;"
 	print "}"
 	print "#endif"
+	print ""
+	print "#if NO_LEAKS"
+	print "void _nc_keyname_leaks(void)"
+	print "{"
+	print "	int j;"
+	print "	if (MyTable != 0) {"
+	print "		for (j = 0; j < SIZEOF_TABLE; ++j) {"
+	print "			FreeIfNeeded(MyTable[j]);"
+	print "		}"
+	print "		FreeAndNull(MyTable);"
+	print "	}"
+	print "}"
+	print "#endif /* NO_LEAKS */"
 }