ncurses 5.6 - patch 20070609

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

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index 2d449271fd194ed9bd8df085e5581ee6f06d4615..760e1b58aba359ba3bf6894480c8f5e286ff42a6 100644 (file)
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,4 +1,4 @@
-# $Id: MKkeyname.awk,v 1.31 2007/01/06 21:19:44 Miroslav.Lichvar Exp $
+# $Id: MKkeyname.awk,v 1.35 2007/06/09 22:36:10 tom Exp $
 ##############################################################################
 # Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -48,7 +48,7 @@ END {
        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 "{"
@@ -68,13 +68,13 @@ END {
        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;"
@@ -85,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) {"
@@ -118,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"
@@ -128,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 */"