diff options
Diffstat (limited to 'ncurses/tinfo/lib_data.c')
| -rw-r--r-- | ncurses/tinfo/lib_data.c | 50 |
1 files changed, 7 insertions, 43 deletions
diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c index 195ddf978ab6..e84209d4022c 100644 --- a/ncurses/tinfo/lib_data.c +++ b/ncurses/tinfo/lib_data.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 <zmbenhal@netcom.com> 1992,1995 * * and: Eric S. Raymond <esr@snark.thyrsus.com> * * and: Thomas E. Dickey 1996-on * - * and: Juergen Pfeifer * ****************************************************************************/ /* @@ -42,7 +41,7 @@ #include <curses.priv.h> -MODULE_ID("$Id: lib_data.c,v 1.61 2010/05/15 22:06:56 tom Exp $") +MODULE_ID("$Id: lib_data.c,v 1.52 2008/08/23 22:16:15 tom Exp $") /* * OS/2's native linker complains if we don't initialize public data when @@ -52,17 +51,17 @@ MODULE_ID("$Id: lib_data.c,v 1.61 2010/05/15 22:06:56 tom Exp $") NCURSES_EXPORT(WINDOW *) NCURSES_PUBLIC_VAR(stdscr) (void) { - return CURRENT_SCREEN ? StdScreen(CURRENT_SCREEN) : 0; + return SP ? SP->_stdscr : 0; } NCURSES_EXPORT(WINDOW *) NCURSES_PUBLIC_VAR(curscr) (void) { - return CURRENT_SCREEN ? CurScreen(CURRENT_SCREEN) : 0; + return SP ? SP->_curscr : 0; } NCURSES_EXPORT(WINDOW *) NCURSES_PUBLIC_VAR(newscr) (void) { - return CURRENT_SCREEN ? NewScreen(CURRENT_SCREEN) : 0; + return SP ? SP->_newscr : 0; } #else NCURSES_EXPORT_VAR(WINDOW *) stdscr = 0; @@ -94,7 +93,7 @@ _nc_screen(void) NCURSES_EXPORT(int) _nc_alloc_screen(void) { - return ((my_screen = _nc_alloc_screen_sp()) != 0); + return ((my_screen = typeCalloc(SCREEN, 1)) != 0); } NCURSES_EXPORT(void) @@ -104,7 +103,6 @@ _nc_set_screen(SCREEN *sp) } #else - NCURSES_EXPORT_VAR(SCREEN *) SP = NULL; /* Some linkers require initialized data... */ #endif /* *INDENT-OFF* */ @@ -142,9 +140,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { 0, /* tgetent_index */ 0, /* tgetent_sequence */ -#ifndef USE_SP_WINDOWLIST 0, /* _nc_windowlist */ -#endif #if USE_HOME_TERMINFO NULL, /* home_terminfo */ @@ -155,10 +151,6 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { 0, /* safeprint_rows */ #endif -#ifdef USE_TERM_DRIVER - 0, /* term_driver */ -#endif - #ifdef TRACE FALSE, /* init_trace */ CHARS_0s, /* trace_fname */ @@ -182,9 +174,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { { CHARS_0s, CHARS_0s }, /* traceatr_color_buf */ 0, /* traceatr_color_sel */ -1, /* traceatr_color_last */ -#if !defined(USE_PTHREADS) && USE_REENTRANT - 0, /* nested_tracef */ -#endif + #endif /* TRACE */ #ifdef USE_PTHREADS PTHREAD_MUTEX_INITIALIZER, /* mutex_curses */ @@ -193,9 +183,6 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { 0, /* nested_tracef */ 0, /* use_pthreads */ #endif -#if USE_PTHREADS_EINTR - 0, /* read_thread */ -#endif }; #define STACK_FRAME_0 { { 0 }, 0 } @@ -209,10 +196,8 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = { TRUE, /* use_env */ FALSE, /* filter_mode */ A_NORMAL, /* previous_attr */ -#ifndef USE_SP_RIPOFF RIPOFF_0s, /* ripoff */ NULL, /* rsp */ -#endif { /* tparm_state */ #ifdef TRACE NULL, /* tname */ @@ -236,13 +221,10 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = { #if NCURSES_NO_PADDING FALSE, /* flag to set if padding disabled */ #endif - 0, /* _outch */ #if BROKEN_LINKER || USE_REENTRANT NULL, /* real_acs_map */ 0, /* LINES */ 0, /* COLS */ - 8, /* TABSIZE */ - 1000, /* ESCDELAY */ 0, /* cur_term */ #ifdef TRACE 0L, /* _outchars */ @@ -252,22 +234,6 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = { }; /* *INDENT-ON* */ -/* - * wgetch() and other functions with a WINDOW* parameter may use a SCREEN* - * internally, and it is useful to allow those to be invoked without switching - * SCREEN's, e.g., for multi-threaded applications. - */ -NCURSES_EXPORT(SCREEN *) -_nc_screen_of(WINDOW *win) -{ - SCREEN *sp = 0; - - if (win != 0) { - sp = WINDOW_EXT(win, screen); - } - return (sp); -} - /******************************************************************************/ #ifdef USE_PTHREADS static void @@ -348,9 +314,7 @@ _nc_mutex_unlock(pthread_mutex_t * obj) return 0; return pthread_mutex_unlock(obj); } -#endif /* USE_PTHREADS */ -#if defined(USE_PTHREADS) || USE_PTHREADS_EINTR #if USE_WEAK_SYMBOLS /* * NB: sigprocmask(2) is global but pthread_sigmask(3p) |