ncurses 5.9 - patch 20141220

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

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index 64bbef461eb6ef7b08f5d1e14a10984b3dbce897..7901611931698cadf870a0b7d8943f53f745113c 100644 (file)
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,6 +1,6 @@
-# $Id: MKkeyname.awk,v 1.37 2007/07/28 21:47:21 tom Exp $
+# $Id: MKkeyname.awk,v 1.48 2013/08/24 17:37:22 tom Exp $
 ##############################################################################
-# Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.                #
+# Copyright (c) 1999-2012,2013 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"), #
@@ -31,7 +31,6 @@ BEGIN {
        print ""
        print "#include <curses.priv.h>"
        print "#include <tic.h>"
-       print "#include <term_entry.h>"
        print ""
        first = 1;
 }
@@ -39,7 +38,7 @@ BEGIN {
 /^[^#]/ {
                if (bigstrings) {
                        if (first)  {
-                               print "struct kn { int offset; int code; };"
+                               print "struct kn { short offset; int code; };"
                                print "static const struct kn _nc_key_names[] = {"
                        }
                        printf "\t{ %d, %s },\n", offset, $1
@@ -66,8 +65,10 @@ END {
        print ""
        print "#define SIZEOF_TABLE 256"
        print "#define MyTable _nc_globals.keyname_table"
+       print "#define MyInit  _nc_globals.init_keyname"
        print ""
-       print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)"
+       print "NCURSES_EXPORT(NCURSES_CONST char *)"
+       print "safe_keyname (SCREEN *sp, int c)"
        print "{"
        print " int i;"
        print " char name[20];"
@@ -96,35 +97,50 @@ END {
        print "         if (result == 0 && (c >= 0 && c < SIZEOF_TABLE)) {"
        print "                 if (MyTable == 0)"
        print "                         MyTable = typeCalloc(char *, SIZEOF_TABLE);"
+       print ""
        print "                 if (MyTable != 0) {"
+       print "                         int m_prefix = (sp == 0 || sp->_use_meta);"
+       print ""
+       print "                         /* if sense of meta() changed, discard cached data */"
+       print "                         if (MyInit != (m_prefix + 1)) {"
+       print "                                 MyInit = m_prefix + 1;"
+       print "                                 for (i = 0; i < SIZEOF_TABLE; ++i) {"
+       print "                                         if (MyTable[i]) {"
+       print "                                                 FreeAndNull(MyTable[i]);"
+       print "                                         }"
+       print "                                 }"
+       print "                         }"
+       print ""
+       print "                         /* create and cache result as needed */"
        print "                         if (MyTable[c] == 0) {"
        print "                                 int cc = c;"
        print "                                 p = name;"
-       print "                                 if (cc >= 128 && (SP == 0 || SP->_use_meta)) {"
-       print "                                         strcpy(p, \"M-\");"
+       print "#define P_LIMIT (sizeof(name) - (size_t) (p - name))"
+       print "                                 if (cc >= 128 && m_prefix) {"
+       print "                                         _nc_STRCPY(p, \"M-\", P_LIMIT);"
        print "                                         p += 2;"
        print "                                         cc -= 128;"
        print "                                 }"
        print "                                 if (cc < 32)"
-       print "                                         sprintf(p, \"^%c\", cc + '@');"
+       print "                                         _nc_SPRINTF(p, _nc_SLIMIT(P_LIMIT) \"^%c\", cc + '@');"
        print "                                 else if (cc == 127)"
-       print "                                         strcpy(p, \"^?\");"
+       print "                                         _nc_STRCPY(p, \"^?\", P_LIMIT);"
        print "                                 else"
-       print "                                         sprintf(p, \"%c\", cc);"
+       print "                                         _nc_SPRINTF(p, _nc_SLIMIT(P_LIMIT) \"%c\", cc);"
        print "                                 MyTable[c] = strdup(name);"
        print "                         }"
        print "                         result = MyTable[c];"
        print "                 }"
        print "#if NCURSES_EXT_FUNCS && NCURSES_XNAMES"
-       print "         } else if (result == 0 && cur_term != 0) {"
+       print "         } else if (result == 0 && HasTerminal(sp)) {"
        print "                 int j, k;"
        print "                 char * bound;"
-       print "                 TERMTYPE *tp = &(cur_term->type);"
-       print "                 int save_trace = _nc_tracing;"
+       print "                 TERMTYPE *tp = &(TerminalOf(sp)->type);"
+       print "                 unsigned save_trace = _nc_tracing;"
        print ""
        print "                 _nc_tracing = 0;        /* prevent recursion via keybound() */"
-       print "                 for (j = 0; (bound = keybound(c, j)) != 0; ++j) {"
-       print "                         for(k = STRCOUNT; k < NUM_STRINGS(tp);  k++) {"
+       print "                 for (j = 0; (bound = NCURSES_SP_NAME(keybound)(NCURSES_SP_ARGx c, j)) != 0; ++j) {"
+       print "                         for(k = STRCOUNT; k < (int) NUM_STRINGS(tp);  k++) {"
        print "                                 if (tp->Strings[k] != 0 && !strcmp(bound, tp->Strings[k])) {"
        print "                                         result = ExtStrname(tp, k, strnames);"
        print "                                         break;"
@@ -141,6 +157,12 @@ END {
        print " return result;"
        print "}"
        print ""
+       print "NCURSES_EXPORT(NCURSES_CONST char *)"
+       print "keyname (int c)"
+       print "{"
+       print " return safe_keyname (CURRENT_SCREEN, c);"
+       print "}"
+       print ""
        print "#if NO_LEAKS"
        print "void _nc_keyname_leaks(void)"
        print "{"