X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_newterm.c;h=5318ba4e81ea7b3fa634022e5ae70abd970a4691;hp=1579c28096fb4a97bce4bc1d86543e06f5cff0ea;hb=48c8a4fe456e83238533fb42b36fd5253db22f59;hpb=3a0d9d27e0cf115ff9dcc6163c251bccaa62bd7d;ds=sidebyside

diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c
index 1579c280..5318ba4e 100644
--- a/ncurses/base/lib_newterm.c
+++ b/ncurses/base/lib_newterm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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            *
@@ -42,17 +42,13 @@
 
 #include <curses.priv.h>
 
-#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
-#define _POSIX_SOURCE
-#endif
-
 #ifndef CUR
 #define CUR SP_TERMTYPE
 #endif
 
 #include <tic.h>
 
-MODULE_ID("$Id: lib_newterm.c,v 1.82 2009/10/24 22:52:04 tom Exp $")
+MODULE_ID("$Id: lib_newterm.c,v 1.87 2011/04/16 16:42:10 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels      InfoOf(SP_PARM).numlabels
@@ -85,9 +81,9 @@ _nc_initscr(NCURSES_SP_DCL0)
 
 	buf = term->Nttyb;
 #ifdef TERMIOS
-	buf.c_lflag &= ~(ECHO | ECHONL);
-	buf.c_iflag &= ~(ICRNL | INLCR | IGNCR);
-	buf.c_oflag &= ~(ONLCR);
+	buf.c_lflag &= (unsigned) ~(ECHO | ECHONL);
+	buf.c_iflag &= (unsigned) ~(ICRNL | INLCR | IGNCR);
+	buf.c_oflag &= (unsigned) ~(ONLCR);
 #elif HAVE_SGTTY_H
 	buf.sg_flags &= ~(ECHO | CRMOD);
 #else
@@ -201,6 +197,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
     current = CURRENT_SCREEN;
     its_term = (current ? current->_term : 0);
 
+    INIT_TERM_DRIVER();
     /* this loads the capability entry, then sets LINES and COLS */
     if (
 #if NCURSES_SP_FUNCS
@@ -241,7 +238,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 #ifdef USE_TERM_DRIVER
 	    TERMINAL_CONTROL_BLOCK *TCB;
 #elif !NCURSES_SP_FUNCS
-	    SP_PARM = CURRENT_SCREEN;
+	    _nc_set_screen(CURRENT_SCREEN);
 #endif
 	    assert(SP_PARM != 0);
 	    cols = *(ptrCols(SP_PARM));
@@ -276,7 +273,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 
 	    /* if the terminal type has real soft labels, set those up */
 	    if (slk_format && NumLabels > 0 && SLK_STDFMT(slk_format))
-		_nc_slk_initialize(SP_PARM->_stdscr, cols);
+		_nc_slk_initialize(StdScreen(SP_PARM), cols);
 
 	    SP_PARM->_ifd = fileno(_ifp);
 	    NCURSES_SP_NAME(typeahead) (NCURSES_SP_ARGx fileno(_ifp));