X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Fbase%2FMKkeyname.awk;h=e487038ddafdf27f2c4e44cd3423c084d5def3ab;hb=f36e772702d4b512a4395e2db96470803485b6df;hp=19ca2dd9855bea65a627198d7e5539537627217f;hpb=78e49873c69dc0494bb34c62f897f8b446584a33;p=ncurses.git

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index 19ca2dd9..e487038d 100644
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,4 +1,4 @@
-# $Id: MKkeyname.awk,v 1.41 2009/02/15 00:24:58 tom Exp $
+# $Id: MKkeyname.awk,v 1.43 2009/05/09 19:01:49 tom Exp $
 ##############################################################################
 # Copyright (c) 1999-2008,2009 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -67,7 +67,8 @@ END {
 	print "#define SIZEOF_TABLE 256"
 	print "#define MyTable _nc_globals.keyname_table"
 	print ""
-	print "NCURSES_EXPORT(NCURSES_CONST char *) _nc_keyname (SCREEN *sp, int c)"
+	print "NCURSES_EXPORT(NCURSES_CONST char *)"
+	print "safe_keyname (SCREEN *sp, int c)"
 	print "{"
 	print "	int i;"
 	print "	char name[20];"
@@ -116,14 +117,14 @@ 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 (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);"
@@ -142,18 +143,10 @@ END {
 	print "}"
 	print ""
 	print "NCURSES_EXPORT(NCURSES_CONST char *)"
-	print "NCURSES_SP_NAME(keyname) (NCURSES_SP_DCLx int c)"
-	print "{"
-	print "\treturn _nc_keyname(SP_PARM, c);"
-	print "}"
-	print ""
-	print "#if NCURSES_SP_FUNCS"
-	print "NCURSES_EXPORT(NCURSES_CONST char *)"
 	print "keyname (int c)"
 	print "{"
-	print "	return NCURSES_SP_NAME(keyname) (CURRENT_SCREEN, c);"
+	print "	return safe_keyname (CURRENT_SCREEN, c);"
 	print "}"
-	print "#endif"
 	print ""
 	print "#if NO_LEAKS"
 	print "void _nc_keyname_leaks(void)"