From 084d7341e201b5153031223070580cfac88a038a Mon Sep 17 00:00:00 2001 From: delphij Date: Fri, 28 Feb 2014 19:12:44 +0000 Subject: Undo two previous imports which was never done in preparation of doing a new import. --- ncurses/base/lib_newterm.c | 234 ++++++++++++--------------------------------- 1 file changed, 59 insertions(+), 175 deletions(-) (limited to 'ncurses/base/lib_newterm.c') diff --git a/ncurses/base/lib_newterm.c b/ncurses/base/lib_newterm.c index e12208b..05982b84 100644 --- a/ncurses/base/lib_newterm.c +++ b/ncurses/base/lib_newterm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2007,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 * @@ -30,7 +30,6 @@ * Author: Zeyd M. Ben-Halim 1992,1995 * * and: Eric S. Raymond * * and: Thomas E. Dickey 1996-on * - * and: Juergen Pfeifer 2009 * ****************************************************************************/ /* @@ -46,19 +45,10 @@ #define _POSIX_SOURCE #endif -#ifndef CUR -#define CUR SP_TERMTYPE -#endif - +#include /* clear_screen, cup & friends, cur_term */ #include -MODULE_ID("$Id: lib_newterm.c,v 1.86 2010/05/20 23:25:18 tom Exp $") - -#ifdef USE_TERM_DRIVER -#define NumLabels InfoOf(SP_PARM).numlabels -#else -#define NumLabels num_labels -#endif +MODULE_ID("$Id: lib_newterm.c,v 1.73 2008/08/16 21:20:48 Werner.Fink Exp $") #ifndef ONLCR /* Allows compilation under the QNX 4.2 OS */ #define ONLCR 0 @@ -73,29 +63,27 @@ MODULE_ID("$Id: lib_newterm.c,v 1.86 2010/05/20 23:25:18 tom Exp $") * is supposed to behave as if it calls newterm, we do it here. */ static NCURSES_INLINE int -_nc_initscr(NCURSES_SP_DCL0) +_nc_initscr(void) { int result = ERR; - TERMINAL *term = TerminalOf(SP_PARM); /* for extended XPG4 conformance requires cbreak() at this point */ /* (SVr4 curses does this anyway) */ - if (NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG) == OK) { + if (cbreak() == OK) { TTY buf; - buf = term->Nttyb; + buf = cur_term->Nttyb; #ifdef TERMIOS - buf.c_lflag &= (unsigned) ~(ECHO | ECHONL); - buf.c_iflag &= (unsigned) ~(ICRNL | INLCR | IGNCR); - buf.c_oflag &= (unsigned) ~(ONLCR); + buf.c_lflag &= ~(ECHO | ECHONL); + buf.c_iflag &= ~(ICRNL | INLCR | IGNCR); + buf.c_oflag &= ~(ONLCR); #elif HAVE_SGTTY_H buf.sg_flags &= ~(ECHO | CRMOD); #else memset(&buf, 0, sizeof(buf)); #endif - result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf); - if (result == OK) - term->Nttyb = buf; + if ((result = _nc_set_tty_mode(&buf)) == OK) + cur_term->Nttyb = buf; } return result; } @@ -107,30 +95,13 @@ _nc_initscr(NCURSES_SP_DCL0) * initialized. */ NCURSES_EXPORT(void) -NCURSES_SP_NAME(filter) (NCURSES_SP_DCL0) -{ - START_TRACE(); - T((T_CALLED("filter(%p)"), (void *) SP_PARM)); -#if NCURSES_SP_FUNCS - if (IsPreScreen(SP_PARM)) { - SP_PARM->_filtered = TRUE; - } -#else - _nc_prescreen.filter_mode = TRUE; -#endif - returnVoid; -} - -#if NCURSES_SP_FUNCS -NCURSES_EXPORT(void) filter(void) { START_TRACE(); - T((T_CALLED("filter()"))); + T((T_CALLED("filter"))); _nc_prescreen.filter_mode = TRUE; returnVoid; } -#endif #if NCURSES_EXT_FUNCS /* @@ -138,125 +109,62 @@ filter(void) * requiring it to also be filtered. */ NCURSES_EXPORT(void) -NCURSES_SP_NAME(nofilter) (NCURSES_SP_DCL0) -{ - START_TRACE(); - T((T_CALLED("nofilter(%p)"), (void *) SP_PARM)); -#if NCURSES_SP_FUNCS - if (IsPreScreen(SP_PARM)) { - SP_PARM->_filtered = FALSE; - } -#else - _nc_prescreen.filter_mode = FALSE; -#endif - returnVoid; -} - -#if NCURSES_SP_FUNCS -NCURSES_EXPORT(void) nofilter(void) { START_TRACE(); - T((T_CALLED("nofilter()"))); + T((T_CALLED("nofilter"))); _nc_prescreen.filter_mode = FALSE; returnVoid; } #endif -#endif /* NCURSES_EXT_FUNCS */ NCURSES_EXPORT(SCREEN *) -NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx - NCURSES_CONST char *name, - FILE *ofp, - FILE *ifp) +newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp) { int value; int errret; - SCREEN *result = 0; SCREEN *current; + SCREEN *result = 0; TERMINAL *its_term; - FILE *_ofp = ofp ? ofp : stdout; - FILE *_ifp = ifp ? ifp : stdin; - int cols; - int slk_format; - int filter_mode; - TERMINAL *new_term = 0; START_TRACE(); - T((T_CALLED("newterm(%p, \"%s\", %p,%p)"), - (void *) SP_PARM, - name, - (void *) ofp, - (void *) ifp)); - -#if NCURSES_SP_FUNCS - assert(SP_PARM != 0); - if (SP_PARM == 0) - returnSP(SP_PARM); -#endif + T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp)); _nc_init_pthreads(); _nc_lock_global(curses); - current = CURRENT_SCREEN; - its_term = (current ? current->_term : 0); + current = SP; + its_term = (SP ? SP->_term : 0); - INIT_TERM_DRIVER(); /* this loads the capability entry, then sets LINES and COLS */ - if ( -#if NCURSES_SP_FUNCS - SP_PARM->_prescreen && -#endif - TINFO_SETUP_TERM(&new_term, name, - fileno(_ofp), &errret, FALSE) != ERR) { - - _nc_set_screen(0); -#ifdef USE_TERM_DRIVER - assert(new_term != 0); -#endif - -#if NCURSES_SP_FUNCS - slk_format = SP_PARM->slk_format; - filter_mode = SP_PARM->_filtered; -#else - slk_format = _nc_globals.slk_format; - filter_mode = _nc_prescreen.filter_mode; -#endif + if (setupterm(name, fileno(ofp), &errret) != ERR) { + int slk_format = _nc_globals.slk_format; /* * This actually allocates the screen structure, and saves the original * terminal settings. */ - if (NCURSES_SP_NAME(_nc_setupscreen) ( -#if NCURSES_SP_FUNCS - &SP_PARM, -#endif - *(ptrLines(SP_PARM)), - *(ptrCols(SP_PARM)), - _ofp, - filter_mode, - slk_format) == ERR) { + _nc_set_screen(0); + + /* allow user to set maximum escape delay from the environment */ + if ((value = _nc_getenv_num("ESCDELAY")) >= 0) { + set_escdelay(value); + } + + if (_nc_setupscreen(LINES, + COLS, + ofp, + _nc_prescreen.filter_mode, + slk_format) == ERR) { _nc_set_screen(current); result = 0; } else { -#ifdef USE_TERM_DRIVER - TERMINAL_CONTROL_BLOCK *TCB; -#elif !NCURSES_SP_FUNCS - _nc_set_screen(CURRENT_SCREEN); -#endif - assert(SP_PARM != 0); - cols = *(ptrCols(SP_PARM)); -#ifdef USE_TERM_DRIVER - _nc_set_screen(SP_PARM); - TCB = (TERMINAL_CONTROL_BLOCK *) new_term; - TCB->csp = SP_PARM; -#endif + assert(SP != 0); /* * In setupterm() we did a set_curterm(), but it was before we set - * CURRENT_SCREEN. So the "current" screen's terminal pointer was - * overwritten with a different terminal. Later, in - * _nc_setupscreen(), we set CURRENT_SCREEN and the terminal - * pointer in the new screen. + * SP. So the "current" screen's terminal pointer was overwritten + * with a different terminal. Later, in _nc_setupscreen(), we set + * SP and the terminal pointer in the new screen. * * Restore the terminal-pointer for the pre-existing screen, if * any. @@ -264,53 +172,37 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx if (current) current->_term = its_term; -#ifdef USE_TERM_DRIVER - SP_PARM->_term = new_term; -#else - new_term = SP_PARM->_term; -#endif - - /* allow user to set maximum escape delay from the environment */ - if ((value = _nc_getenv_num("ESCDELAY")) >= 0) { - NCURSES_SP_NAME(set_escdelay) (NCURSES_SP_ARGx value); - } - /* if the terminal type has real soft labels, set those up */ - if (slk_format && NumLabels > 0 && SLK_STDFMT(slk_format)) - _nc_slk_initialize(StdScreen(SP_PARM), cols); + if (slk_format && num_labels > 0 && SLK_STDFMT(slk_format)) + _nc_slk_initialize(stdscr, COLS); - SP_PARM->_ifd = fileno(_ifp); - NCURSES_SP_NAME(typeahead) (NCURSES_SP_ARGx fileno(_ifp)); + SP->_ifd = fileno(ifp); + typeahead(fileno(ifp)); #ifdef TERMIOS - SP_PARM->_use_meta = ((new_term->Ottyb.c_cflag & CSIZE) == CS8 && - !(new_term->Ottyb.c_iflag & ISTRIP)); + SP->_use_meta = ((cur_term->Ottyb.c_cflag & CSIZE) == CS8 && + !(cur_term->Ottyb.c_iflag & ISTRIP)); #else - SP_PARM->_use_meta = FALSE; + SP->_use_meta = FALSE; #endif - SP_PARM->_endwin = FALSE; -#ifndef USE_TERM_DRIVER + SP->_endwin = FALSE; + /* * Check whether we can optimize scrolling under dumb terminals in * case we do not have any of these capabilities, scrolling * optimization will be useless. */ - SP_PARM->_scrolling = ((scroll_forward && scroll_reverse) || - ((parm_rindex || - parm_insert_line || - insert_line) && - (parm_index || - parm_delete_line || - delete_line))); -#endif + SP->_scrolling = ((scroll_forward && scroll_reverse) || + ((parm_rindex || + parm_insert_line || + insert_line) && + (parm_index || + parm_delete_line || + delete_line))); - NCURSES_SP_NAME(baudrate) (NCURSES_SP_ARG); /* sets a field in the screen structure */ + baudrate(); /* sets a field in the SP structure */ - SP_PARM->_keytry = 0; + SP->_keytry = 0; - /* compute movement costs so we can do better move optimization */ -#ifdef USE_TERM_DRIVER - TCBOf(SP_PARM)->drv->scinit(SP_PARM); -#else /* * Check for mismatched graphic-rendition capabilities. Most SVr4 * terminfo trees contain entries that have rmul or rmso equated to @@ -321,31 +213,23 @@ NCURSES_SP_NAME(newterm) (NCURSES_SP_DCLx * shouldn't be looking at this detail. */ #define SGR0_TEST(mode) (mode != 0) && (exit_attribute_mode == 0 || strcmp(mode, exit_attribute_mode)) - SP_PARM->_use_rmso = SGR0_TEST(exit_standout_mode); - SP_PARM->_use_rmul = SGR0_TEST(exit_underline_mode); + SP->_use_rmso = SGR0_TEST(exit_standout_mode); + SP->_use_rmul = SGR0_TEST(exit_underline_mode); /* compute movement costs so we can do better move optimization */ _nc_mvcur_init(); /* initialize terminal to a sane state */ _nc_screen_init(); -#endif /* Initialize the terminal line settings. */ - _nc_initscr(NCURSES_SP_ARG); + _nc_initscr(); _nc_signal_handler(TRUE); - result = SP_PARM; + + result = SP; } } _nc_unlock_global(curses); returnSP(result); } - -#if NCURSES_SP_FUNCS -NCURSES_EXPORT(SCREEN *) -newterm(NCURSES_CONST char *name, FILE *ofp, FILE *ifp) -{ - return NCURSES_SP_NAME(newterm) (CURRENT_SCREEN_PRE, name, ofp, ifp); -} -#endif -- cgit v1.1