ncurses 6.4 - patch 20231121

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

diff --git a/ncurses/base/lib_endwin.c b/ncurses/base/lib_endwin.c
index 386db4053eddb2d8a9bb6decf34667ae758eeb85..85d2bdbaac0527cf91502eb38a2311e4a150fbb6 100644 (file)
--- a/ncurses/base/lib_endwin.c
+++ b/ncurses/base/lib_endwin.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
+ * Copyright 2020,2023 Thomas E. Dickey                                     *
+ * Copyright 1998-2014,2017 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 +42,37 @@
 */
 
 #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.28 2023/11/11 21:27:32 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0)
 {
-    T((T_CALLED("endwin()")));
+    int code = ERR;
 
-    if (SP_PARM) {
-       SP_PARM->_endwin = TRUE;
-       SP_PARM->_mouse_wrap(SP_PARM);
-       _nc_screen_wrap();
-       _nc_mvcur_wrap();       /* wrap up cursor addressing */
-       returnCode(reset_shell_mode());
+    T((T_CALLED("endwin(%p)"), (void *) SP_PARM));
+
+    if (SP_PARM != NULL) {
+       if (SP_PARM->_endwin != ewSuspend) {
+#ifdef USE_TERM_DRIVER
+           TERMINAL_CONTROL_BLOCK *TCB = TCBOf(SP_PARM);
+
+           SP_PARM->_endwin = ewSuspend;
+           if (TCB && TCB->drv && TCB->drv->td_scexit)
+               TCB->drv->td_scexit(SP_PARM);
+#else
+           SP_PARM->_endwin = ewSuspend;
+           SP_PARM->_mouse_wrap(SP_PARM);
+           _nc_screen_wrap();
+           _nc_mvcur_wrap();   /* wrap up cursor addressing */
+#endif
+           code = OK;
+       }
+       if (NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_ARG) == ERR)
+           code = ERR;
     }
 
-    returnCode(ERR);
+    returnCode(code);
 }
 
 #if NCURSES_SP_FUNCS