X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2FMKunctrl.awk;h=51ceb6343920d6143ac9e789d893a5be50f44600;hp=5d187a8cfb7e790cbce25253d7a27f0465331950;hb=91fa4688e82518794fcf0c32a36f3fcca5e4c2d5;hpb=03a795bde58b3280a4e9d80029a3b7fec13c79ad

diff --git a/ncurses/base/MKunctrl.awk b/ncurses/base/MKunctrl.awk
index 5d187a8c..51ceb634 100644
--- a/ncurses/base/MKunctrl.awk
+++ b/ncurses/base/MKunctrl.awk
@@ -1,6 +1,6 @@
-# $Id: MKunctrl.awk,v 1.14 2007/07/28 21:13:21 tom Exp $
+# $Id: MKunctrl.awk,v 1.27 2012/06/09 20:29:33 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2009,2012 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"), #
@@ -27,21 +27,21 @@
 # authorization.                                                             #
 ##############################################################################
 #
-# Author: Thomas E. Dickey <dickey@clark.net> 1997
+# Author: Thomas E. Dickey (1997-on)
 #
 
 BEGIN	{
 		print "/* generated by MKunctrl.awk */"
 		print ""
 		print "#include <curses.priv.h>"
+		print "#include <ctype.h>"
 		print ""
 		print "#undef unctrl"
 		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) {
@@ -69,6 +69,12 @@ END	{
 			} else if (ch >= 128 && ch < 160) {
 				part = sprintf("~\\%03o", ch - 64);
 				offset = offset + 3;
+			} else if (ch == 255) {
+				part = "~?";
+				offset = offset + 3;
+			} else if (ch >= 160) {
+				part = sprintf("M-\\%03o", ch - 128);
+				offset = offset + 4;
 			} else {
 				gap = gap " "
 				part = sprintf("\\%03o", ch);
@@ -88,14 +94,14 @@ END	{
 		blob = blob "\"";
 
 		print ""
-		print "#if NCURSES_EXT_FUNCS"
+		printf "#if NCURSES_EXT_FUNCS\n";
 		if (bigstrings) {
-			blob = blob "\n#if NCURSES_EXT_FUNCS"
+			blob = blob "\n/* printable values in 128-255 range */"
 			printf "static const short unctrl_c1[] = {"
 		} else {
 			printf "static const char* const unctrl_c1[] = {"
 		}
-		for ( ch = 128; ch < 160; ch++ ) {
+		for ( ch = 128; ch < 256; ch++ ) {
 			gap = ","
 			if ((ch % 8) == 0) {
 				if (ch != 128)
@@ -111,7 +117,7 @@ END	{
 				if (((ch + 1) % 8) != 0)
 					gap = gap " "
 			} else {
-				if (ch >= 128 && ch < 160) {
+				if (ch >= 128) {
 					printf "\"\\%03o\"", ch
 					gap = gap " "
 				}
@@ -124,7 +130,7 @@ END	{
 		}
 		print "};"
 		print "#endif /* NCURSES_EXT_FUNCS */"
-		blob = blob "\"\n#endif /* NCURSES_EXT_FUNCS */\n"
+		blob = blob "\"\n"
 
 		print ""
 		if (bigstrings) {
@@ -134,22 +140,35 @@ END	{
 		} else {
 			stringname = "unctrl"
 		}
-		print "\tint check = ChCharOf(ch);"
-		print "\tconst char *result;"
-		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\t && (check >= 128)"
-		print "\t\t && (check < 160))"
+		print  "\tint check = (int) ChCharOf(ch);"
+		print  "\tconst char *result;"
+		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\t && (check >= 128)"
+		print  "\t\t && (check < 160))"
 		printf "\t\t\tresult = %s_c1[check - 128];\n", stringname;
-		print "\t\telse"
-		print "#endif /* NCURSES_EXT_FUNCS */"
+		print  "\t\telse"
+		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       && isprint(check)))))"
+		printf "\t\t\tresult = %s_c1[check - 128];\n", stringname;
+		print  "\t\telse"
+		print  "#endif /* NCURSES_EXT_FUNCS */"
 		printf "\t\t\tresult = %s_table[check];\n", stringname;
-		print "\t} else {"
-		print "\t\tresult = 0;"
-		print "\t}"
-		print "\treturn (NCURSES_CONST char *)result;"
-		print "}"
+		print  "\t} else {"
+		print  "\t\tresult = 0;"
+		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  "}"
 	}