ncurses 5.9 - patch 20140308

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

diff --git a/ncurses/base/lib_endwin.c b/ncurses/base/lib_endwin.c
index 386db4053eddb2d8a9bb6decf34667ae758eeb85..9ebf76933ff8d75c9c72cf8704164c87dd60aa3c 100644 (file)
--- a/ncurses/base/lib_endwin.c
+++ b/ncurses/base/lib_endwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2014 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            *
@@ -41,24 +41,33 @@
 */
 
 #include <curses.priv.h>
-#include <term.h>
 
-MODULE_ID("$Id: lib_endwin.c,v 1.20 2009/02/15 00:35:00 tom Exp $")
+MODULE_ID("$Id: lib_endwin.c,v 1.23 2014/03/08 20:32:59 tom Exp $")
 
 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);
+
+       SP_PARM->_endwin = TRUE;
+       if (TCB && TCB->drv && TCB->drv->td_scexit)
+           TCB->drv->td_scexit(SP_PARM);
+#else
        SP_PARM->_endwin = TRUE;
        SP_PARM->_mouse_wrap(SP_PARM);
        _nc_screen_wrap();
        _nc_mvcur_wrap();       /* wrap up cursor addressing */
-       returnCode(reset_shell_mode());
+#endif
+       code = NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_ARG);
     }
 
-    returnCode(ERR);
+    returnCode(code);
 }
 
 #if NCURSES_SP_FUNCS