X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fcurses.priv.h;h=b43456029226d3997225086077c7e8698853651f;hp=ce335e64ce2c9102256884aedd33ddaa8223d30e;hb=396a05943b7da5039dd15d79c4385c7d2a75d6d4;hpb=40df80d8d3f96c991f55569bce475e71cc38be12 diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index ce335e64..b4345602 100644 --- 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 * @@ -34,7 +34,7 @@ /* - * $Id: curses.priv.h,v 1.349 2007/11/17 23:33:18 tom Exp $ + * $Id: curses.priv.h,v 1.363 2008/04/12 17:16:26 tom Exp $ * * curses.priv.h * @@ -300,30 +300,65 @@ color_t; #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 + #if USE_REENTRANT #include -#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(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 #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_try_global(name) 0 #define _nc_unlock_global(name) /* nothing */ -#define _nc_lock_window(name) TRUE +#define _nc_lock_window(name) (void) TRUE #define _nc_unlock_window(name) /* nothing */ -#endif +#endif /* USE_PTHREADS */ #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 */ @@ -404,6 +439,7 @@ typedef struct _SLK { #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; @@ -526,6 +562,8 @@ typedef struct { char *first_name; char **keyname_table; + int slk_format; + char *safeprint_buf; size_t safeprint_used; @@ -533,6 +571,9 @@ typedef struct { int tgetent_index; long tgetent_sequence; + WINDOWLIST *_nc_windowlist; +#define _nc_windows _nc_globals._nc_windowlist + #if USE_HOME_TERMINFO char *home_terminfo; #endif @@ -564,11 +605,9 @@ typedef struct { 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; -#endif /* USE_TERMLIB */ #endif /* TRACE */ @@ -588,7 +627,7 @@ extern NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals; #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 { @@ -610,6 +649,9 @@ typedef struct { #endif } NCURSES_PRESCREEN; +#define ripoff_sp _nc_prescreen.rsp +#define ripoff_stack _nc_prescreen.rippedoff + extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen; /* @@ -801,12 +843,6 @@ struct screen { * 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; @@ -830,7 +866,7 @@ struct screen { int _LINES; int _COLS; #ifdef TRACE - int _outchars; + long _outchars; const char *_tputs_trace; #endif #endif @@ -946,7 +982,7 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch; #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)) @@ -1530,11 +1566,7 @@ extern NCURSES_EXPORT(void) _nc_scroll_window (WINDOW *, int const, NCURSES_SIZE #endif #if USE_WIDEC_SUPPORT && !defined(USE_TERMLIB) -#ifdef linux 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 @@ -1594,7 +1626,6 @@ extern NCURSES_EXPORT_VAR(SCREEN *) SP; #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); /*