ncurses 5.9 - patch 20110917

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

diff --git a/ncurses/base/lib_endwin.c b/ncurses/base/lib_endwin.c
index 31b6e516cc1dd367098e6398c4f96e65de6aab0a..4596d07496332ea45e7acc7bdaf314b91f402302 100644 (file)
--- a/ncurses/base/lib_endwin.c
+++ b/ncurses/base/lib_endwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2008,2009 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            *
@@ -29,9 +29,10 @@
 /****************************************************************************
  *  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                         2009                    *
  ****************************************************************************/
 
-
 /*
 **     lib_endwin.c
 **
@@ -40,22 +41,39 @@
 */
 
 #include <curses.priv.h>
-#include <term.h>
 
-MODULE_ID("$Id: lib_endwin.c,v 1.17 1999/06/12 23:01:46 tom Exp $")
+MODULE_ID("$Id: lib_endwin.c,v 1.22 2009/10/24 22:02:14 tom Exp $")
 
-int
-endwin(void)
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0)
 {
-       T((T_CALLED("endwin()")));
+    int code = ERR;
+
+    T((T_CALLED("endwin(%p)"), (void *) SP_PARM));
+
+    if (SP_PARM) {
+#ifdef USE_TERM_DRIVER
+       TERMINAL_CONTROL_BLOCK *TCB = TCBOf(SP_PARM);
 
-       if (SP) {
-               SP->_endwin = TRUE;
-               SP->_mouse_wrap(SP);
-               _nc_screen_wrap();
-               _nc_mvcur_wrap();       /* wrap up cursor addressing */
-               returnCode(reset_shell_mode());
-       }
+       SP_PARM->_endwin = TRUE;
+       if (TCB && TCB->drv && TCB->drv->scexit)
+           TCB->drv->scexit(SP_PARM);
+#else
+       SP_PARM->_endwin = TRUE;
+       SP_PARM->_mouse_wrap(SP_PARM);
+       _nc_screen_wrap();
+       _nc_mvcur_wrap();       /* wrap up cursor addressing */
+#endif
+       code = NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_ARG);
+    }
 
-       returnCode(ERR);
+    returnCode(code);
+}
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+endwin(void)
+{
+    return NCURSES_SP_NAME(endwin) (CURRENT_SCREEN);
 }
+#endif