X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=include%2FMKterm.h.awk.in;h=c0e826bf6eb25f699fec6dd793cc15877a7f5559;hp=8243aea52dbef8cfd3cf8641d949ac6a7438b813;hb=fc79b49bd8a9c5e4db287514cdac46e1691cf48a;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01;ds=sidebyside

diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index 8243aea5..c0e826bf 100644
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -1,6 +1,7 @@
+# vile:awkmode
 BEGIN		{
 		    print  "/****************************************************************************"
-		    print  " * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc.         *"
+		    print  " * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *"
 		    print  " *                                                                          *"
 		    print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
 		    print  " * copy of this software and associated documentation files (the            *"
@@ -30,9 +31,10 @@ BEGIN		{
 		    print  "/****************************************************************************/"
 		    print  "/* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995                */"
 		    print  "/*    and: Eric S. Raymond <esr@snark.thyrsus.com>                          */"
+		    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
 		    print  "/****************************************************************************/"
 		    print  ""
-		    print  "/* $Id: MKterm.h.awk.in,v 1.41 2001/12/23 01:04:38 tom Exp $ */"
+		    print  "/* $Id: MKterm.h.awk.in,v 1.53 2009/02/28 21:27:45 tom Exp $ */"
 		    print  ""
 		    print  "/*"
 		    print  "**	term.h -- Definition of struct term"
@@ -54,15 +56,12 @@ BEGIN		{
 		    print  " * definition (based on the system for which this was configured)."
 		    print  " */"
 		    print  ""
-		    print  "#undef  HAVE_TERMIOS_H"
-		    print  "#define HAVE_TERMIOS_H 1/*default*/"
-		    print  ""
-		    print  "#undef  HAVE_TCGETATTR"
-		    print  "#define HAVE_TCGETATTR 1/*default*/"
-		    print  ""
 		    print  "#undef  NCURSES_CONST"
 		    print  "#define NCURSES_CONST @NCURSES_CONST@"
 		    print  ""
+		    print  "#undef  NCURSES_SBOOL"
+		    print  "#define NCURSES_SBOOL @NCURSES_SBOOL@"
+		    print  ""
 		    print  "#undef  NCURSES_XNAMES"
 		    print  "#define NCURSES_XNAMES @NCURSES_XNAMES@"
 		    print  ""
@@ -74,7 +73,8 @@ BEGIN		{
 		    print  "#undef  GET_TTY"
 		    print  ""
 		    print  "/* Assume POSIX termio if we have the header and function */"
-		    print  "#if HAVE_TERMIOS_H && HAVE_TCGETATTR"
+		    print  "/* #if HAVE_TERMIOS_H && HAVE_TCGETATTR */"
+		    print  "#if @HAVE_TERMIOS_H@ && @HAVE_TCGETATTR@"
 		    print  ""
 		    print  "#undef  TERMIOS"
 		    print  "#define TERMIOS 1"
@@ -84,7 +84,8 @@ BEGIN		{
 		    print  ""
 		    print  "#else /* !HAVE_TERMIOS_H */"
 		    print  ""
-		    print  "#if HAVE_TERMIO_H"
+		    print  "/* #if HAVE_TERMIO_H */"
+		    print  "#if @HAVE_TERMIO_H@"
 		    print  ""
 		    print  "#undef  TERMIOS"
 		    print  "#define TERMIOS 1"
@@ -199,7 +200,7 @@ END		{
 			print  "typedef struct termtype {	/* in-core form of terminfo data */"
 			print  "    char  *term_names;		/* str_table offset of term names */"
 			print  "    char  *str_table;		/* pointer to string table */"
-			print  "    char  *Booleans;		/* array of boolean values */"
+			print  "    NCURSES_SBOOL  *Booleans;	/* array of boolean values */"
 			print  "    short *Numbers;		/* array of integer values */"
 			print  "    char  **Strings;		/* array of string offsets */"
 			print  ""
@@ -224,30 +225,38 @@ END		{
 			print  "    TTY		Ottyb,		/* original state of the terminal */"
 			print  "		Nttyb;		/* current state of the terminal */"
 			print  "    int		_baudrate;	/* used to compute padding */"
+			print  "    char *      _termname;      /* used for termname() */"
 			print  "} TERMINAL;"
 			print  ""
+			print  "#if @BROKEN_LINKER@ && !@cf_cv_enable_reentrant@"
+			print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
+			print  "#elif @cf_cv_enable_reentrant@"
+			print  "NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);"
+			print  "#define cur_term   NCURSES_PUBLIC_VAR(cur_term())"
+			print  "#else"
 			print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
+			print  "#endif"
 			print  ""
-			print  "#if BROKEN_LINKER"
-			print  "#define boolnames  _nc_boolnames()"
-			print  "#define boolcodes  _nc_boolcodes()"
-			print  "#define boolfnames _nc_boolfnames()"
-			print  "#define numnames   _nc_numnames()"
-			print  "#define numcodes   _nc_numcodes()"
-			print  "#define numfnames  _nc_numfnames()"
-			print  "#define strnames   _nc_strnames()"
-			print  "#define strcodes   _nc_strcodes()"
-			print  "#define strfnames  _nc_strfnames()"
+			print  "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@"
+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);"
+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);"
+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);"
+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numnames);"
+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numcodes);"
+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numfnames);"
+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strnames);"
+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);"
+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);"
 			print  ""
-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolnames (void);"
-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolcodes (void);"
-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolfnames (void);"
-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numnames (void);"
-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numcodes (void);"
-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numfnames (void);"
-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strnames (void);"
-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strcodes (void);"
-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strfnames (void);"
+			print  "#define boolnames  NCURSES_PUBLIC_VAR(boolnames())"
+			print  "#define boolcodes  NCURSES_PUBLIC_VAR(boolcodes())"
+			print  "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())"
+			print  "#define numnames   NCURSES_PUBLIC_VAR(numnames())"
+			print  "#define numcodes   NCURSES_PUBLIC_VAR(numcodes())"
+			print  "#define numfnames  NCURSES_PUBLIC_VAR(numfnames())"
+			print  "#define strnames   NCURSES_PUBLIC_VAR(strnames())"
+			print  "#define strcodes   NCURSES_PUBLIC_VAR(strcodes())"
+			print  "#define strfnames  NCURSES_PUBLIC_VAR(strfnames())"
 			print  ""
 			print  "#else"
 			print  ""
@@ -268,9 +277,9 @@ END		{
 			print  "extern NCURSES_EXPORT(int) _nc_get_tty_mode (TTY *buf);"
 			print  "extern NCURSES_EXPORT(int) _nc_read_entry (const char * const, char * const, TERMTYPE *const);"
 			print  "extern NCURSES_EXPORT(int) _nc_read_file_entry (const char *const, TERMTYPE *);"
+			print  "extern NCURSES_EXPORT(int) _nc_read_termtype (TERMTYPE *, char *, int);"
 			print  "extern NCURSES_EXPORT(char *) _nc_first_name (const char *const);"
 			print  "extern NCURSES_EXPORT(int) _nc_name_match (const char *const, const char *const, const char *const);"
-			print  "extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE *const);"
 			print  "extern NCURSES_EXPORT(const TERMTYPE *) _nc_fallback (const char *);"
 			print  ""
 			print  "/* entry points */"
@@ -284,11 +293,18 @@ END		{
 			print  "/* terminfo entry points, also declared in curses.h */"
 			print  "#if !defined(__NCURSES_H)"
 			print  "extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *);"
-			print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);"
 			print  "extern NCURSES_EXPORT_VAR(char) ttytype[];"
 			print  "extern NCURSES_EXPORT(int) putp (const char *);"
 			print  "extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *);"
 			print  "extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);"
+			print  ""
+			print  "#if @NCURSES_TPARM_VARARGS@ /* NCURSES_TPARM_VARARGS */"
+			print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */"
+			print  "#else"
+			print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */"
+			print  "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */"
+			print  "#endif"
+			print  ""
 			print  "#endif /* __NCURSES_H */"
 			print  ""
 			print  "/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */"