ncurses 6.0 - patch 20160528

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

diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c
index 93d84323bc64486f7de7fd1c57ab4fa3021ae3ee..161c8f7301209a3828b291af93a52ab74788626d 100644 (file)
--- a/ncurses/base/lib_newterm.c
+++ b/ncurses/base/lib_newterm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2014,2016 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            *


@@ -48,7 +48,7 @@
 
 #include <tic.h>
 
 
 #include <tic.h>
 

-MODULE_ID("$Id: lib_newterm.c,v 1.89 2013/08/31 14:56:50 tom Exp $")
+MODULE_ID("$Id: lib_newterm.c,v 1.93 2016/05/28 23:11:26 tom Exp $")

 
 #ifdef USE_TERM_DRIVER
 #define NumLabels      InfoOf(SP_PARM).numlabels
 
 #ifdef USE_TERM_DRIVER
 #define NumLabels      InfoOf(SP_PARM).numlabels


@@ -166,22 +166,18 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
                          FILE *ofp,
                          FILE *ifp)
 {
                          FILE *ofp,
                          FILE *ifp)
 {

-    int value;

     int errret;
     SCREEN *result = 0;
     SCREEN *current;
     TERMINAL *its_term;
     FILE *_ofp = ofp ? ofp : stdout;
     FILE *_ifp = ifp ? ifp : stdin;
     int errret;
     SCREEN *result = 0;
     SCREEN *current;
     TERMINAL *its_term;
     FILE *_ofp = ofp ? ofp : stdout;
     FILE *_ifp = ifp ? ifp : stdin;

-    int cols;
-    int slk_format;
-    int filter_mode;

     TERMINAL *new_term = 0;
 
     START_TRACE();
     T((T_CALLED("newterm(%p, \"%s\", %p,%p)"),
        (void *) SP_PARM,
     TERMINAL *new_term = 0;
 
     START_TRACE();
     T((T_CALLED("newterm(%p, \"%s\", %p,%p)"),
        (void *) SP_PARM,

-       name,
+       (name ? name : ""),

        (void *) ofp,
        (void *) ifp));
 
        (void *) ofp,
        (void *) ifp));
 


@@ -200,11 +196,10 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
     INIT_TERM_DRIVER();
     /* this loads the capability entry, then sets LINES and COLS */
     if (
     INIT_TERM_DRIVER();
     /* this loads the capability entry, then sets LINES and COLS */
     if (

-#if NCURSES_SP_FUNCS
-          SP_PARM->_prescreen &&
-#endif

           TINFO_SETUP_TERM(&new_term, name,
                            fileno(_ofp), &errret, FALSE) != ERR) {
           TINFO_SETUP_TERM(&new_term, name,
                            fileno(_ofp), &errret, FALSE) != ERR) {

+       int slk_format;
+       int filter_mode;

 
        _nc_set_screen(0);
 #ifdef USE_TERM_DRIVER
 
        _nc_set_screen(0);
 #ifdef USE_TERM_DRIVER


@@ -235,6 +230,9 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
            _nc_set_screen(current);
            result = 0;
        } else {
            _nc_set_screen(current);
            result = 0;
        } else {

+           int value;
+           int cols;
+

 #ifdef USE_TERM_DRIVER
            TERMINAL_CONTROL_BLOCK *TCB;
 #elif !NCURSES_SP_FUNCS
 #ifdef USE_TERM_DRIVER
            TERMINAL_CONTROL_BLOCK *TCB;
 #elif !NCURSES_SP_FUNCS


@@ -306,7 +304,7 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx
 
            /* compute movement costs so we can do better move optimization */
 #ifdef USE_TERM_DRIVER
 
            /* compute movement costs so we can do better move optimization */
 #ifdef USE_TERM_DRIVER

-           TCBOf(SP_PARM)->drv->scinit(SP_PARM);
+           TCBOf(SP_PARM)->drv->td_scinit(SP_PARM);

 #else /* ! USE_TERM_DRIVER */
            /*
             * Check for mismatched graphic-rendition capabilities.  Most SVr4
 #else /* ! USE_TERM_DRIVER */
            /*
             * Check for mismatched graphic-rendition capabilities.  Most SVr4