ncurses 5.6 - patch 20080607

[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 3250147c8066eaede2749d01a01a0362bf3ed6ad..d0aad633dd287340bfa5d9197d89fc61eee6d9dc 100644 (file)
--- a/ncurses/tinfo/lib_cur_term.c
+++ b/ncurses/tinfo/lib_cur_term.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2003,2008 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,34 +37,69 @@
  */
 
 #include <curses.priv.h>
-#include <term_entry.h>        /* TTY, cur_term */
-#include <termcap.h>   /* ospeed */
+#include <term_entry.h>                /* TTY, cur_term */
+#include <termcap.h>           /* ospeed */
 
-MODULE_ID("$Id: lib_cur_term.c,v 1.8 1999/07/24 20:08:19 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.16 2008/06/07 22:22:16 tom Exp $")
 
-TERMINAL *cur_term;
+#undef CUR
+#define CUR termp->type.
 
-TERMINAL *set_curterm(TERMINAL *termp)
+#if USE_REENTRANT
+NCURSES_EXPORT(TERMINAL *)
+NCURSES_PUBLIC_VAR(cur_term) (void)
 {
-       TERMINAL *oldterm = cur_term;
+    return (SP != 0 && SP->_term != 0) ? SP->_term : _nc_prescreen._cur_term;
+}
+#else
+NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
+#endif
+
+NCURSES_EXPORT(TERMINAL *)
+set_curterm(TERMINAL * termp)
+{
+    TERMINAL *oldterm;
+
+    T((T_CALLED("set_curterm(%p)"), termp));
 
-       if ((cur_term = termp) != 0) {
-               ospeed = _nc_ospeed(cur_term->_baudrate);
-               PC = (pad_char != NULL) ? pad_char[0] : 0; 
+    _nc_lock_global(curses);
+    oldterm = cur_term;
+    if (SP)
+       SP->_term = termp;
+#if USE_REENTRANT
+    _nc_prescreen._cur_term = termp;
+#else
+    cur_term = termp;
+#endif
+    if (termp != 0) {
+       ospeed = _nc_ospeed(termp->_baudrate);
+       if (termp->type.Strings) {
+           PC = (pad_char != NULL) ? pad_char[0] : 0;
        }
-       return oldterm;
+    }
+    _nc_unlock_global(curses);
+
+    T((T_RETURN("%p"), oldterm));
+    return (oldterm);
 }
 
-int del_curterm(TERMINAL *termp)
+NCURSES_EXPORT(int)
+del_curterm(TERMINAL * termp)
 {
-       T((T_CALLED("del_curterm(%p)"), termp));
+    int rc = ERR;
 
-       if (termp != 0) {
-               _nc_free_termtype(&(termp->type));
-               free(termp);
-               if (termp == cur_term)
-                       cur_term = 0;
-               returnCode(OK);
-       }
-       returnCode(ERR);
+    T((T_CALLED("del_curterm(%p)"), termp));
+
+    _nc_lock_global(curses);
+    if (termp != 0) {
+       _nc_free_termtype(&(termp->type));
+       FreeIfNeeded(termp->_termname);
+       free(termp);
+       if (termp == cur_term)
+           set_curterm(0);
+       rc = OK;
+    }
+    _nc_unlock_global(curses);
+
+    returnCode(rc);
 }