ncurses 6.2 - patch 20210213

[ncurses.git] / include / MKterm.h.awk.in

diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index 3c7eb72c1b561c99522e614a368447bab2526ac3..c93cdeac69719c9139db0e33c07a622ec5ae8b6d 100644 (file)
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -60,7 +60,7 @@ BEGIN {
        print  "/*    and: Thomas E. Dickey                        1995-on                  */"
        print  "/****************************************************************************/"
        print  ""
-       print  "/* $Id: MKterm.h.awk.in,v 1.76 2020/05/30 19:24:03 tom Exp $ */"
+       print  "/* $Id: MKterm.h.awk.in,v 1.78 2020/10/31 23:14:24 tom Exp $ */"
        print  ""
        print  "/*"
        print  "**      term.h -- Definition of struct term"
@@ -82,6 +82,24 @@ BEGIN {
        print  " * definition (based on the system for which this was configured)."
        print  " */"
        print  ""
+       print  "#ifndef __NCURSES_H"
+       print  ""
+       print  "typedef struct screen  SCREEN;"
+       print  ""
+       print  "#if @NCURSES_SP_FUNCS@"
+       print  "#undef  NCURSES_SP_FUNCS"
+       print  "#define NCURSES_SP_FUNCS @NCURSES_PATCH@"
+       print  "#undef  NCURSES_SP_NAME"
+       print  "#define NCURSES_SP_NAME(name) name##_sp"
+       print  ""
+       print  "/* Define the sp-funcs helper function */"
+       print  "#undef  NCURSES_SP_OUTC"
+       print  "#define NCURSES_SP_OUTC NCURSES_SP_NAME(NCURSES_OUTC)"
+       print  "typedef int (*NCURSES_SP_OUTC)(SCREEN*, int);"
+       print  "#endif"
+       print  ""
+       print  "#endif /* __NCURSES_H */"
+       print  ""
        print  "#undef  NCURSES_CONST"
        print  "#define NCURSES_CONST @NCURSES_CONST@"
        print  ""
@@ -127,9 +145,14 @@ BEGIN {
        print  ""
        print  "#else /* !HAVE_TERMIO_H */"
        print  ""
-       print  "#if _WIN32"
-       print  "#  include <ncurses_mingw.h>"
-       print  "#  define TTY struct termios"
+       print  "#if (defined(_WIN32) || defined(_WIN64))"
+       print  "#if @EXP_WIN32_DRIVER@"
+       print  "#include <win32_curses.h>"
+       print  "#define TTY struct winconmode"
+       print  "#else"
+       print  "#include <ncurses_mingw.h>"
+       print  "#define TTY struct termios"
+       print  "#endif"
        print  "#else"
        print  "#undef TERMIOS"
        print  "#include <sgtty.h>"
@@ -143,6 +166,9 @@ BEGIN {
        print  "#ifdef TERMIOS"
        print  "#define GET_TTY(fd, buf) tcgetattr(fd, buf)"
        print  "#define SET_TTY(fd, buf) tcsetattr(fd, TCSADRAIN, buf)"
+       print  "#elif @EXP_WIN32_DRIVER@ && (defined(_WIN32) || defined(_WIN64))"
+       print  "#define GET_TTY(fd, buf) _nc_console_getmode(_nc_console_fd2handle(fd),buf)"
+       print  "#define SET_TTY(fd, buf) _nc_console_setmode(_nc_console_fd2handle(fd),buf)"
        print  "#else"
        print  "#define GET_TTY(fd, buf) gtty(fd, buf)"
        print  "#define SET_TTY(fd, buf) stty(fd, buf)"