ncurses 6.0 - patch 20160618

[ncurses.git] / ncurses / base / lib_restart.c

diff --git a/ncurses/base/lib_restart.c b/ncurses/base/lib_restart.c
index da770d4e7c9266c1f27c5c3d64926707e216b7a1..5bfb0788266d0d89cafff7128b99f5fc412ec741 100644 (file)
--- a/ncurses/base/lib_restart.c
+++ b/ncurses/base/lib_restart.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2015 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            *
@@ -30,6 +30,7 @@
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  *     and: Thomas E. Dickey                        1996-on                 *
+ *     and: Juergen Pfeifer                         2008                    *
  ****************************************************************************/
 
 /*
@@ -40,53 +41,63 @@
 
 #include <curses.priv.h>
 
-#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
-#define _POSIX_SOURCE
-#endif
-
-#include <term.h>              /* lines, columns, cur_term */
-
-MODULE_ID("$Id: lib_restart.c,v 1.10 2008/06/21 17:31:22 tom Exp $")
+MODULE_ID("$Id: lib_restart.c,v 1.16 2015/06/27 18:12:15 tom Exp $")
 
 NCURSES_EXPORT(int)
-restartterm(NCURSES_CONST char *termp, int filenum, int *errret)
+NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
+                             NCURSES_CONST char *termp,
+                             int filenum,
+                             int *errret)
 {
     int result;
+#ifdef USE_TERM_DRIVER
+    TERMINAL *new_term = 0;
+#endif
 
-    T((T_CALLED("restartterm(%s,%d,%p)"), termp, filenum, errret));
+    START_TRACE();
+    T((T_CALLED("restartterm(%p,%s,%d,%p)"),
+       (void *) SP_PARM,
+       termp,
+       filenum,
+       (void *) errret));
 
-    if (setupterm(termp, filenum, errret) != OK) {
+    if (TINFO_SETUP_TERM(&new_term, termp, filenum, errret, FALSE) != OK) {
        result = ERR;
-    } else if (SP != 0) {
-       int saveecho = SP->_echo;
-       int savecbreak = SP->_cbreak;
-       int saveraw = SP->_raw;
-       int savenl = SP->_nl;
+    } else if (SP_PARM != 0) {
+       int saveecho = SP_PARM->_echo;
+       int savecbreak = SP_PARM->_cbreak;
+       int saveraw = SP_PARM->_raw;
+       int savenl = SP_PARM->_nl;
 
-       if (saveecho)
-           echo();
-       else
-           noecho();
+#ifdef USE_TERM_DRIVER
+       SP_PARM->_term = new_term;
+#endif
+       if (saveecho) {
+           NCURSES_SP_NAME(echo) (NCURSES_SP_ARG);
+       } else {
+           NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG);
+       }
 
        if (savecbreak) {
-           cbreak();
-           noraw();
+           NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG);
+           NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG);
        } else if (saveraw) {
-           nocbreak();
-           raw();
+           NCURSES_SP_NAME(nocbreak) (NCURSES_SP_ARG);
+           NCURSES_SP_NAME(raw) (NCURSES_SP_ARG);
        } else {
-           nocbreak();
-           noraw();
+           NCURSES_SP_NAME(nocbreak) (NCURSES_SP_ARG);
+           NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG);
+       }
+       if (savenl) {
+           NCURSES_SP_NAME(nl) (NCURSES_SP_ARG);
+       } else {
+           NCURSES_SP_NAME(nonl) (NCURSES_SP_ARG);
        }
-       if (savenl)
-           nl();
-       else
-           nonl();
 
-       reset_prog_mode();
+       NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_ARG);
 
 #if USE_SIZECHANGE
-       _nc_update_screensize(SP);
+       _nc_update_screensize(SP_PARM);
 #endif
 
        result = OK;
@@ -95,3 +106,12 @@ restartterm(NCURSES_CONST char *termp, int filenum, int *errret)
     }
     returnCode(result);
 }
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+restartterm(NCURSES_CONST char *termp, int filenum, int *errret)
+{
+    START_TRACE();
+    return NCURSES_SP_NAME(restartterm) (CURRENT_SCREEN, termp, filenum, errret);
+}
+#endif