ncurses 5.7 - patch 20100116

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

diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c
index 1b7750d5ac9fd252c7876dd576d774194c15f019..334682fab71d187bc8c11fbca08988cb9fc5d0a0 100644 (file)
--- a/ncurses/base/lib_initscr.c
+++ b/ncurses/base/lib_initscr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2001,2002 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Thomas E. Dickey                        1996-2003               *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -39,26 +40,29 @@
 */
 
 #include <curses.priv.h>
 */
 
 #include <curses.priv.h>

-#include <tic.h>               /* for MAX_ALIAS */

 
 #if HAVE_SYS_TERMIO_H
 #include <sys/termio.h>                /* needed for ISC */
 #endif
 
 
 #if HAVE_SYS_TERMIO_H
 #include <sys/termio.h>                /* needed for ISC */
 #endif
 

-MODULE_ID("$Id: lib_initscr.c,v 1.32 2002/10/12 15:24:34 tom Exp $")
+MODULE_ID("$Id: lib_initscr.c,v 1.39 2009/02/14 20:55:49 tom Exp $")

 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
 {
 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
 {

-    static bool initialized = FALSE;
+    WINDOW *result;
+

     NCURSES_CONST char *name;
     NCURSES_CONST char *name;

-    int value;

 
     START_TRACE();
     T((T_CALLED("initscr()")));
 
     START_TRACE();
     T((T_CALLED("initscr()")));

+
+    _nc_init_pthreads();
+    _nc_lock_global(curses);
+

     /* Portable applications must not call initscr() more than once */
     /* Portable applications must not call initscr() more than once */

-    if (!initialized) {
-       initialized = TRUE;
+    if (!_nc_globals.init_screen) {
+       _nc_globals.init_screen = TRUE;

 
        if ((name = getenv("TERM")) == 0
            || *name == '\0')
 
        if ((name = getenv("TERM")) == 0
            || *name == '\0')


@@ -85,13 +89,15 @@ initscr(void)
            exit(EXIT_FAILURE);
        }
 
            exit(EXIT_FAILURE);
        }
 

-       /* allow user to set maximum escape delay from the environment */
-       if ((value = _nc_getenv_num("ESCDELAY")) >= 0) {
-           ESCDELAY = value;
-       }
-

        /* def_shell_mode - done in newterm/_nc_setupscreen */
        /* def_shell_mode - done in newterm/_nc_setupscreen */

+#if NCURSES_SP_FUNCS
+       NCURSES_SP_NAME(def_prog_mode) (CURRENT_SCREEN);
+#else

        def_prog_mode();
        def_prog_mode();

+#endif

     }
     }

-    returnWin(stdscr);
+    result = stdscr;
+    _nc_unlock_global(curses);
+
+    returnWin(result);

 }
 }