ncurses 5.7 - patch 20090530

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

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index 760e1b58aba359ba3bf6894480c8f5e286ff42a6..e487038ddafdf27f2c4e44cd3423c084d5def3ab 100644 (file)
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,6 +1,6 @@
-# $Id: MKkeyname.awk,v 1.35 2007/06/09 22:36:10 tom Exp $
+# $Id: MKkeyname.awk,v 1.43 2009/05/09 19:01:49 tom Exp $
 ##############################################################################
-# Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.                #
+# Copyright (c) 1999-2008,2009 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,42 @@ 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 *)"
+       print "safe_keyname (SCREEN *sp, int c)"
        print "{"
        print " int i;"
        print " char name[20];"
@@ -60,12 +78,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 +101,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;"
@@ -90,15 +117,15 @@ END {
        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 "                 TERMTYPE *tp = &(TerminalOf(sp)->type);"
        print "                 int 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;"
@@ -115,30 +142,11 @@ 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 *)"
+       print "keyname (int c)"
        print "{"
-       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 " return safe_keyname (CURRENT_SCREEN, c);"
        print "}"
-       print "#endif"
        print ""
        print "#if NO_LEAKS"
        print "void _nc_keyname_leaks(void)"