ncurses 5.7 - patch 20090530

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

diff --git a/ncurses/base/MKunctrl.awk b/ncurses/base/MKunctrl.awk
index 1ba511d72323bf2ffcffe39293c2f8cde1ca99c5..2c37d442c9d38e8818bc7066591878ade3d41ac6 100644 (file)
--- a/ncurses/base/MKunctrl.awk
+++ b/ncurses/base/MKunctrl.awk
@@ -1,6 +1,6 @@
-# $Id: MKunctrl.awk,v 1.21 2008/02/03 20:24:30 tom Exp $
+# $Id: MKunctrl.awk,v 1.25 2009/04/18 23:43:49 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-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"), #
@@ -46,9 +46,8 @@ BEGIN {
                print ""
        }
 END    {
-               print "NCURSES_EXPORT(NCURSES_CONST char *) unctrl (register chtype ch)"
+               print "NCURSES_EXPORT(NCURSES_CONST char *) safe_unctrl(SCREEN *sp, chtype ch)"
                print "{"
-
                blob=""
                offset=0
                if (bigstrings) {
@@ -101,6 +100,7 @@ END {
                blob = blob "\"";
 
                print ""
+               printf "#if NCURSES_EXT_FUNCS\n";
                if (bigstrings) {
                        blob = blob "\n/* printable values in 128-255 range */"
                        printf "static const short unctrl_c1[] = {"
@@ -135,6 +135,7 @@ END {
                        }
                }
                print "};"
+               print "#endif /* NCURSES_EXT_FUNCS */"
                blob = blob "\"\n"
 
                print ""
@@ -150,8 +151,8 @@ END {
                print  ""
                print  "\tif (check >= 0 && check < (int)SIZEOF(unctrl_table)) {"
                print  "#if NCURSES_EXT_FUNCS"
-               print  "\t\tif ((SP != 0)"
-               print  "\t\t && (SP->_legacy_coding > 1)"
+               print  "\t\tif ((sp != 0)"
+               print  "\t\t && (sp->_legacy_coding > 1)"
                print  "\t\t && (check >= 128)"
                print  "\t\t && (check < 160))"
                printf "\t\t\tresult = %s_c1[check - 128];\n", stringname;
@@ -159,18 +160,18 @@ END       {
                print  "#if USE_WIDEC_SUPPORT"
                print  "\t\tif ((check >= 160)"
                print  "\t\t && (check < 256)"
-               print  "\t\t && ((SP != 0)"
-               print  "\t\t  && ((SP->_legacy_coding > 0)"
-               print  "\t\t   || (SP->_legacy_coding == 0"
+               print  "\t\t && ((sp != 0)"
+               print  "\t\t  && ((sp->_legacy_coding > 0)"
+               print  "\t\t   || (sp->_legacy_coding == 0"
                print  "\t\t       && (isprint(check) || iswprint(check))))))"
                printf "\t\t\tresult = %s_c1[check - 128];\n", stringname;
                print  "\t\telse"
                print  "#else"
                print  "\t\tif ((check >= 160)"
                print  "\t\t && (check < 256)"
-               print  "\t\t && ((SP != 0)"
-               print  "\t\t  && ((SP->_legacy_coding > 0)"
-               print  "\t\t   || (SP->_legacy_coding == 0"
+               print  "\t\t && ((sp != 0)"
+               print  "\t\t  && ((sp->_legacy_coding > 0)"
+               print  "\t\t   || (sp->_legacy_coding == 0"
                print  "\t\t       && isprint(check)))))"
                printf "\t\t\tresult = %s_c1[check - 128];\n", stringname;
                print  "\t\telse"
@@ -182,4 +183,9 @@ END {
                print  "\t}"
                print  "\treturn (NCURSES_CONST char *)result;"
                print  "}"
+               print  ""
+               print  "NCURSES_EXPORT(NCURSES_CONST char *) unctrl (chtype ch)"
+               print  "{"
+               print  "\treturn safe_unctrl(CURRENT_SCREEN, ch);"
+               print  "}"
        }