X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=include%2FMKterm.h.awk.in;h=a030c2510fd075395751dbf4596adb346c14085c;hp=9f635d65bc865bc7b315c93db60b87ac391a0c01;hb=3eda6f30a84d53844d2ebceadb457e2e7e9cfbf3;hpb=049beef99ef979a45484cba9b56344acbd2f058c

diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index 9f635d65..a030c251 100644
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -1,7 +1,7 @@
 # vile:awkmode
 BEGIN		{
 		    print  "/****************************************************************************"
-		    print  " * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *"
+		    print  " * Copyright (c) 1998-2013,2017 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            *"
@@ -34,7 +34,7 @@ BEGIN		{
 		    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
 		    print  "/****************************************************************************/"
 		    print  ""
-		    print  "/* $Id: MKterm.h.awk.in,v 1.55 2009/04/25 18:02:27 tom Exp $ */"
+		    print  "/* $Id: MKterm.h.awk.in,v 1.65 2017/03/18 20:05:53 tom Exp $ */"
 		    print  ""
 		    print  "/*"
 		    print  "**	term.h -- Definition of struct term"
@@ -62,6 +62,12 @@ BEGIN		{
 		    print  "#undef  NCURSES_SBOOL"
 		    print  "#define NCURSES_SBOOL @NCURSES_SBOOL@"
 		    print  ""
+		    print  "#undef  NCURSES_USE_DATABASE"
+		    print  "#define NCURSES_USE_DATABASE @NCURSES_USE_DATABASE@"
+		    print  ""
+		    print  "#undef  NCURSES_USE_TERMCAP"
+		    print  "#define NCURSES_USE_TERMCAP @NCURSES_USE_TERMCAP@"
+		    print  ""
 		    print  "#undef  NCURSES_XNAMES"
 		    print  "#define NCURSES_XNAMES @NCURSES_XNAMES@"
 		    print  ""
@@ -93,41 +99,6 @@ BEGIN		{
 		    print  "#include <termio.h>"
 		    print  "#define TTY struct termio"
 		    print  ""
-		    print  "/* Add definitions to make termio look like termios."
-		    print  " * But ifdef it, since there are some implementations"
-		    print  " * that try to do this for us in a fake <termio.h>."
-		    print  " */"
-		    print  "#ifndef TCSANOW"
-		    print  "#define TCSANOW TCSETA"
-		    print  "#endif"
-		    print  "#ifndef TCSADRAIN"
-		    print  "#define TCSADRAIN TCSETAW"
-		    print  "#endif"
-		    print  "#ifndef TCSAFLUSH"
-		    print  "#define TCSAFLUSH TCSETAF"
-		    print  "#endif"
-		    print  "#ifndef tcsetattr"
-		    print  "#define tcsetattr(fd, cmd, arg) ioctl(fd, cmd, arg)"
-		    print  "#endif"
-		    print  "#ifndef tcgetattr"
-		    print  "#define tcgetattr(fd, arg) ioctl(fd, TCGETA, arg)"
-		    print  "#endif"
-		    print  "#ifndef cfgetospeed"
-		    print  "#define cfgetospeed(t) ((t)->c_cflag & CBAUD)"
-		    print  "#endif"
-		    print  "#ifndef TCIFLUSH "
-		    print  "#define TCIFLUSH 0"
-		    print  "#endif"
-		    print  "#ifndef TCOFLUSH "
-		    print  "#define TCOFLUSH 1"
-		    print  "#endif"
-		    print  "#ifndef TCIOFLUSH "
-		    print  "#define TCIOFLUSH 2"
-		    print  "#endif"
-		    print  "#ifndef tcflush"
-		    print  "#define tcflush(fd, arg) ioctl(fd, TCFLSH, arg)"
-		    print  "#endif"
-		    print  ""
 		    print  "#else /* !HAVE_TERMIO_H */"
 		    print  ""
 		    print  "#if __MINGW32__"
@@ -153,7 +124,8 @@ BEGIN		{
 		    print  ""
 		    print  "#define NAMESIZE 256"
 		    print  ""
-		    print  "#define CUR cur_term->type."
+		    print  "/* The cast works because TERMTYPE is the first data in TERMINAL */"
+		    print  "#define CUR ((TERMTYPE *)(cur_term))->"
 		    print  ""
 		}
 
@@ -223,14 +195,24 @@ END		{
 			print  ""
 			print  "} TERMTYPE;"
 			print  ""
+			print  "/*"
+			print  " * The only reason these structures are visible is for read-only use."
+			print  " * Programs which modify the data are not, never were, portable across"
+			print  " * curses implementations."
+			print  " */"
+			print  "#ifdef NCURSES_INTERNALS"
 			print  "typedef struct term {		/* describe an actual terminal */"
 			print  "    TERMTYPE	type;		/* terminal type description */"
 			print  "    short	Filedes;	/* file description being written to */"
-			print  "    TTY		Ottyb,		/* original state of the terminal */"
-			print  "		Nttyb;		/* current state of the terminal */"
+			print  "    TTY		Ottyb;		/* original state of the terminal */"
+			print  "    TTY		Nttyb;		/* current state of the terminal */"
 			print  "    int		_baudrate;	/* used to compute padding */"
-			print  "    char *      _termname;      /* used for termname() */"
+			print  "    char *	_termname;	/* used for termname() */"
 			print  "} TERMINAL;"
+			print  "#else"
+			print  "typedef struct term TERMINAL;"
+			print  "#endif /* NCURSES_INTERNALS */"
+			print  ""
 			print  ""
 			print  "#if @BROKEN_LINKER@ && !@cf_cv_enable_reentrant@"
 			print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
@@ -276,17 +258,28 @@ END		{
 			print  ""
 			print  "#endif"
 			print  ""
-			print  "/* internals */"
+			print  "/*"
+			print  " * These entrypoints are used only by the ncurses utilities such as tic."
+			print  " */"
+			print  "#ifdef NCURSES_INTERNALS"
+			print  ""
 			print  "extern NCURSES_EXPORT(int) _nc_set_tty_mode (TTY *buf);"
-			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(void) _nc_init_termtype (TERMTYPE *const);"
 			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  ""
+			print  "#endif /* NCURSES_INTERNALS */"
+			print  ""
+			print  ""
+			print  "/*"
+			print  " * These entrypoints are used by tack."
+			print  " */"
 			print  "extern NCURSES_EXPORT(const TERMTYPE *) _nc_fallback (const char *);"
+			print  "extern NCURSES_EXPORT(int) _nc_read_entry (const char * const, char * const, TERMTYPE *const);"
 			print  ""
-			print  "/* entry points */"
+			print  "/* Normal entry points */"
 			print  "extern NCURSES_EXPORT(TERMINAL *) set_curterm (TERMINAL *);"
 			print  "extern NCURSES_EXPORT(int) del_curterm (TERMINAL *);"
 			print  ""
@@ -309,6 +302,8 @@ END		{
 			print  "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */"
 			print  "#endif"
 			print  ""
+			print  "extern NCURSES_EXPORT(char *) tiparm (const char *, ...);		/* special */"
+			print  ""
 			print  "#endif /* __NCURSES_H */"
 			print  ""
 			print  "/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */"
@@ -344,10 +339,12 @@ END		{
 			print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetent) (SCREEN*, char *, const char *);"
 			print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetflag) (SCREEN*, NCURSES_CONST char *);"
 			print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetnum) (SCREEN*, NCURSES_CONST char *);"
-			print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tputs) (SCREEN*, const char *, int, int (*)(int));"
+			print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tputs) (SCREEN*, const char *, int, NCURSES_SP_OUTC);"
 			print  ""
 			print  "extern NCURSES_EXPORT(TERMINAL *) NCURSES_SP_NAME(set_curterm) (SCREEN*, TERMINAL *);"
 			print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(del_curterm) (SCREEN*, TERMINAL *);"
+			print  ""
+			print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(restartterm) (SCREEN*, NCURSES_CONST char *, int, int *);"
 			print  "#endif /* NCURSES_SP_FUNCS */"
 			print  ""
 			print  "#ifdef __cplusplus"