ncurses 5.6 - patch 20080531

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

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index 68903e434a4a4e8f78527ea821d4e34c21205411..5711fb85dd442515e5c64d3412be44f84db4b024 100644 (file)
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,6 +1,6 @@
-# $Id: MKkeyname.awk,v 1.33 2007/05/26 20:58:24 tom Exp $
+# $Id: MKkeyname.awk,v 1.39 2008/05/31 19:54:58 tom Exp $
 ##############################################################################
-# Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.                #
+# Copyright (c) 1999-2007,2008 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"), #
@@ -33,24 +33,41 @@ 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"
        print ""
-       print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)"
+       print "NCURSES_EXPORT(NCURSES_CONST char *) _nc_keyname (SCREEN *sp, int c)"
        print "{"
        print " int i;"
        print " char name[20];"
@@ -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)"
@@ -74,7 +100,7 @@ END {
        print "                         if (MyTable[c] == 0) {"
        print "                                 int cc = c;"
        print "                                 p = name;"
-       print "                                 if (cc >= 128 && (SP == 0 || SP->_use_meta)) {"
+       print "                                 if (cc >= 128 && (sp == 0 || sp->_use_meta)) {"
        print "                                         strcpy(p, \"M-\");"
        print "                                         p += 2;"
        print "                                         cc -= 128;"
@@ -115,14 +141,10 @@ END {
        print " return result;"
        print "}"
        print ""
-       print "#if USE_WIDEC_SUPPORT"
-       print "NCURSES_EXPORT(NCURSES_CONST char *) key_name (wchar_t c)"
+       print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)"
        print "{"
-       print " NCURSES_CONST char *result = keyname((int)c);"
-       print " if (!strncmp(result, \"M-\", 2)) result = 0;"
-       print " return result;"
+       print "\treturn _nc_keyname(SP, c);"
        print "}"
-       print "#endif"
        print ""
        print "#if NO_LEAKS"
        print "void _nc_keyname_leaks(void)"