X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_initscr.c;h=c1851b04b703e56815dbb33ba710cd55af417bc0;hp=d8ac5c6ce3f3023cbb323ec01ea6583ce683cd40;hb=3eda6f30a84d53844d2ebceadb457e2e7e9cfbf3;hpb=a8987e73ec254703634802b4f7ee30d3a485524d

diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c
index d8ac5c6c..c1851b04 100644
--- 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-2016,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            *
@@ -45,24 +45,30 @@
 #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.42 2017/03/28 21:14:01 tom Exp $")
 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
 {
-    static bool initialized = FALSE;
-    NCURSES_CONST char *name;
-    int value;
+    WINDOW *result;
 
     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) {
+	NCURSES_CONST char *name;
+
+	_nc_globals.init_screen = TRUE;
 
 	if ((name = getenv("TERM")) == 0
-	    || *name == '\0')
-	    name = "unknown";
+	    || *name == '\0') {
+	    static char unknown_name[] = "unknown";
+	    name = unknown_name;
+	}
 #ifdef __CYGWIN__
 	/*
 	 * 2002/9/21
@@ -71,9 +77,9 @@ initscr(void)
 	 * core when attempting to write to stdout.  Opening /dev/tty
 	 * explicitly seems to fix the problem.
 	 */
-	if (isatty(fileno(stdout))) {
+	if (NC_ISATTY(fileno(stdout))) {
 	    FILE *fp = fopen("/dev/tty", "w");
-	    if (fp != 0 && isatty(fileno(fp))) {
+	    if (fp != 0 && NC_ISATTY(fileno(fp))) {
 		fclose(stdout);
 		dup2(fileno(fp), STDOUT_FILENO);
 		stdout = fdopen(STDOUT_FILENO, "w");
@@ -85,13 +91,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);
 }