X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2FMKunctrl.awk;h=2140900e8c3be185b4df4f959f2bc71005c36fe4;hp=78ab53d3563e2ae0c78b8468ff4116058ee851a6;hb=c04d54322f7835ed42e597967d8fa5471025fcac;hpb=7eb4be765b131f00ac3da7ce8cfd3bc6759d26c5 diff --git a/ncurses/base/MKunctrl.awk b/ncurses/base/MKunctrl.awk index 78ab53d3..2140900e 100644 --- a/ncurses/base/MKunctrl.awk +++ b/ncurses/base/MKunctrl.awk @@ -1,6 +1,6 @@ -# $Id: MKunctrl.awk,v 1.13 2007/01/06 22:52:02 tom Exp $ +# $Id: MKunctrl.awk,v 1.26 2009/07/04 22:05:15 Clemens.Ladisch Exp $ ############################################################################## -# Copyright (c) 1998-2006,2007 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"), # @@ -27,24 +27,28 @@ # authorization. # ############################################################################## # -# Author: Thomas E. Dickey 1997 +# Author: Thomas E. Dickey (1997-on) # BEGIN { print "/* generated by MKunctrl.awk */" print "" print "#include " + print "#include " 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 - printf "static const short unctrl_table[] = {" + if (bigstrings) { + printf "static const short unctrl_table[] = {" + } else { + printf "static const char* const unctrl_table[] = {" + } for ( ch = 0; ch < 256; ch++ ) { gap = "," part="" @@ -54,35 +58,50 @@ END { blob = blob "\"" blob = blob "\n \"" } - printf "%4d%s", offset, gap; + if (bigstrings) + printf "%4d%s", offset, gap; if (ch < 32) { - part = sprintf ("^\\%03o\\0", ch + 64); + part = sprintf ("^\\%03o", ch + 64); offset = offset + 3; } else if (ch == 127) { - part = "^?\\0"; + part = "^?"; offset = offset + 3; } else if (ch >= 128 && ch < 160) { - part = sprintf("~\\%03o\\0", ch - 64); + 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\\0", ch); + part = sprintf("\\%03o", ch); offset = offset + 2; } - blob = blob part if (ch == 255) gap = "\n" else if (((ch + 1) % 8) != 0) gap = gap " " + if (bigstrings) { + blob = blob part "\\0"; + } else { + printf "\"%s\"%s", part, gap + } } print "};" blob = blob "\""; print "" - print "#if NCURSES_EXT_FUNCS" - blob = blob "\n#if NCURSES_EXT_FUNCS" - printf "static const short unctrl_c1[] = {" - for ( ch = 128; ch < 160; ch++ ) { + printf "#if NCURSES_EXT_FUNCS\n"; + if (bigstrings) { + 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 < 256; ch++ ) { gap = "," if ((ch % 8) == 0) { if (ch != 128) @@ -90,36 +109,66 @@ END { printf "\n " blob = blob "\n \"" } - printf "%4d%s", offset, gap; - part = sprintf("\\%03o\\0", ch); - blob = blob part - offset = offset + 2; - if (((ch + 1) % 8) != 0) - gap = gap " " + if (bigstrings) { + printf "%4d%s", offset, gap; + part = sprintf("\\%03o\\0", ch); + blob = blob part + offset = offset + 2; + if (((ch + 1) % 8) != 0) + gap = gap " " + } else { + if (ch >= 128) { + printf "\"\\%03o\"", ch + gap = gap " " + } + if (ch == 255) + gap = "\n" + else if (((ch + 1) % 8) != 0) + gap = gap " " + printf "%s", gap + } } print "};" print "#endif /* NCURSES_EXT_FUNCS */" - blob = blob "\"\n#endif /* NCURSES_EXT_FUNCS */\n" + blob = blob "\"\n" print "" - print "static const char unctrl_blob[] = "blob";" - print "" - 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 "\t\t\tresult = unctrl_blob + unctrl_c1[check - 128];" - print "\t\telse" - print "#endif /* NCURSES_EXT_FUNCS */" - print "\t\t\tresult = unctrl_blob + unctrl_table[check];" - print "\t} else {" - print "\t\tresult = 0;" - print "\t}" - print "\treturn (NCURSES_CONST char *)result;" - print "}" + if (bigstrings) { + print "static const char unctrl_blob[] = "blob";" + print "" + stringname = "unctrl_blob + unctrl" + } 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))" + printf "\t\t\tresult = %s_c1[check - 128];\n", stringname; + 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 "" + print "NCURSES_EXPORT(NCURSES_CONST char *) unctrl (chtype ch)" + print "{" + print "\treturn safe_unctrl(CURRENT_SCREEN, ch);" + print "}" }