ncurses 5.6 - patch 20080412

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

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 0aa19fe263f6e486705e9fa39c44198ab35cbe9f..b43456029226d3997225086077c7e8698853651f 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2006,2007 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -34,7 +34,7 @@
 
 
 /*
 
 
 /*

- * $Id: curses.priv.h,v 1.343 2007/09/29 21:33:24 tom Exp $
+ * $Id: curses.priv.h,v 1.363 2008/04/12 17:16:26 tom Exp $

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


@@ -300,24 +300,64 @@ color_t;
 #define SET_COLS(value)  COLS = value
 #endif
 
 #define SET_COLS(value)  COLS = value
 #endif
 

+#define TR_MUTEX(data) _tracef("%s@%d: me:%08lX COUNT:%2u/%2d/%6d/%2d/%s%9u: " #data, \
+           __FILE__, __LINE__, \
+           (unsigned long) (pthread_self()), \
+           data.__data.__lock, \
+           data.__data.__count, \
+           data.__data.__owner, \
+           data.__data.__kind, \
+           (data.__data.__nusers > 5) ? " OOPS " : "", \
+           data.__data.__nusers)
+#define TR_GLOBAL_MUTEX(name) TR_MUTEX(_nc_globals.mutex_##name)
+

 #ifdef USE_PTHREADS
 #ifdef USE_PTHREADS

+

 #if USE_REENTRANT
 #include <pthread.h>
 #if USE_REENTRANT
 #include <pthread.h>

-#define _nc_lock_global(name)  pthread_mutex_lock(&_nc_globals.mutex_##name)
-#define _nc_unlock_global(name)        pthread_mutex_unlock(&_nc_globals.mutex_##name)
+extern NCURSES_EXPORT(void) _nc_mutex_init(pthread_mutex_t *);
+extern NCURSES_EXPORT(int) _nc_mutex_lock(pthread_mutex_t *);
+extern NCURSES_EXPORT(int) _nc_mutex_trylock(pthread_mutex_t *);
+extern NCURSES_EXPORT(int) _nc_mutex_unlock(pthread_mutex_t *);
+#define _nc_lock_global(name)  _nc_mutex_lock(&_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(const WINDOW *);
+extern NCURSES_EXPORT(void) _nc_unlock_window(const WINDOW *);
+

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

-#else
+
+#if HAVE_NANOSLEEP
+#undef HAVE_NANOSLEEP
+#define HAVE_NANOSLEEP 0       /* nanosleep suspends all threads */
+#endif
+
+#else /* !USE_PTHREADS */
+
+#define _nc_mutex_init(obj)    /* nothing */
+

 #define _nc_lock_global(name)  /* nothing */
 #define _nc_lock_global(name)  /* nothing */

+#define _nc_try_global(name)    0

 #define _nc_unlock_global(name)        /* nothing */
 #define _nc_unlock_global(name)        /* nothing */

-#endif
+
+#define _nc_lock_window(name)  (void) TRUE
+#define _nc_unlock_window(name)        /* nothing */
+
+#endif /* USE_PTHREADS */

 
 #define _nc_lock_screen(name)  /* nothing */
 #define _nc_unlock_screen(name)        /* nothing */
 
 
 #define _nc_lock_screen(name)  /* nothing */
 #define _nc_unlock_screen(name)        /* nothing */
 

-#define _nc_lock_window(name)  /* nothing */
-#define _nc_unlock_window(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


@@ -399,6 +439,7 @@ typedef struct _SLK {
 #endif /* USE_TERMLIB */
 
 typedef        struct {
 #endif /* USE_TERMLIB */
 
 typedef        struct {

+       WINDOW *win;            /* the window used in the hook      */

        int     line;           /* lines to take, < 0 => from bottom*/
        int     (*hook)(WINDOW *, int); /* callback for user        */
 } ripoff_t;
        int     line;           /* lines to take, < 0 => from bottom*/
        int     (*hook)(WINDOW *, int); /* callback for user        */
 } ripoff_t;


@@ -477,6 +518,17 @@ typedef struct {
     size_t size;
 } TRACEBUF;
 
     size_t size;
 } TRACEBUF;
 

+/*
+ * The filesystem database normally uses a single-letter for the lower level
+ * of directories.  Use a hexadecimal code for filesystems which do not
+ * preserve mixed-case names.
+ */
+#if MIXEDCASE_FILENAMES
+#define LEAF_FMT "%c"
+#else
+#define LEAF_FMT "%02x"
+#endif
+

 /*
  * TRACEMSE_FMT is no longer than 80 columns, there are 5 numbers that
  * could at most have 10 digits, and the mask contains no more than 32 bits
 /*
  * TRACEMSE_FMT is no longer than 80 columns, there are 5 numbers that
  * could at most have 10 digits, and the mask contains no more than 32 bits


@@ -510,6 +562,8 @@ typedef struct {
        char            *first_name;
        char            **keyname_table;
 
        char            *first_name;
        char            **keyname_table;
 

+       int             slk_format;
+

        char            *safeprint_buf;
        size_t          safeprint_used;
 
        char            *safeprint_buf;
        size_t          safeprint_used;
 


@@ -517,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


@@ -548,17 +605,16 @@ typedef struct {
        unsigned char   *tracetry_buf;
        size_t          tracetry_used;
 
        unsigned char   *tracetry_buf;
        size_t          tracetry_used;
 

-#ifndef USE_TERMLIB

        char            traceatr_color_buf[2][80];
        int             traceatr_color_sel;
        int             traceatr_color_last;
        char            traceatr_color_buf[2][80];
        int             traceatr_color_sel;
        int             traceatr_color_last;

-#endif /* USE_TERMLIB */

 
 #endif /* TRACE */
 
 #ifdef USE_PTHREADS
        pthread_mutex_t mutex_set_SP;
        pthread_mutex_t mutex_use_screen;
 
 #endif /* TRACE */
 
 #ifdef USE_PTHREADS
        pthread_mutex_t mutex_set_SP;
        pthread_mutex_t mutex_use_screen;

+       pthread_mutex_t mutex_use_window;

        pthread_mutex_t mutex_windowlist;
        pthread_mutex_t mutex_tst_tracef;
        pthread_mutex_t mutex_tracef;
        pthread_mutex_t mutex_windowlist;
        pthread_mutex_t mutex_tst_tracef;
        pthread_mutex_t mutex_tracef;


@@ -571,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 {


@@ -593,6 +649,9 @@ typedef struct {
 #endif
 } NCURSES_PRESCREEN;
 
 #endif
 } NCURSES_PRESCREEN;
 

+#define ripoff_sp      _nc_prescreen.rsp
+#define ripoff_stack   _nc_prescreen.rippedoff
+

 extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen;
 
 /*
 extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen;
 
 /*


@@ -784,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;


@@ -813,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


@@ -840,6 +893,9 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
        int addch_x;            /* x-position for addch_work[] */
        int addch_y;            /* y-position for addch_work[] */
 #endif
        int addch_x;            /* x-position for addch_work[] */
        int addch_y;            /* y-position for addch_work[] */
 #endif

+#ifdef USE_PTHREADS
+       pthread_mutex_t mutex_use_window;
+#endif

 };
 
 #define WINDOW_EXT(win,field) (((WINDOWLIST *)(win))->field)
 };
 
 #define WINDOW_EXT(win,field) (((WINDOWLIST *)(win))->field)


@@ -926,7 +982,7 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #endif
 
 #if USE_WIDEC_SUPPORT /* { */
 #endif
 
 #if USE_WIDEC_SUPPORT /* { */

-#define isEILSEQ(status) ((status == (size_t)-1) && (errno == EILSEQ))
+#define isEILSEQ(status) (((size_t)status == (size_t)-1) && (errno == EILSEQ))

 
 #define init_mb(state) memset(&state, 0, sizeof(state))
 
 
 #define init_mb(state) memset(&state, 0, sizeof(state))
 


@@ -939,12 +995,26 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #define NulChar                0,0,0,0 /* FIXME: see CCHARW_MAX */
 #define CharOf(c)      ((c).chars[0])
 #define AttrOf(c)      ((c).attr)
 #define NulChar                0,0,0,0 /* FIXME: see CCHARW_MAX */
 #define CharOf(c)      ((c).chars[0])
 #define AttrOf(c)      ((c).attr)

+

 #define AddAttr(c,a)   AttrOf(c) |=  ((a) & A_ATTRIBUTES)
 #define RemAttr(c,a)   AttrOf(c) &= ~((a) & A_ATTRIBUTES)
 #define SetAttr(c,a)   AttrOf(c) =   ((a) & A_ATTRIBUTES) | WidecExt(c)
 #define AddAttr(c,a)   AttrOf(c) |=  ((a) & A_ATTRIBUTES)
 #define RemAttr(c,a)   AttrOf(c) &= ~((a) & A_ATTRIBUTES)
 #define SetAttr(c,a)   AttrOf(c) =   ((a) & A_ATTRIBUTES) | WidecExt(c)

+

 #define NewChar2(c,a)  { a, { c, NulChar } NulColor }
 #define NewChar(ch)    NewChar2(ChCharOf(ch), ChAttrOf(ch))
 #define NewChar2(c,a)  { a, { c, NulChar } NulColor }
 #define NewChar(ch)    NewChar2(ChCharOf(ch), ChAttrOf(ch))

+
+#if CCHARW_MAX == 5
+#define CharEq(a,b)    (((a).attr == (b).attr) \
+                      && (a).chars[0] == (b).chars[0] \
+                      && (a).chars[1] == (b).chars[1] \
+                      && (a).chars[2] == (b).chars[2] \
+                      && (a).chars[3] == (b).chars[3] \
+                      && (a).chars[4] == (b).chars[4] \
+                       if_EXT_COLORS(&& (a).ext_color == (b).ext_color))
+#else

 #define CharEq(a,b)    (!memcmp(&(a), &(b), sizeof(a)))
 #define CharEq(a,b)    (!memcmp(&(a), &(b), sizeof(a)))

+#endif
+

 #define SetChar(ch,c,a) do {                                                       \
                            NCURSES_CH_T *_cp = &ch;                                \
                            memset(_cp, 0, sizeof(ch));                             \
 #define SetChar(ch,c,a) do {                                                       \
                            NCURSES_CH_T *_cp = &ch;                                \
                            memset(_cp, 0, sizeof(ch));                             \


@@ -981,8 +1051,8 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
                            COUNT_OUTCHARS(PUTC_i);                                 \
                        } } } while (0)
 
                            COUNT_OUTCHARS(PUTC_i);                                 \
                        } } } while (0)
 

-#define BLANK          { WA_NORMAL, {' '} NulColor }
-#define ZEROS          { WA_NORMAL, {'\0'} NulColor }
+#define BLANK          NewChar2(' ', WA_NORMAL)
+#define ZEROS          NewChar2('\0', WA_NORMAL)

 #define ISBLANK(ch)    ((ch).chars[0] == L' ' && (ch).chars[1] == L'\0')
 
        /*
 #define ISBLANK(ch)    ((ch).chars[0] == L' ' && (ch).chars[1] == L'\0')
 
        /*


@@ -1481,9 +1551,11 @@ extern NCURSES_EXPORT(void) _nc_trace_tries (TRIES *);
 #if NO_LEAKS
 extern NCURSES_EXPORT(void) _nc_alloc_entry_leaks(void);
 extern NCURSES_EXPORT(void) _nc_captoinfo_leaks(void);
 #if NO_LEAKS
 extern NCURSES_EXPORT(void) _nc_alloc_entry_leaks(void);
 extern NCURSES_EXPORT(void) _nc_captoinfo_leaks(void);

+extern NCURSES_EXPORT(void) _nc_codes_leaks(void);

 extern NCURSES_EXPORT(void) _nc_comp_captab_leaks(void);
 extern NCURSES_EXPORT(void) _nc_comp_scan_leaks(void);
 extern NCURSES_EXPORT(void) _nc_keyname_leaks(void);
 extern NCURSES_EXPORT(void) _nc_comp_captab_leaks(void);
 extern NCURSES_EXPORT(void) _nc_comp_scan_leaks(void);
 extern NCURSES_EXPORT(void) _nc_keyname_leaks(void);

+extern NCURSES_EXPORT(void) _nc_names_leaks(void);

 extern NCURSES_EXPORT(void) _nc_tgetent_leaks(void);
 #endif
 
 extern NCURSES_EXPORT(void) _nc_tgetent_leaks(void);
 #endif
 


@@ -1494,11 +1566,7 @@ extern NCURSES_EXPORT(void) _nc_scroll_window (WINDOW *, int const, NCURSES_SIZE
 #endif
 
 #if USE_WIDEC_SUPPORT && !defined(USE_TERMLIB)
 #endif
 
 #if USE_WIDEC_SUPPORT && !defined(USE_TERMLIB)

-#ifdef linux

 extern NCURSES_EXPORT(size_t) _nc_wcrtomb (char *, wchar_t, mbstate_t *);
 extern NCURSES_EXPORT(size_t) _nc_wcrtomb (char *, wchar_t, mbstate_t *);

-#else
-#define _nc_wcrtomb(s,wc,ps) wcrtomb(s,wc,ps)
-#endif

 #endif
 
 #if USE_SIZECHANGE
 #endif
 
 #if USE_SIZECHANGE


@@ -1558,7 +1626,6 @@ extern NCURSES_EXPORT_VAR(SCREEN *) SP;
 #define screen_lines   SP->_lines
 #define screen_columns SP->_columns
 
 #define screen_lines   SP->_lines
 #define screen_columns SP->_columns
 

-extern NCURSES_EXPORT_VAR(int) _nc_slk_format;  /* != 0 if slk_init() called */

 extern NCURSES_EXPORT(int) _nc_slk_initialize (WINDOW *, int);
 
 /*
 extern NCURSES_EXPORT(int) _nc_slk_initialize (WINDOW *, int);
 
 /*