ncurses 5.6 - patch 20080412

[ncurses.git] / ncurses / curses.priv.h

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index ddf15a8a4eb4bb48bc6cb58f94bad03041050d13..b43456029226d3997225086077c7e8698853651f 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
 
 
 /*
 
 
 /*

- * $Id: curses.priv.h,v 1.359 2008/02/23 21:19:56 tom Exp $
+ * $Id: curses.priv.h,v 1.363 2008/04/12 17:16:26 tom Exp $

  *
  *     curses.priv.h
  *
  *
  *     curses.priv.h
  *


@@ -323,8 +323,8 @@ extern NCURSES_EXPORT(int) _nc_mutex_unlock(pthread_mutex_t *);
 #define _nc_try_global(name)    _nc_mutex_trylock(&_nc_globals.mutex_##name)
 #define _nc_unlock_global(name)        _nc_mutex_unlock(&_nc_globals.mutex_##name)
 
 #define _nc_try_global(name)    _nc_mutex_trylock(&_nc_globals.mutex_##name)
 #define _nc_unlock_global(name)        _nc_mutex_unlock(&_nc_globals.mutex_##name)
 

-extern NCURSES_EXPORT(void) _nc_lock_window(WINDOW *);
-extern NCURSES_EXPORT(void) _nc_unlock_window(WINDOW *);
+extern NCURSES_EXPORT(void) _nc_lock_window(const WINDOW *);
+extern NCURSES_EXPORT(void) _nc_unlock_window(const WINDOW *);

 
 #else
 #error POSIX threads requires --enable-reentrant option
 
 #else
 #error POSIX threads requires --enable-reentrant option


@@ -351,6 +351,14 @@ extern NCURSES_EXPORT(void) _nc_unlock_window(WINDOW *);
 #define _nc_lock_screen(name)  /* nothing */
 #define _nc_unlock_screen(name)        /* nothing */
 
 #define _nc_lock_screen(name)  /* nothing */
 #define _nc_unlock_screen(name)        /* nothing */
 

+#if HAVE_GETTIMEOFDAY
+# define PRECISE_GETTIME 1
+# define TimeType struct timeval
+#else
+# define PRECISE_GETTIME 0
+# define TimeType time_t
+#endif
+

 /*
  * Definitions for color pairs
  */
 /*
  * Definitions for color pairs
  */


@@ -563,6 +571,9 @@ typedef struct {
        int             tgetent_index;
        long            tgetent_sequence;
 
        int             tgetent_index;
        long            tgetent_sequence;
 

+       WINDOWLIST      *_nc_windowlist;
+#define _nc_windows    _nc_globals._nc_windowlist
+

 #if USE_HOME_TERMINFO
        char            *home_terminfo;
 #endif
 #if USE_HOME_TERMINFO
        char            *home_terminfo;
 #endif


@@ -616,7 +627,7 @@ extern NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals;
 #define N_RIPS 5
 
 /*
 #define N_RIPS 5
 
 /*

- * Global data which is swept up into a SCREEN when one is created.
+ * Global data which can be swept up into a SCREEN when one is created.

  * It may be modified before the next SCREEN is created.
  */
 typedef struct {
  * It may be modified before the next SCREEN is created.
  */
 typedef struct {


@@ -832,12 +843,6 @@ struct screen {
         * per screen basis.
         */
        struct panelhook _panelHook;
         * per screen basis.
         */
        struct panelhook _panelHook;

-       /*
-        * Linked-list of all windows, to support '_nc_resizeall()' and
-        * '_nc_freeall()'
-        */
-       WINDOWLIST      *_nc_sp_windows;
-#define _nc_windows SP->_nc_sp_windows

 
        bool            _sig_winch;
        SCREEN          *_next_screen;
 
        bool            _sig_winch;
        SCREEN          *_next_screen;


@@ -861,7 +866,7 @@ struct screen {
        int             _LINES;
        int             _COLS;
 #ifdef TRACE
        int             _LINES;
        int             _COLS;
 #ifdef TRACE

-       int             _outchars;
+       long            _outchars;

        const char      *_tputs_trace;
 #endif
 #endif
        const char      *_tputs_trace;
 #endif
 #endif