#include <term.h> /* lines, columns, cur_term */
-MODULE_ID("$Id: lib_setup.c,v 1.105 2008/05/03 22:41:42 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.108 2008/06/21 21:00:18 tom Exp $")
/****************************************************************************
*
static char empty[] = "";
return cur_term ? cur_term->type.term_names : empty;
}
+NCURSES_EXPORT(int *)
+_nc_ptr_Lines(void)
+{
+ return ptrLines();
+}
NCURSES_EXPORT(int)
NCURSES_PUBLIC_VAR(LINES) (void)
{
- return (SP ? SP->_LINES : _nc_prescreen._LINES);
+ return *_nc_ptr_Lines();
+}
+NCURSES_EXPORT(int *)
+_nc_ptr_Cols(void)
+{
+ return ptrCols();
}
NCURSES_EXPORT(int)
NCURSES_PUBLIC_VAR(COLS) (void)
{
- return SP ? SP->_COLS : _nc_prescreen._COLS;
+ return *_nc_ptr_Cols();
}
NCURSES_EXPORT(int)
NCURSES_PUBLIC_VAR(TABSIZE) (void)
** and substitute it in for the prototype given in 'command_character'.
*/
static void
-do_prototype(void)
+do_prototype(TERMINAL * termp)
{
int i;
char CC;
CC = *tmp;
proto = *command_character;
- for_each_string(i, &(cur_term->type)) {
- for (tmp = cur_term->type.Strings[i]; *tmp; tmp++) {
+ for_each_string(i, &(termp->type)) {
+ for (tmp = termp->type.Strings[i]; *tmp; tmp++) {
if (*tmp == proto)
*tmp = CC;
}
NCURSES_EXPORT(int)
_nc_setupterm(NCURSES_CONST char *tname, int Filedes, int *errret, bool reuse)
{
+ TERMINAL *term_ptr;
int status;
START_TRACE();
* properly with this feature).
*/
if (reuse
- && cur_term != 0
- && cur_term->Filedes == Filedes
- && cur_term->_termname != 0
- && !strcmp(cur_term->_termname, tname)
- && _nc_name_match(cur_term->type.term_names, tname, "|")) {
+ && (term_ptr = cur_term) != 0
+ && term_ptr->Filedes == Filedes
+ && term_ptr->_termname != 0
+ && !strcmp(term_ptr->_termname, tname)
+ && _nc_name_match(term_ptr->type.term_names, tname, "|")) {
T(("reusing existing terminal information and mode-settings"));
} else {
- TERMINAL *term_ptr;
term_ptr = typeCalloc(TERMINAL, 1);
ret_error(status, "'%s': unknown terminal type.\n", tname);
}
}
-
- set_curterm(term_ptr);
-
- if (command_character && getenv("CC"))
- do_prototype();
-
#if !USE_REENTRANT
- strncpy(ttytype, cur_term->type.term_names, NAMESIZE - 1);
+ strncpy(ttytype, term_ptr->type.term_names, NAMESIZE - 1);
ttytype[NAMESIZE - 1] = '\0';
#endif
- cur_term->Filedes = Filedes;
- cur_term->_termname = strdup(tname);
+ term_ptr->Filedes = Filedes;
+ term_ptr->_termname = strdup(tname);
+
+ set_curterm(term_ptr);
+
+ if (command_character && getenv("CC"))
+ do_prototype(term_ptr);
/*
* If an application calls setupterm() rather than initscr() or
/*
* We should always check the screensize, just in case.
*/
-#if USE_REENTRANT
- _nc_get_screensize(SP,
- SP ? &(SP->_LINES) : &(_nc_prescreen._LINES),
- SP ? &(SP->_COLS) : &(_nc_prescreen._COLS));
-#else
- _nc_get_screensize(SP, &LINES, &COLS);
-#endif
+ _nc_get_screensize(SP, ptrLines(), ptrCols());
if (errret)
*errret = TGETENT_YES;