ncurses 5.6 - patch 20070421

[ncurses.git] / ncurses / base / MKkeyname.awk

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index 11dcfe5c23755b2080e2e670d86913269b1f1418..b27eb75ab8b6ddbf0f954b375cde2ba62b3bfb7b 100644 (file)
--- 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.32 2007/04/21 23:01:49 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,18 +60,18 @@ 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) {"
@@ -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) {"
@@ -124,11 +128,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 */"