ncurses 5.6 - patch 20070414

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

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 68308a01ae810c28fd92588e29bb7948d9179d2e..81340c87f9a7a12b7f802b897919fe7757e0c090 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2007 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.317 2006/12/30 21:36:59 tom Exp $
+ * $Id: curses.priv.h,v 1.325 2007/03/10 23:43:50 tom Exp $
  *
  *     curses.priv.h
  *
@@ -250,6 +250,10 @@ color_t;
 #define wbkgrnd            wbkgd
 #endif
 
+#undef NCURSES_OPAQUE
+#define NCURSES_INTERNALS 1
+#define NCURSES_OPAQUE 0
+
 #include <curses.h>    /* we'll use -Ipath directive to get the right one! */
 #include <term.h>
 #include <term_entry.h>
@@ -286,6 +290,14 @@ color_t;
 #define GET_SCREEN_PAIR(s)     GetPair(SCREEN_ATTRS(s))
 #define SET_SCREEN_PAIR(s,p)   SetPair(SCREEN_ATTRS(s), p)
 
+#if USE_REENTRANT
+#define SET_LINES(value) SP->_LINES = value
+#define SET_COLS(value)  SP->_COLS = value
+#else
+#define SET_LINES(value) LINES = value
+#define SET_COLS(value)  COLS = value
+#endif
+
 /*
  * Definitions for color pairs
  */
@@ -408,11 +420,11 @@ struct screen {
        int             _checkfd;       /* filedesc for typeahead check     */
        TERMINAL        *_term;         /* terminal type information        */
        TTY             _saved_tty;     /* savetty/resetty information      */
-       short           _lines;         /* screen lines                     */
-       short           _columns;       /* screen columns                   */
+       NCURSES_SIZE_T  _lines;         /* screen lines                     */
+       NCURSES_SIZE_T  _columns;       /* screen columns                   */
 
-       short           _lines_avail;   /* lines available for stdscr       */
-       short           _topstolen;     /* lines stolen from top            */
+       NCURSES_SIZE_T  _lines_avail;   /* lines available for stdscr       */
+       NCURSES_SIZE_T  _topstolen;     /* lines stolen from top            */
        ripoff_t        _rippedoff[5];  /* list of lines stolen             */
        int             _rip_count;     /* ...and total lines stolen        */
 
@@ -608,6 +620,13 @@ struct screen {
 
        int             _legacy_coding; /* see use_legacy_coding() */
 
+#if USE_REENTRANT
+       char            _ttytype[NAMESIZE];
+       int             _ESCDELAY;
+       int             _TABSIZE;
+       int             _LINES;
+       int             _COLS;
+#endif
        /*
         * ncurses/ncursesw are the same up to this point.
         */
@@ -1146,6 +1165,7 @@ extern NCURSES_EXPORT(char *) _nc_get_locale(void);
 extern NCURSES_EXPORT(int) _nc_unicode_locale(void);
 extern NCURSES_EXPORT(int) _nc_locale_breaks_acs(void);
 extern NCURSES_EXPORT(int) _nc_setupterm(NCURSES_CONST char *, int, int *, bool);
+extern NCURSES_EXPORT(void) _nc_get_screensize(int *, int *);
 
 /* lib_tstp.c */
 #if USE_SIGWINCH