X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Fcurses.priv.h;h=484fd19340aa4612f147c1d1677dd8e5159ed7bb;hb=8144a95f5729b46a1ad4f4c3c4ba29800304e4c0;hp=a1ea1d49c86e0c3e927606db8324608661fb5872;hpb=b17ff3673e886e3cbb6b523341aa10b0c26b3903;p=ncurses.git

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index a1ea1d49..484fd193 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
 
 
 /*
- * $Id: curses.priv.h,v 1.348 2007/11/03 20:24:15 tom Exp $
+ * $Id: curses.priv.h,v 1.355 2007/12/29 20:32:54 tom Exp $
  *
  *	curses.priv.h
  *
@@ -300,10 +300,22 @@ 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 <pthread.h>
 #define _nc_lock_global(name)	pthread_mutex_lock(&_nc_globals.mutex_##name)
+#define _nc_try_global(name)    pthread_mutex_trylock(&_nc_globals.mutex_##name)
 #define _nc_unlock_global(name)	pthread_mutex_unlock(&_nc_globals.mutex_##name)
 
 extern NCURSES_EXPORT(void) _nc_lock_window(WINDOW *);
@@ -314,9 +326,10 @@ extern NCURSES_EXPORT(void) _nc_unlock_window(WINDOW *);
 #endif
 #else
 #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
@@ -404,6 +417,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;
@@ -482,6 +496,17 @@ typedef struct {
     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
@@ -599,6 +624,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;
 
 /*
@@ -935,7 +963,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))
 
@@ -1519,11 +1547,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