ncurses 5.9 - patch 20120303

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

diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c
index d8ac5c6ce3f3023cbb323ec01ea6583ce683cd40..334682fab71d187bc8c11fbca08988cb9fc5d0a0 100644 (file)
--- a/ncurses/base/lib_initscr.c
+++ b/ncurses/base/lib_initscr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2002,2003 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            *
@@ -45,20 +45,24 @@
 #include <sys/termio.h>                /* needed for ISC */
 #endif
 
-MODULE_ID("$Id: lib_initscr.c,v 1.33 2003/12/27 19:13:51 tom Exp $")
+MODULE_ID("$Id: lib_initscr.c,v 1.39 2009/02/14 20:55:49 tom Exp $")
 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
 {
-    static bool initialized = FALSE;
+    WINDOW *result;
+
     NCURSES_CONST char *name;
-    int value;
 
     START_TRACE();
     T((T_CALLED("initscr()")));
+
+    _nc_init_pthreads();
+    _nc_lock_global(curses);
+
     /* 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')
@@ -85,13 +89,15 @@ initscr(void)
            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 */
+#if NCURSES_SP_FUNCS
+       NCURSES_SP_NAME(def_prog_mode) (CURRENT_SCREEN);
+#else
        def_prog_mode();
+#endif
     }
-    returnWin(stdscr);
+    result = stdscr;
+    _nc_unlock_global(curses);
+
+    returnWin(result);
 }