ncurses 6.2 - patch 20200404

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

diff --git a/ncurses/tinfo/lib_cur_term.c b/ncurses/tinfo/lib_cur_term.c
index 26e8dc8d4d971fea7465e1583c1a6bed913cb2a4..4a90335d5e333ecdd5a820f1fe40162e1aeaa2a5 100644 (file)
--- a/ncurses/tinfo/lib_cur_term.c
+++ b/ncurses/tinfo/lib_cur_term.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2016,2017 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,87 +38,151 @@
  */
 
 #include <curses.priv.h>
  */
 
 #include <curses.priv.h>

-#include <term_entry.h>                /* TTY, cur_term */

 #include <termcap.h>           /* ospeed */
 
 #include <termcap.h>           /* ospeed */
 

-MODULE_ID("$Id: lib_cur_term.c,v 1.22 2009/05/30 13:55:19 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.42 2020/02/02 23:34:34 tom Exp $")

 
 #undef CUR
 
 #undef CUR

-#define CUR termp->type.
+#define CUR TerminalType(termp).
+
+#if USE_REENTRANT
+
+NCURSES_EXPORT(TERMINAL *)
+NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_DCL0)
+{
+    return ((0 != TerminalOf(SP_PARM)) ? TerminalOf(SP_PARM) : CurTerm);
+}
+
+#if NCURSES_SP_FUNCS
+
+NCURSES_EXPORT(TERMINAL *)
+_nc_get_cur_term(void)
+{
+    return NCURSES_SP_NAME(_nc_get_cur_term) (CURRENT_SCREEN);
+}
+#endif

 
 

-#if BROKEN_LINKER && !USE_REENTRANT
-NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
-#elif BROKEN_LINKER || USE_REENTRANT

 NCURSES_EXPORT(TERMINAL *)
 NCURSES_PUBLIC_VAR(cur_term) (void)
 {
 NCURSES_EXPORT(TERMINAL *)
 NCURSES_PUBLIC_VAR(cur_term) (void)
 {

-    return (SP != 0 && SP->_term != 0) ? SP->_term : _nc_prescreen._cur_term;
+#if NCURSES_SP_FUNCS
+    return NCURSES_SP_NAME(_nc_get_cur_term) (CURRENT_SCREEN);
+#else
+    return NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_ARG);
+#endif

 }
 }

+

 #else
 NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
 #endif
 
 NCURSES_EXPORT(TERMINAL *)
 #else
 NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
 #endif
 
 NCURSES_EXPORT(TERMINAL *)

-set_curterm(TERMINAL * termp)
+NCURSES_SP_NAME(set_curterm) (NCURSES_SP_DCLx TERMINAL *termp)

 {
     TERMINAL *oldterm;
 
 {
     TERMINAL *oldterm;
 

-    T((T_CALLED("set_curterm(%p)"), termp));
+    T((T_CALLED("set_curterm(%p)"), (void *) termp));

 
     _nc_lock_global(curses);
     oldterm = cur_term;
 
     _nc_lock_global(curses);
     oldterm = cur_term;

-    if (SP)
-       SP->_term = termp;
-#if BROKEN_LINKER && !USE_REENTRANT
-    cur_term = termp;
-#elif BROKEN_LINKER || USE_REENTRANT
-    _nc_prescreen._cur_term = termp;
+    if (SP_PARM)
+       SP_PARM->_term = termp;
+#if USE_REENTRANT
+    CurTerm = termp;

 #else
     cur_term = termp;
 #endif
     if (termp != 0) {
 #else
     cur_term = termp;
 #endif
     if (termp != 0) {

-       ospeed = _nc_ospeed(termp->_baudrate);
-       if (termp->type.Strings) {
+#ifdef USE_TERM_DRIVER
+       TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
+       ospeed = (NCURSES_OSPEED) _nc_ospeed(termp->_baudrate);
+       if (TCB->drv &&
+           TCB->drv->isTerminfo &&
+           TerminalType(termp).Strings) {

            PC = (char) ((pad_char != NULL) ? pad_char[0] : 0);
        }
            PC = (char) ((pad_char != NULL) ? pad_char[0] : 0);
        }

+       TCB->csp = SP_PARM;
+#else
+       ospeed = (NCURSES_OSPEED) _nc_ospeed(termp->_baudrate);
+       if (TerminalType(termp).Strings) {
+           PC = (char) ((pad_char != NULL) ? pad_char[0] : 0);
+       }
+#endif
+#if !USE_REENTRANT
+       save_ttytype(termp);
+#endif

     }
     _nc_unlock_global(curses);
 
     }
     _nc_unlock_global(curses);
 

-    T((T_RETURN("%p"), oldterm));
+    T((T_RETURN("%p"), (void *) oldterm));

     return (oldterm);
 }
 
     return (oldterm);
 }
 

+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(TERMINAL *)
+set_curterm(TERMINAL *termp)
+{
+    return NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN, termp);
+}
+#endif
+

 NCURSES_EXPORT(int)
 NCURSES_EXPORT(int)

-NCURSES_SP_NAME(del_curterm) (NCURSES_SP_DCLx TERMINAL * termp)
+NCURSES_SP_NAME(del_curterm) (NCURSES_SP_DCLx TERMINAL *termp)

 {
     int rc = ERR;
 
 {
     int rc = ERR;
 

-    T((T_CALLED("del_curterm(%p)"), termp));
+    T((T_CALLED("del_curterm(%p, %p)"), (void *) SP_PARM, (void *) termp));

 
 

-    _nc_lock_global(curses);

     if (termp != 0) {
     if (termp != 0) {

-       _nc_free_termtype(&(termp->type));
+#ifdef USE_TERM_DRIVER
+       TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
+#endif
+       TERMINAL *cur = (
+#if USE_REENTRANT
+                           NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_ARG)
+#else
+                           cur_term
+#endif
+       );
+
+#if NCURSES_EXT_NUMBERS
+       _nc_free_termtype(&termp->type);
+#endif
+       _nc_free_termtype2(&TerminalType(termp));
+       if (termp == cur)
+           NCURSES_SP_NAME(set_curterm) (NCURSES_SP_ARGx 0);
+

        FreeIfNeeded(termp->_termname);
 #if USE_HOME_TERMINFO
        FreeIfNeeded(termp->_termname);
 #if USE_HOME_TERMINFO

-       if (_nc_globals.home_terminfo != 0)
+       if (_nc_globals.home_terminfo != 0) {

            FreeAndNull(_nc_globals.home_terminfo);
            FreeAndNull(_nc_globals.home_terminfo);

+       }
+#endif
+#ifdef USE_TERM_DRIVER
+       if (TCB->drv)
+           TCB->drv->td_release(TCB);
+#endif
+#if NO_LEAKS
+       /* discard memory used in tgetent's cache for this terminal */
+       _nc_tgetent_leak(termp);

 #endif
        free(termp);
 #endif
        free(termp);

-       if (termp == cur_term)
-           set_curterm(0);
+

        rc = OK;
     }
        rc = OK;
     }

-    _nc_unlock_global(curses);
-

     returnCode(rc);
 }
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
     returnCode(rc);
 }
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)

-del_curterm(TERMINAL * termp)
+del_curterm(TERMINAL *termp)

 {
 {

-    int rc = ERR;
+    int rc;
+
+    _nc_lock_global(curses);

     rc = NCURSES_SP_NAME(del_curterm) (CURRENT_SCREEN, termp);
     rc = NCURSES_SP_NAME(del_curterm) (CURRENT_SCREEN, termp);

+    _nc_unlock_global(curses);
+

     return (rc);
 }
 #endif
     return (rc);
 }
 #endif