ncurses 5.7 - patch 20090919

[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 e1b4f942997d5274965e9be69fe83f5e5335af75..7607d74e9ec1ae2008bbf71adfb48412d3403d86 100644 (file)
--- a/ncurses/tinfo/lib_cur_term.c
+++ b/ncurses/tinfo/lib_cur_term.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2003,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,2009 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            *
@@ -40,53 +40,139 @@
 #include <term_entry.h>                /* TTY, cur_term */
 #include <termcap.h>           /* ospeed */
 
-MODULE_ID("$Id: lib_cur_term.c,v 1.15 2008/05/24 23:11:18 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.27 2009/09/13 14:40:05 tom Exp $")
+
+#undef CUR
+#define CUR termp->type.
+
+#if BROKEN_LINKER && !USE_REENTRANT
+NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
+#elif BROKEN_LINKER || 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 USE_REENTRANT
 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 *)
-set_curterm(TERMINAL * termp)
+NCURSES_SP_NAME(set_curterm) (NCURSES_SP_DCLx TERMINAL * termp)
 {
-    TERMINAL *oldterm = cur_term;
+    TERMINAL *oldterm;
 
     T((T_CALLED("set_curterm(%p)"), termp));
 
-    if (SP)
-       SP->_term = termp;
-#if USE_REENTRANT
-    _nc_prescreen._cur_term = termp;
-#else
+    _nc_lock_global(curses);
+    oldterm = cur_term;
+    if (SP_PARM)
+       SP_PARM->_term = termp;
+#if BROKEN_LINKER && !USE_REENTRANT
     cur_term = termp;
+#else
+    CurTerm = termp;
 #endif
     if (termp != 0) {
+#ifdef USE_TERM_DRIVER
+       TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
        ospeed = _nc_ospeed(termp->_baudrate);
-       PC = (pad_char != NULL) ? pad_char[0] : 0;
+       if (TCB->drv->isTerminfo && termp->type.Strings) {
+           PC = (char) ((pad_char != NULL) ? 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);
+       }
+#endif
     }
+    _nc_unlock_global(curses);
 
     T((T_RETURN("%p"), 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)
-del_curterm(TERMINAL * termp)
+NCURSES_SP_NAME(del_curterm) (NCURSES_SP_DCLx TERMINAL * termp)
 {
-    T((T_CALLED("del_curterm(%p)"), termp));
+    int rc = ERR;
+
+    T((T_CALLED("del_curterm(%p, %p)"), SP_PARM, 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
+                           NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_ARG)
+#else
+                           cur_term
+#endif
+       );
+
        _nc_free_termtype(&(termp->type));
+       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)
+           FreeAndNull(_nc_globals.home_terminfo);
+#endif
+#ifdef USE_TERM_DRIVER
+       if (TCB->drv)
+           TCB->drv->release(TCB);
+#endif
        free(termp);
-       if (termp == cur_term)
-           set_curterm(0);
-       returnCode(OK);
+
+       rc = OK;
     }
-    returnCode(ERR);
+    returnCode(rc);
 }
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+del_curterm(TERMINAL * termp)
+{
+    int rc = ERR;
+
+    _nc_lock_global(curses);
+    rc = NCURSES_SP_NAME(del_curterm) (CURRENT_SCREEN, termp);
+    _nc_unlock_global(curses);
+
+    return (rc);
+}
+#endif