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 ab27eb1d8eb90f5719376bc3195de017ef392c6f..522929009c1f7a9612265507b6d4bc4807a1663f 100644 (file)
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2011,2012 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            *


@@ -37,6 +37,7 @@
  * 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 *)
  */
 
  *             setupterm(char *, int, int *)
  */
 


@@ -47,7 +48,7 @@
 #include <locale.h>
 #endif
 
 #include <locale.h>
 #endif
 

-MODULE_ID("$Id: lib_setup.c,v 1.143 2012/02/29 11:50:19 Werner.Fink Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.160 2014/04/26 18:47:20 juergen Exp $")

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


@@ -231,6 +232,21 @@ NCURSES_SP_NAME(use_env) (NCURSES_SP_DCLx bool f)
     returnVoid;
 }
 
     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)
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(void)
 use_env(bool f)


@@ -240,6 +256,15 @@ use_env(bool f)
     _nc_prescreen.use_env = f;
     returnVoid;
 }
     _nc_prescreen.use_env = f;
     returnVoid;
 }

+
+NCURSES_EXPORT(void)
+use_tioctl(bool f)
+{
+    T((T_CALLED("use_tioctl(%d)"), (int) f));
+    START_TRACE();
+    _nc_prescreen.use_tioctl = f;
+    returnVoid;
+}

 #endif
 
 NCURSES_EXPORT(void)
 #endif
 
 NCURSES_EXPORT(void)


@@ -258,7 +283,7 @@ _nc_get_screensize(SCREEN *sp,
     TCB = (TERMINAL_CONTROL_BLOCK *) termp;
 
     my_tabsize = TCB->info.tabsize;
     TCB = (TERMINAL_CONTROL_BLOCK *) termp;
 
     my_tabsize = TCB->info.tabsize;

-    TCB->drv->size(TCB, linep, colp);
+    TCB->drv->td_size(TCB, linep, colp);

 
 #if USE_REENTRANT
     if (sp != 0) {
 
 #if USE_REENTRANT
     if (sp != 0) {


@@ -279,7 +304,7 @@ _nc_get_screensize(SCREEN *sp,
     *linep = (int) lines;
     *colp = (int) columns;
 
     *linep = (int) lines;
     *colp = (int) columns;
 

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

        int value;
 
 #ifdef __EMX__
        int value;
 
 #ifdef __EMX__


@@ -287,14 +312,16 @@ _nc_get_screensize(SCREEN *sp,
            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
        /* try asking the OS */
            T(("EMX screen size: environment LINES = %d COLUMNS = %d",
               *linep, *colp));
        }
 #endif
 #if HAVE_SIZECHANGE
        /* try asking the OS */

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

            STRUCT_WINSIZE size;
 
            errno = 0;
            STRUCT_WINSIZE size;
 
            errno = 0;


@@ -313,19 +340,33 @@ _nc_get_screensize(SCREEN *sp,
        }
 #endif /* HAVE_SIZECHANGE */
 
        }
 #endif /* HAVE_SIZECHANGE */
 

-       /*
-        * 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));
+       if (_nc_prescreen.use_env) {
+           if (_nc_prescreen.use_tioctl) {
+               /*
+                * If environment variables are used, update them.
+                */
+               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));
+           }

        }
 
        /* if we can't get dynamic info about the size, use static */
        }
 
        /* if we can't get dynamic info about the size, use static */


@@ -382,7 +423,7 @@ _nc_update_screensize(SCREEN *sp)
 
     assert(sp != 0);
 
 
     assert(sp != 0);
 

-    CallDriver_2(sp, getsize, &old_lines, &old_cols);
+    CallDriver_2(sp, td_getsize, &old_lines, &old_cols);

 
 #else
     TERMINAL *termp = cur_term;
 
 #else
     TERMINAL *termp = cur_term;


@@ -397,10 +438,12 @@ _nc_update_screensize(SCREEN *sp)
      * We're doing it this way because those functions belong to the upper
      * ncurses library, while this resides in the lower terminfo library.
      */
      * 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))
+    if (sp != 0 && sp->_resize != 0) {
+       if ((new_lines != old_lines) || (new_cols != old_cols)) {

            sp->_resize(NCURSES_SP_ARGx new_lines, new_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;
     }
 }


@@ -412,7 +455,7 @@ _nc_update_screensize(SCREEN *sp)
  *
  ****************************************************************************/
 
  *
  ****************************************************************************/
 

-#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().


@@ -502,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));


@@ -590,7 +635,11 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
     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

        }
     }
 
        }
     }
 


@@ -606,7 +655,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
      * 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;
 
     /*


@@ -633,9 +682,14 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
        && _nc_name_match(termp->type.term_names, tname, "|")) {
        T(("reusing existing terminal information and mode-settings"));
        code = OK;
        && _nc_name_match(termp->type.term_names, tname, "|")) {
        T(("reusing existing terminal information and mode-settings"));
        code = OK;

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

     } else {
 #ifdef USE_TERM_DRIVER
     } else {
 #ifdef USE_TERM_DRIVER

-       termp = (TERMINAL *) typeCalloc(TERMINAL_CONTROL_BLOCK, 1);
+       TERMINAL_CONTROL_BLOCK *my_tcb;
+       my_tcb = typeCalloc(TERMINAL_CONTROL_BLOCK, 1);
+       termp = &(my_tcb->term);

 #else
        termp = typeCalloc(TERMINAL, 1);
 #endif
 #else
        termp = typeCalloc(TERMINAL, 1);
 #endif


@@ -655,7 +709,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
                       "Could not find any driver to handle this terminal.\n");
        }
 #else
                       "Could not find any driver to handle this terminal.\n");
        }
 #else

-#if USE_DATABASE || USE_TERMCAP
+#if NCURSES_USE_DATABASE || NCURSES_USE_TERMCAP

        status = _nc_setup_tinfo(tname, &termp->type);
 #else
        status = TGETENT_NO;
        status = _nc_setup_tinfo(tname, &termp->type);
 #else
        status = TGETENT_NO;


@@ -666,7 +720,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
            const TERMTYPE *fallback = _nc_fallback(tname);
 
            if (fallback) {
            const TERMTYPE *fallback = _nc_fallback(tname);
 
            if (fallback) {

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

                status = TGETENT_YES;
            }
        }
                status = TGETENT_YES;
            }
        }


@@ -698,7 +752,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
         * _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();
        }


@@ -709,7 +763,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
 #ifdef USE_TERM_DRIVER
     *tp = termp;
     NCURSES_SP_NAME(set_curterm) (sp, termp);
 #ifdef USE_TERM_DRIVER
     *tp = termp;
     NCURSES_SP_NAME(set_curterm) (sp, termp);

-    TCB->drv->init(TCB);
+    TCB->drv->td_init(TCB);

 #else
     sp = SP;
 #endif
 #else
     sp = SP;
 #endif


@@ -733,6 +787,7 @@ TINFO_SETUP_TERM(TERMINAL ** tp,
            && VALID_STRING(clear_screen)) {
            ret_error1(TGETENT_YES, "terminal is not really generic.\n", tname);
        } else {
            && 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_NO, "I need something more specific.\n", tname);
        }
     } else if (hard_copy) {


@@ -792,7 +847,7 @@ _nc_setupterm(NCURSES_CONST char *tname,
              int reuse)
 {
     int res;
              int reuse)
 {
     int res;

-    TERMINAL *termp;
+    TERMINAL *termp = 0;

     res = TINFO_SETUP_TERM(&termp, tname, Filedes, errret, reuse);
     if (ERR != res)
        NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN_PRE, termp);
     res = TINFO_SETUP_TERM(&termp, tname, Filedes, errret, reuse);
     if (ERR != res)
        NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN_PRE, termp);