ncurses 5.9 - patch 20140426

[ncurses.git] / ncurses / tinfo / lib_setup.c

diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 08cb783c5942acc5fb0f14ca82791a325621089d..522929009c1f7a9612265507b6d4bc4807a1663f 100644 (file)
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -30,30 +30,25 @@
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  *     and: Thomas E. Dickey                        1996-on                 *
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  *     and: Thomas E. Dickey                        1996-on                 *

+ *     and: Juergen Pfeifer                         2009                    *

  ****************************************************************************/
 
 /*
  * Terminal setup routines common to termcap and terminfo:
  *
  *             use_env(bool)
  ****************************************************************************/
 
 /*
  * Terminal setup routines common to termcap and terminfo:
  *
  *             use_env(bool)

+ *             use_tioctl(bool)

  *             setupterm(char *, int, int *)
  */
 
 #include <curses.priv.h>
 #include <tic.h>               /* for MAX_NAME_SIZE */
  *             setupterm(char *, int, int *)
  */
 
 #include <curses.priv.h>
 #include <tic.h>               /* for MAX_NAME_SIZE */

-#include <term_entry.h>
-
-#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
-#define _POSIX_SOURCE
-#endif

 
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
 
 
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
 

-#include <term.h>              /* lines, columns, cur_term */
-
-MODULE_ID("$Id: lib_setup.c,v 1.105 2008/05/03 22:41:42 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.160 2014/04/26 18:47:20 juergen Exp $")

 
 /****************************************************************************
  *
 
 /****************************************************************************
  *


@@ -99,55 +94,106 @@ MODULE_ID("$Id: lib_setup.c,v 1.105 2008/05/03 22:41:42 tom Exp $")
 # endif
 #endif
 
 # endif
 #endif
 

+/*
+ * Reduce explicit use of "cur_term" global variable.
+ */
+#undef CUR
+#define CUR termp->type.
+

 /*
  * Wrap global variables in this module.
  */
 #if USE_REENTRANT
 /*
  * Wrap global variables in this module.
  */
 #if USE_REENTRANT

+

 NCURSES_EXPORT(char *)
 NCURSES_PUBLIC_VAR(ttytype) (void)
 {
     static char empty[] = "";
 NCURSES_EXPORT(char *)
 NCURSES_PUBLIC_VAR(ttytype) (void)
 {
     static char empty[] = "";

-    return cur_term ? cur_term->type.term_names : empty;
+    char *result = empty;
+
+#if NCURSES_SP_FUNCS
+    if (CURRENT_SCREEN) {
+       TERMINAL *termp = TerminalOf(CURRENT_SCREEN);
+       if (termp != 0) {
+           result = termp->type.term_names;
+       }
+    }
+#else
+    if (cur_term != 0) {
+       result = cur_term->type.term_names;
+    }
+#endif
+    return result;
+}
+
+NCURSES_EXPORT(int *)
+_nc_ptr_Lines(SCREEN *sp)
+{
+    return ptrLines(sp);

 }
 }

+

 NCURSES_EXPORT(int)
 NCURSES_PUBLIC_VAR(LINES) (void)
 {
 NCURSES_EXPORT(int)
 NCURSES_PUBLIC_VAR(LINES) (void)
 {

-    return (SP ? SP->_LINES : _nc_prescreen._LINES);
+    return *_nc_ptr_Lines(CURRENT_SCREEN);
+}
+
+NCURSES_EXPORT(int *)
+_nc_ptr_Cols(SCREEN *sp)
+{
+    return ptrCols(sp);

 }
 }

+

 NCURSES_EXPORT(int)
 NCURSES_PUBLIC_VAR(COLS) (void)
 {
 NCURSES_EXPORT(int)
 NCURSES_PUBLIC_VAR(COLS) (void)
 {

-    return SP ? SP->_COLS : _nc_prescreen._COLS;
+    return *_nc_ptr_Cols(CURRENT_SCREEN);
+}
+
+NCURSES_EXPORT(int *)
+_nc_ptr_Tabsize(SCREEN *sp)
+{
+    return ptrTabsize(sp);

 }
 }

+

 NCURSES_EXPORT(int)
 NCURSES_PUBLIC_VAR(TABSIZE) (void)
 {
 NCURSES_EXPORT(int)
 NCURSES_PUBLIC_VAR(TABSIZE) (void)
 {

-    return SP ? SP->_TABSIZE : 8;
+    return *_nc_ptr_Tabsize(CURRENT_SCREEN);

 }
 #else
 NCURSES_EXPORT_VAR(char) ttytype[NAMESIZE] = "";
 NCURSES_EXPORT_VAR(int) LINES = 0;
 NCURSES_EXPORT_VAR(int) COLS = 0;
 }
 #else
 NCURSES_EXPORT_VAR(char) ttytype[NAMESIZE] = "";
 NCURSES_EXPORT_VAR(int) LINES = 0;
 NCURSES_EXPORT_VAR(int) COLS = 0;

-NCURSES_EXPORT_VAR(int) TABSIZE = 0;
+NCURSES_EXPORT_VAR(int) TABSIZE = 8;

 #endif
 
 #if NCURSES_EXT_FUNCS
 NCURSES_EXPORT(int)
 #endif
 
 #if NCURSES_EXT_FUNCS
 NCURSES_EXPORT(int)

-set_tabsize(int value)
+NCURSES_SP_NAME(set_tabsize) (NCURSES_SP_DCLx int value)

 {
     int code = OK;
 #if USE_REENTRANT
 {
     int code = OK;
 #if USE_REENTRANT

-    if (SP) {
-       SP->_TABSIZE = value;
+    if (SP_PARM) {
+       SP_PARM->_TABSIZE = value;

     } else {
        code = ERR;
     }
 #else
     } else {
        code = ERR;
     }
 #else

+    (void) SP_PARM;

     TABSIZE = value;
 #endif
     return code;
 }
     TABSIZE = value;
 #endif
     return code;
 }

+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+set_tabsize(int value)
+{
+    return NCURSES_SP_NAME(set_tabsize) (CURRENT_SCREEN, value);
+}

 #endif
 #endif

+#endif /* NCURSES_EXT_FUNCS */

 
 #if USE_SIGWINCH
 /*
 
 #if USE_SIGWINCH
 /*


@@ -171,77 +217,157 @@ _nc_handle_sigwinch(SCREEN *sp)
 
 #endif
 
 
 #endif
 

+NCURSES_EXPORT(void)
+NCURSES_SP_NAME(use_env) (NCURSES_SP_DCLx bool f)
+{
+    T((T_CALLED("use_env(%p,%d)"), (void *) SP_PARM, (int) f));
+#if NCURSES_SP_FUNCS
+    START_TRACE();
+    if (IsPreScreen(SP_PARM)) {
+       SP_PARM->_use_env = f;
+    }
+#else
+    _nc_prescreen.use_env = f;
+#endif
+    returnVoid;
+}
+
+NCURSES_EXPORT(void)
+NCURSES_SP_NAME(use_tioctl) (NCURSES_SP_DCLx bool f)
+{
+    T((T_CALLED("use_tioctl(%p,%d)"), (void *) SP_PARM, (int) f));
+#if NCURSES_SP_FUNCS
+    START_TRACE();
+    if (IsPreScreen(SP_PARM)) {
+       SP_PARM->_use_tioctl = f;
+    }
+#else
+    _nc_prescreen.use_tioctl = f;
+#endif
+    returnVoid;
+}
+
+#if NCURSES_SP_FUNCS

 NCURSES_EXPORT(void)
 use_env(bool f)
 {
 NCURSES_EXPORT(void)
 use_env(bool f)
 {

-    T((T_CALLED("use_env()")));
+    T((T_CALLED("use_env(%d)"), (int) f));
+    START_TRACE();

     _nc_prescreen.use_env = f;
     returnVoid;
 }
 
 NCURSES_EXPORT(void)
     _nc_prescreen.use_env = f;
     returnVoid;
 }
 
 NCURSES_EXPORT(void)

-_nc_get_screensize(SCREEN *sp, int *linep, int *colp)
+use_tioctl(bool f)
+{
+    T((T_CALLED("use_tioctl(%d)"), (int) f));
+    START_TRACE();
+    _nc_prescreen.use_tioctl = f;
+    returnVoid;
+}
+#endif
+
+NCURSES_EXPORT(void)
+_nc_get_screensize(SCREEN *sp,
+#ifdef USE_TERM_DRIVER
+                  TERMINAL * termp,
+#endif
+                  int *linep, int *colp)

 /* Obtain lines/columns values from the environment and/or terminfo entry */
 {
 /* Obtain lines/columns values from the environment and/or terminfo entry */
 {

+#ifdef USE_TERM_DRIVER
+    TERMINAL_CONTROL_BLOCK *TCB;
+    int my_tabsize;
+
+    assert(termp != 0 && linep != 0 && colp != 0);
+    TCB = (TERMINAL_CONTROL_BLOCK *) termp;
+
+    my_tabsize = TCB->info.tabsize;
+    TCB->drv->td_size(TCB, linep, colp);
+
+#if USE_REENTRANT
+    if (sp != 0) {
+       sp->_TABSIZE = my_tabsize;
+    }
+#else
+    (void) sp;
+    TABSIZE = my_tabsize;
+#endif
+    T(("TABSIZE = %d", my_tabsize));
+#else /* !USE_TERM_DRIVER */
+    TERMINAL *termp = cur_term;

     int my_tabsize;
 
     /* figure out the size of the screen */
     T(("screen size: terminfo lines = %d columns = %d", lines, columns));
 
     int my_tabsize;
 
     /* figure out the size of the screen */
     T(("screen size: terminfo lines = %d columns = %d", lines, columns));
 

-    if (!_nc_prescreen.use_env) {
-       *linep = (int) lines;
-       *colp = (int) columns;
-    } else {                   /* usually want to query LINES and COLUMNS from environment */
-       int value;
-
-       *linep = *colp = 0;
+    *linep = (int) lines;
+    *colp = (int) columns;

 
 

-       /* first, look for environment variables */
-       if ((value = _nc_getenv_num("LINES")) > 0) {
-           *linep = value;
-       }
-       if ((value = _nc_getenv_num("COLUMNS")) > 0) {
-           *colp = value;
-       }
-       T(("screen size: environment LINES = %d COLUMNS = %d", *linep, *colp));
+    if (_nc_prescreen.use_env || _nc_prescreen.use_tioctl) {
+       int value;

 
 #ifdef __EMX__
 
 #ifdef __EMX__

-       if (*linep <= 0 || *colp <= 0) {
+       {

            int screendata[2];
            _scrsize(screendata);
            *colp = screendata[0];
            int screendata[2];
            _scrsize(screendata);
            *colp = screendata[0];

-           *linep = screendata[1];
+           *linep = ((sp != 0 && sp->_filtered)
+                     ? 1
+                     : screendata[1]);

            T(("EMX screen size: environment LINES = %d COLUMNS = %d",
               *linep, *colp));
        }
 #endif
 #if HAVE_SIZECHANGE
            T(("EMX screen size: environment LINES = %d COLUMNS = %d",
               *linep, *colp));
        }
 #endif
 #if HAVE_SIZECHANGE

-       /* if that didn't work, maybe we can try asking the OS */
-       if (*linep <= 0 || *colp <= 0) {
-           if (isatty(cur_term->Filedes)) {
-               STRUCT_WINSIZE size;
-
-               errno = 0;
-               do {
-                   if (ioctl(cur_term->Filedes, IOCTL_WINSIZE, &size) < 0
-                       && errno != EINTR)
-                       goto failure;
-               } while
-                   (errno == EINTR);
+       /* try asking the OS */
+       if (NC_ISATTY(cur_term->Filedes)) {
+           STRUCT_WINSIZE size;
+
+           errno = 0;
+           do {
+               if (ioctl(cur_term->Filedes, IOCTL_WINSIZE, &size) >= 0) {
+                   *linep = ((sp != 0 && sp->_filtered)
+                             ? 1
+                             : WINSIZE_ROWS(size));
+                   *colp = WINSIZE_COLS(size);
+                   T(("SYS screen size: environment LINES = %d COLUMNS = %d",
+                      *linep, *colp));
+                   break;
+               }
+           } while
+               (errno == EINTR);
+       }
+#endif /* HAVE_SIZECHANGE */

 
 

+       if (_nc_prescreen.use_env) {
+           if (_nc_prescreen.use_tioctl) {

                /*
                /*

-                * Solaris lets users override either dimension with an
-                * environment variable.
+                * If environment variables are used, update them.

                 */
                 */

-               if (*linep <= 0)
-                   *linep = (sp != 0 && sp->_filtered) ? 1 : WINSIZE_ROWS(size);
-               if (*colp <= 0)
-                   *colp = WINSIZE_COLS(size);
+               if ((sp == 0 || !sp->_filtered) && _nc_getenv_num("LINES") > 0) {
+                   _nc_setenv_num("LINES", *linep);
+               }
+               if (_nc_getenv_num("COLUMNS") > 0) {
+                   _nc_setenv_num("COLUMNS", *colp);
+               }
+           }
+
+           /*
+            * Finally, look for environment variables.
+            *
+            * Solaris lets users override either dimension with an environment
+            * variable.
+            */
+           if ((value = _nc_getenv_num("LINES")) > 0) {
+               *linep = value;
+               T(("screen size: environment LINES = %d", *linep));
+           }
+           if ((value = _nc_getenv_num("COLUMNS")) > 0) {
+               *colp = value;
+               T(("screen size: environment COLUMNS = %d", *colp));

            }
            }

-           /* FALLTHRU */
-         failure:;

        }
        }

-#endif /* HAVE_SIZECHANGE */

 
        /* if we can't get dynamic info about the size, use static */
        if (*linep <= 0) {
 
        /* if we can't get dynamic info about the size, use static */
        if (*linep <= 0) {


@@ -281,28 +407,43 @@ _nc_get_screensize(SCREEN *sp, int *linep, int *colp)
     TABSIZE = my_tabsize;
 #endif
     T(("TABSIZE = %d", TABSIZE));
     TABSIZE = my_tabsize;
 #endif
     T(("TABSIZE = %d", TABSIZE));

+#endif /* USE_TERM_DRIVER */

 }
 
 #if USE_SIZECHANGE
 NCURSES_EXPORT(void)
 _nc_update_screensize(SCREEN *sp)
 {
 }
 
 #if USE_SIZECHANGE
 NCURSES_EXPORT(void)
 _nc_update_screensize(SCREEN *sp)
 {

-    int old_lines = lines;

     int new_lines;
     int new_lines;

-    int old_cols = columns;

     int new_cols;
 
     int new_cols;
 

-    _nc_get_screensize(sp, &new_lines, &new_cols);
+#ifdef USE_TERM_DRIVER
+    int old_lines;
+    int old_cols;
+
+    assert(sp != 0);
+
+    CallDriver_2(sp, td_getsize, &old_lines, &old_cols);
+
+#else
+    TERMINAL *termp = cur_term;
+    int old_lines = lines;
+    int old_cols = columns;
+#endif
+
+    TINFO_GET_SIZE(sp, sp->_term, &new_lines, &new_cols);

 
     /*
      * See is_term_resized() and resizeterm().
      * We're doing it this way because those functions belong to the upper
      * ncurses library, while this resides in the lower terminfo library.
      */
 
     /*
      * See is_term_resized() and resizeterm().
      * We're doing it this way because those functions belong to the upper
      * ncurses library, while this resides in the lower terminfo library.
      */

-    if (sp != 0
-       && sp->_resize != 0) {
-       if ((new_lines != old_lines) || (new_cols != old_cols))
-           sp->_resize(new_lines, new_cols);
+    if (sp != 0 && sp->_resize != 0) {
+       if ((new_lines != old_lines) || (new_cols != old_cols)) {
+           sp->_resize(NCURSES_SP_ARGx new_lines, new_cols);
+       } else if (sp->_sig_winch && (sp->_ungetch != 0)) {
+           sp->_ungetch(SP_PARM, KEY_RESIZE);  /* so application can know this */
+       }

        sp->_sig_winch = FALSE;
     }
 }
        sp->_sig_winch = FALSE;
     }
 }


@@ -314,29 +455,13 @@ _nc_update_screensize(SCREEN *sp)
  *
  ****************************************************************************/
 
  *
  ****************************************************************************/
 

-#define ret_error(code, fmt, arg)      if (errret) {\
-                                           *errret = code;\
-                                           returnCode(ERR);\
-                                       } else {\
-                                           fprintf(stderr, fmt, arg);\
-                                           exit(EXIT_FAILURE);\
-                                       }
-
-#define ret_error0(code, msg)          if (errret) {\
-                                           *errret = code;\
-                                           returnCode(ERR);\
-                                       } else {\
-                                           fprintf(stderr, msg);\
-                                           exit(EXIT_FAILURE);\
-                                       }
-
-#if USE_DATABASE || USE_TERMCAP
+#if NCURSES_USE_DATABASE || NCURSES_USE_TERMCAP

 /*
  * Return 1 if entry found, 0 if not found, -1 if database not accessible,
  * just like tgetent().
  */
 /*
  * Return 1 if entry found, 0 if not found, -1 if database not accessible,
  * just like tgetent().
  */

-static int
-grab_entry(const char *const tn, TERMTYPE *const tp)
+int
+_nc_setup_tinfo(const char *const tn, TERMTYPE *const tp)

 {
     char filename[PATH_MAX];
     int status = _nc_read_entry(tn, filename, tp);
 {
     char filename[PATH_MAX];
     int status = _nc_read_entry(tn, filename, tp);


@@ -363,27 +488,28 @@ grab_entry(const char *const tn, TERMTYPE *const tp)
 #endif
 
 /*
 #endif
 
 /*

-**     do_prototype()
-**

 **     Take the real command character out of the CC environment variable
 **     and substitute it in for the prototype given in 'command_character'.
 */
 **     Take the real command character out of the CC environment variable
 **     and substitute it in for the prototype given in 'command_character'.
 */

-static void
-do_prototype(void)
+void
+_nc_tinfo_cmdch(TERMINAL * termp, int proto)

 {
 {

-    int i;
+    unsigned i;

     char CC;
     char CC;

-    char proto;

     char *tmp;
 
     char *tmp;
 

-    tmp = getenv("CC");
-    CC = *tmp;
-    proto = *command_character;
-
-    for_each_string(i, &(cur_term->type)) {
-       for (tmp = cur_term->type.Strings[i]; *tmp; tmp++) {
-           if (*tmp == proto)
-               *tmp = CC;
+    /*
+     * Only use the character if the string is a single character,
+     * since it is fairly common for developers to set the C compiler
+     * name as an environment variable - using the same symbol.
+     */
+    if ((tmp = getenv("CC")) != 0 && strlen(tmp) == 1) {
+       CC = *tmp;
+       for_each_string(i, &(termp->type)) {
+           for (tmp = termp->type.Strings[i]; tmp && *tmp; tmp++) {
+               if (UChar(*tmp) == proto)
+                   *tmp = CC;
+           }

        }
     }
 }
        }
     }
 }


@@ -419,7 +545,9 @@ NCURSES_EXPORT(int)
 _nc_unicode_locale(void)
 {
     int result = 0;
 _nc_unicode_locale(void)
 {
     int result = 0;

-#if HAVE_LANGINFO_CODESET
+#if defined(__MINGW32__) && USE_WIDEC_SUPPORT
+    result = 1;
+#elif HAVE_LANGINFO_CODESET

     char *env = nl_langinfo(CODESET);
     result = !strcmp(env, "UTF-8");
     T(("_nc_unicode_locale(%s) ->%d", env, result));
     char *env = nl_langinfo(CODESET);
     result = !strcmp(env, "UTF-8");
     T(("_nc_unicode_locale(%s) ->%d", env, result));


@@ -443,45 +571,75 @@ _nc_unicode_locale(void)
  * character set.
  */
 NCURSES_EXPORT(int)
  * character set.
  */
 NCURSES_EXPORT(int)

-_nc_locale_breaks_acs(void)
+_nc_locale_breaks_acs(TERMINAL * termp)

 {
 {

+    const char *env_name = "NCURSES_NO_UTF8_ACS";

     char *env;
     char *env;

+    int value;
+    int result = 0;

 
 

-    if ((env = getenv("NCURSES_NO_UTF8_ACS")) != 0) {
-       return atoi(env);
+    if (getenv(env_name) != 0) {
+       result = _nc_getenv_num(env_name);
+    } else if ((value = tigetnum("U8")) >= 0) {
+       result = value;         /* use extension feature */

     } else if ((env = getenv("TERM")) != 0) {
     } else if ((env = getenv("TERM")) != 0) {

-       if (strstr(env, "linux"))
-           return 1;           /* always broken */
-       if (strstr(env, "screen") != 0
-           && ((env = getenv("TERMCAP")) != 0
-               && strstr(env, "screen") != 0)
-           && strstr(env, "hhII00") != 0) {
+       if (strstr(env, "linux")) {
+           result = 1;         /* always broken */
+       } else if (strstr(env, "screen") != 0
+                  && ((env = getenv("TERMCAP")) != 0
+                      && strstr(env, "screen") != 0)
+                  && strstr(env, "hhII00") != 0) {

            if (CONTROL_N(enter_alt_charset_mode) ||
                CONTROL_O(enter_alt_charset_mode) ||
                CONTROL_N(set_attributes) ||
            if (CONTROL_N(enter_alt_charset_mode) ||
                CONTROL_O(enter_alt_charset_mode) ||
                CONTROL_N(set_attributes) ||

-               CONTROL_O(set_attributes))
-               return 1;
+               CONTROL_O(set_attributes)) {
+               result = 1;
+           }

        }
     }
        }
     }

-    return 0;
+    return result;

 }
 
 }
 

-/*
- * This entrypoint is called from tgetent() to allow a special case of reusing
- * the same TERMINAL data (see comment).
- */

 NCURSES_EXPORT(int)
 NCURSES_EXPORT(int)

-_nc_setupterm(NCURSES_CONST char *tname, int Filedes, int *errret, bool reuse)
+TINFO_SETUP_TERM(TERMINAL ** tp,
+                NCURSES_CONST char *tname,
+                int Filedes,
+                int *errret,
+                int reuse)

 {
 {

+#ifdef USE_TERM_DRIVER
+    TERMINAL_CONTROL_BLOCK *TCB = 0;
+#else

     int status;
     int status;

+#endif
+    TERMINAL *termp;
+    SCREEN *sp = 0;
+    int code = ERR;

 
     START_TRACE();
 
     START_TRACE();

-    T((T_CALLED("setupterm(%s,%d,%p)"), _nc_visbuf(tname), Filedes, errret));
+
+#ifdef USE_TERM_DRIVER
+    T((T_CALLED("_nc_setupterm_ex(%p,%s,%d,%p)"),
+       (void *) tp, _nc_visbuf(tname), Filedes, (void *) errret));
+
+    if (tp == 0) {
+       ret_error0(TGETENT_ERR,
+                  "Invalid parameter, internal error.\n");
+    } else
+       termp = *tp;
+#else
+    termp = cur_term;
+    T((T_CALLED("setupterm(%s,%d,%p)"), _nc_visbuf(tname), Filedes, (void *) errret));
+#endif

 
     if (tname == 0) {
        tname = getenv("TERM");
        if (tname == 0 || *tname == '\0') {
 
     if (tname == 0) {
        tname = getenv("TERM");
        if (tname == 0 || *tname == '\0') {

+#ifdef USE_TERM_DRIVER
+           tname = "unknown";
+#else

            ret_error0(TGETENT_ERR, "TERM environment variable not set.\n");
            ret_error0(TGETENT_ERR, "TERM environment variable not set.\n");

+#endif

        }
     }
 
        }
     }
 


@@ -497,7 +655,7 @@ _nc_setupterm(NCURSES_CONST char *tname, int Filedes, int *errret, bool reuse)
      * Allow output redirection.  This is what SVr3 does.  If stdout is
      * directed to a file, screen updates go to standard error.
      */
      * Allow output redirection.  This is what SVr3 does.  If stdout is
      * directed to a file, screen updates go to standard error.
      */

-    if (Filedes == STDOUT_FILENO && !isatty(Filedes))
+    if (Filedes == STDOUT_FILENO && !NC_ISATTY(Filedes))

        Filedes = STDERR_FILENO;
 
     /*
        Filedes = STDERR_FILENO;
 
     /*


@@ -517,23 +675,42 @@ _nc_setupterm(NCURSES_CONST char *tname, int Filedes, int *errret, bool reuse)
      * properly with this feature).
      */
     if (reuse
      * properly with this feature).
      */
     if (reuse

-       && cur_term != 0
-       && cur_term->Filedes == Filedes
-       && cur_term->_termname != 0
-       && !strcmp(cur_term->_termname, tname)
-       && _nc_name_match(cur_term->type.term_names, tname, "|")) {
+       && (termp != 0)
+       && termp->Filedes == Filedes
+       && termp->_termname != 0
+       && !strcmp(termp->_termname, tname)
+       && _nc_name_match(termp->type.term_names, tname, "|")) {

        T(("reusing existing terminal information and mode-settings"));
        T(("reusing existing terminal information and mode-settings"));

+       code = OK;
+#ifdef USE_TERM_DRIVER
+       TCB = (TERMINAL_CONTROL_BLOCK *) termp;
+#endif

     } else {
     } else {

-       TERMINAL *term_ptr;
-
-       term_ptr = typeCalloc(TERMINAL, 1);
-
-       if (term_ptr == 0) {
+#ifdef USE_TERM_DRIVER
+       TERMINAL_CONTROL_BLOCK *my_tcb;
+       my_tcb = typeCalloc(TERMINAL_CONTROL_BLOCK, 1);
+       termp = &(my_tcb->term);
+#else
+       termp = typeCalloc(TERMINAL, 1);
+#endif
+       if (termp == 0) {

            ret_error0(TGETENT_ERR,
                       "Not enough memory to create terminal structure.\n");
        }
            ret_error0(TGETENT_ERR,
                       "Not enough memory to create terminal structure.\n");
        }

-#if USE_DATABASE || USE_TERMCAP
-       status = grab_entry(tname, &term_ptr->type);
+#ifdef USE_TERM_DRIVER
+       INIT_TERM_DRIVER();
+       TCB = (TERMINAL_CONTROL_BLOCK *) termp;
+       code = _nc_globals.term_driver(TCB, tname, errret);
+       if (code == OK) {
+           termp->Filedes = (short) Filedes;
+           termp->_termname = strdup(tname);
+       } else {
+           ret_error0(TGETENT_ERR,
+                      "Could not find any driver to handle this terminal.\n");
+       }
+#else
+#if NCURSES_USE_DATABASE || NCURSES_USE_TERMCAP
+       status = _nc_setup_tinfo(tname, &termp->type);

 #else
        status = TGETENT_NO;
 #endif
 #else
        status = TGETENT_NO;
 #endif


@@ -543,32 +720,31 @@ _nc_setupterm(NCURSES_CONST char *tname, int Filedes, int *errret, bool reuse)
            const TERMTYPE *fallback = _nc_fallback(tname);
 
            if (fallback) {
            const TERMTYPE *fallback = _nc_fallback(tname);
 
            if (fallback) {

-               term_ptr->type = *fallback;
+               _nc_copy_termtype(&(termp->type), fallback);

                status = TGETENT_YES;
            }
        }
 
        if (status != TGETENT_YES) {
                status = TGETENT_YES;
            }
        }
 
        if (status != TGETENT_YES) {

-           del_curterm(term_ptr);
+           del_curterm(termp);

            if (status == TGETENT_ERR) {
                ret_error0(status, "terminals database is inaccessible\n");
            } else if (status == TGETENT_NO) {
            if (status == TGETENT_ERR) {
                ret_error0(status, "terminals database is inaccessible\n");
            } else if (status == TGETENT_NO) {

-               ret_error(status, "'%s': unknown terminal type.\n", tname);
+               ret_error1(status, "unknown terminal type.\n", tname);

            }
        }
            }
        }

-
-       set_curterm(term_ptr);
-
-       if (command_character && getenv("CC"))
-           do_prototype();
-

 #if !USE_REENTRANT
 #if !USE_REENTRANT

-       strncpy(ttytype, cur_term->type.term_names, NAMESIZE - 1);
+       strncpy(ttytype, termp->type.term_names, (size_t) (NAMESIZE - 1));

        ttytype[NAMESIZE - 1] = '\0';
 #endif
 
        ttytype[NAMESIZE - 1] = '\0';
 #endif
 

-       cur_term->Filedes = Filedes;
-       cur_term->_termname = strdup(tname);
+       termp->Filedes = (short) Filedes;
+       termp->_termname = strdup(tname);
+
+       set_curterm(termp);
+
+       if (command_character)
+           _nc_tinfo_cmdch(termp, UChar(*command_character));

 
        /*
         * If an application calls setupterm() rather than initscr() or
 
        /*
         * If an application calls setupterm() rather than initscr() or


@@ -576,34 +752,108 @@ _nc_setupterm(NCURSES_CONST char *tname, int Filedes, int *errret, bool reuse)
         * _nc_setupscreen().  Do it now anyway, so we can initialize the
         * baudrate.
         */
         * _nc_setupscreen().  Do it now anyway, so we can initialize the
         * baudrate.
         */

-       if (isatty(Filedes)) {
+       if (NC_ISATTY(Filedes)) {

            def_prog_mode();
            baudrate();
        }
            def_prog_mode();
            baudrate();
        }

+       code = OK;
+#endif

     }
 
     }
 

+#ifdef USE_TERM_DRIVER
+    *tp = termp;
+    NCURSES_SP_NAME(set_curterm) (sp, termp);
+    TCB->drv->td_init(TCB);
+#else
+    sp = SP;
+#endif
+

     /*
      * We should always check the screensize, just in case.
      */
     /*
      * We should always check the screensize, just in case.
      */

-#if USE_REENTRANT
-    _nc_get_screensize(SP,
-                      SP ? &(SP->_LINES) : &(_nc_prescreen._LINES),
-                      SP ? &(SP->_COLS) : &(_nc_prescreen._COLS));
-#else
-    _nc_get_screensize(SP, &LINES, &COLS);
-#endif
+    TINFO_GET_SIZE(sp, termp, ptrLines(sp), ptrCols(sp));

 
     if (errret)
        *errret = TGETENT_YES;
 
 
     if (errret)
        *errret = TGETENT_YES;
 

+#ifndef USE_TERM_DRIVER

     if (generic_type) {
     if (generic_type) {

-       ret_error(TGETENT_NO, "'%s': I need something more specific.\n", tname);
+       /*
+        * BSD 4.3's termcap contains mis-typed "gn" for wy99.  Do a sanity
+        * check before giving up.
+        */
+       if ((VALID_STRING(cursor_address)
+            || (VALID_STRING(cursor_down) && VALID_STRING(cursor_home)))
+           && VALID_STRING(clear_screen)) {
+           ret_error1(TGETENT_YES, "terminal is not really generic.\n", tname);
+       } else {
+           del_curterm(termp);
+           ret_error1(TGETENT_NO, "I need something more specific.\n", tname);
+       }
+    } else if (hard_copy) {
+       ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", tname);

     }
     }

-    if (hard_copy) {
-       ret_error(TGETENT_YES, "'%s': I can't handle hardcopy terminals.\n", tname);
+#endif
+    returnCode(code);
+}
+
+#if NCURSES_SP_FUNCS
+/*
+ * In case of handling multiple screens, we need to have a screen before
+ * initialization in setupscreen takes place.  This is to extend the substitute
+ * for some of the stuff in _nc_prescreen, especially for slk and ripoff
+ * handling which should be done per screen.
+ */
+NCURSES_EXPORT(SCREEN *)
+new_prescr(void)
+{
+    static SCREEN *sp;
+
+    START_TRACE();
+    T((T_CALLED("new_prescr()")));
+
+    if (sp == 0) {
+       sp = _nc_alloc_screen_sp();
+       if (sp != 0) {
+           sp->rsp = sp->rippedoff;
+           sp->_filtered = _nc_prescreen.filter_mode;
+           sp->_use_env = _nc_prescreen.use_env;
+#if NCURSES_NO_PADDING
+           sp->_no_padding = _nc_prescreen._no_padding;
+#endif
+           sp->slk_format = 0;
+           sp->_slk = 0;
+           sp->_prescreen = TRUE;
+           SP_PRE_INIT(sp);
+#if USE_REENTRANT
+           sp->_TABSIZE = _nc_prescreen._TABSIZE;
+           sp->_ESCDELAY = _nc_prescreen._ESCDELAY;
+#endif
+       }

     }
     }

-    returnCode(OK);
+    returnSP(sp);

 }
 }

+#endif
+
+#ifdef USE_TERM_DRIVER
+/*
+ * This entrypoint is called from tgetent() to allow a special case of reusing
+ * the same TERMINAL data (see comment).
+ */
+NCURSES_EXPORT(int)
+_nc_setupterm(NCURSES_CONST char *tname,
+             int Filedes,
+             int *errret,
+             int reuse)
+{
+    int res;
+    TERMINAL *termp = 0;
+    res = TINFO_SETUP_TERM(&termp, tname, Filedes, errret, reuse);
+    if (ERR != res)
+       NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN_PRE, termp);
+    return res;
+}
+#endif

 
 /*
  *     setupterm(termname, Filedes, errret)
 
 /*
  *     setupterm(termname, Filedes, errret)