ncurses 5.9 - patch 20111022

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

diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c
index 64cac85c5dfc62605aebb33b2154609d0c14eff2..5318ba4e81ea7b3fa634022e5ae70abd970a4691 100644 (file)
--- 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            *
  *                                                                          *
  * 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>
 
 
 #include <curses.priv.h>
 

-#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
-#define _POSIX_SOURCE
-#endif
-

 #ifndef CUR
 #define CUR SP_TERMTYPE
 #endif
 
 #include <tic.h>
 
 #ifndef CUR
 #define CUR SP_TERMTYPE
 #endif
 
 #include <tic.h>
 

-MODULE_ID("$Id: lib_newterm.c,v 1.83 2009/11/07 16:27:05 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
 
 #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 = 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
 #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);
 
     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
     /* 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
 #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));
 #endif
            assert(SP_PARM != 0);
            cols = *(ptrCols(SP_PARM));