ncurses 6.4 - patch 20240414

[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 d2562767f7fbae132d62e466dd85bfe4b005da1d..1f8db2c1e0c8587984503ffe69b0d22b239a24f9 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-2021,2022 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            *
@@ -37,17 +38,15 @@
  */
 
 #include <curses.priv.h>
-#include <term_entry.h>                /* TTY, cur_term */
 #include <termcap.h>           /* ospeed */
+#include <tic.h>               /* VALID_STRING */
 
-MODULE_ID("$Id: lib_cur_term.c,v 1.24 2009/08/22 22:37:13 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.49 2022/05/28 17:56:55 tom Exp $")
 
 #undef CUR
-#define CUR termp->type.
+#define CUR TerminalType(termp).
 
-#if BROKEN_LINKER && !USE_REENTRANT
-NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
-#elif BROKEN_LINKER || USE_REENTRANT
+#if USE_REENTRANT
 
 NCURSES_EXPORT(TERMINAL *)
 NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_DCL0)
@@ -56,6 +55,7 @@ NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_DCL0)
 }
 
 #if NCURSES_SP_FUNCS
+
 NCURSES_EXPORT(TERMINAL *)
 _nc_get_cur_term(void)
 {
@@ -66,7 +66,11 @@ _nc_get_cur_term(void)
 NCURSES_EXPORT(TERMINAL *)
 NCURSES_PUBLIC_VAR(cur_term) (void)
 {
+#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
@@ -74,96 +78,118 @@ NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
 #endif
 
 NCURSES_EXPORT(TERMINAL *)
-NCURSES_SP_NAME(set_curterm) (NCURSES_SP_DCLx TERMINAL * termp)
+NCURSES_SP_NAME(set_curterm) (NCURSES_SP_DCLx TERMINAL *termp)
 {
     TERMINAL *oldterm;
 
-    T((T_CALLED("set_curterm(%p)"), termp));
+    T((T_CALLED("set_curterm(%p)"), (void *) termp));
 
     _nc_lock_global(curses);
     oldterm = cur_term;
     if (SP_PARM)
        SP_PARM->_term = termp;
-#if BROKEN_LINKER && !USE_REENTRANT
-    cur_term = termp;
-#else
+#if USE_REENTRANT
     CurTerm = termp;
+#else
+    cur_term = termp;
 #endif
     if (termp != 0) {
 #ifdef USE_TERM_DRIVER
        TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
-       ospeed = _nc_ospeed(termp->_baudrate);
-       if (TCB->drv->isTerminfo && termp->type.Strings) {
-           PC = (char) ((pad_char != NULL) ? pad_char[0] : 0);
+       ospeed = (NCURSES_OSPEED) _nc_ospeed(termp->_baudrate);
+       if (TCB->drv &&
+           TCB->drv->isTerminfo &&
+           TerminalType(termp).Strings) {
+           PC = (char) (VALID_STRING(pad_char) ? pad_char[0] : 0);
        }
        TCB->csp = SP_PARM;
 #else
-       ospeed = _nc_ospeed(termp->_baudrate);
-       if (termp->type.Strings) {
-           PC = (char) ((pad_char != NULL) ? pad_char[0] : 0);
+       ospeed = (NCURSES_OSPEED) _nc_ospeed(termp->_baudrate);
+       if (TerminalType(termp).Strings) {
+           PC = (char) (VALID_STRING(pad_char) ? pad_char[0] : 0);
        }
+#endif
+#if !USE_REENTRANT
+       save_ttytype(termp);
 #endif
     }
     _nc_unlock_global(curses);
 
-    T((T_RETURN("%p"), oldterm));
+    T((T_RETURN("%p"), (void *) oldterm));
     return (oldterm);
 }
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(TERMINAL *)
-set_curterm(TERMINAL * termp)
+set_curterm(TERMINAL *termp)
 {
     return NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN, termp);
 }
 #endif
 
 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;
 
-    T((T_CALLED("del_curterm(%p, %p)"), SP_PARM, termp));
+    T((T_CALLED("del_curterm(%p, %p)"), (void *) SP_PARM, (void *) termp));
 
     if (termp != 0) {
 #ifdef USE_TERM_DRIVER
        TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
 #endif
        TERMINAL *cur = (
-#if BROKEN_LINKER && !USE_REENTRANT
-                           cur_term
-#elif BROKEN_LINKER || USE_REENTRANT
+#if USE_REENTRANT
                            NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_ARG)
 #else
                            cur_term
 #endif
        );
 
-       _nc_free_termtype(&(termp->type));
+#if NCURSES_EXT_NUMBERS
+#if NCURSES_EXT_COLORS
+       _nc_free_termtype1(&termp->type);
+#else
+       _nc_free_termtype2(&termp->type);
+#endif
+#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
-       if (_nc_globals.home_terminfo != 0)
+       if (_nc_globals.home_terminfo != 0) {
            FreeAndNull(_nc_globals.home_terminfo);
+       }
 #endif
 #ifdef USE_TERM_DRIVER
        if (TCB->drv)
-           TCB->drv->release(TCB);
+           TCB->drv->td_release(TCB);
 #endif
+#if NO_LEAKS
+       /* discard memory used in tgetent's cache for this terminal */
+       _nc_tgetent_leak(termp);
+#endif
+       if (--_nc_globals.terminal_count == 0) {
+           _nc_free_tparm(termp);
+       }
+
+       free(termp->tparm_state.fmt_buff);
+       free(termp->tparm_state.out_buff);
        free(termp);
 
        rc = OK;
     }
+
     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);