diff --git a/curses.h b/curses.h index 75ee00e0..442b25f9 100644 --- a/curses.h +++ b/curses.h @@ -11,7 +11,7 @@ * See the file maintain.er for details of the current maintainer. * ************************************************************************/ -/* $Id: curses.h,v 1.243 2006/11/03 13:41:14 wmcbrine Exp $ */ +/* $Id: curses.h,v 1.244 2006/11/09 08:52:36 wmcbrine Exp $ */ /*----------------------------------------------------------------------* * PDCurses * @@ -39,7 +39,7 @@ PDCurses portable platform definitions list: **man-end****************************************************************/ -#define PDC_BUILD 2821 +#define PDC_BUILD 2822 #define PDCURSES 1 /* PDCurses-only routines */ #define XOPEN 1 /* X/Open Curses routines */ #define SYSVcurses 1 /* System V Curses routines */ @@ -416,22 +416,8 @@ typedef struct _win /* definition of a window */ int _curx; int _maxy; /* max window coordinates */ int _maxx; - int _pmaxy; /* max physical size */ - int _pmaxx; int _begy; /* origin on screen */ int _begx; - int _lastpy; /* last y coordinate of upper left - pad display area */ - int _lastpx; /* last x coordinate of upper left - pad display area */ - int _lastsy1; /* last upper y coordinate of screen - window for pad */ - int _lastsx1; /* last upper x coordinate of screen - window for pad */ - int _lastsy2; /* last lower y coordinate of screen - window for pad */ - int _lastsx2; /* last lower x coordinate of screen - window for pad */ int _flags; /* window properties */ chtype _attrs; /* standard attributes and colors */ chtype _bkgd; /* background, normally blank */ diff --git a/pdcurses/pad.c b/pdcurses/pad.c index 3a7334bd..64d6b0a1 100644 --- a/pdcurses/pad.c +++ b/pdcurses/pad.c @@ -15,7 +15,7 @@ #include #include -RCSID("$Id: pad.c,v 1.36 2006/11/05 03:57:26 wmcbrine Exp $"); +RCSID("$Id: pad.c,v 1.37 2006/11/09 08:52:37 wmcbrine Exp $"); /* save values for pechochar() */ @@ -261,13 +261,6 @@ int pnoutrefresh(WINDOW *w, int py, int px, int sy1, int sx1, int sy2, int sx2) pline++; } - w->_lastpy = py; - w->_lastpx = px; - w->_lastsy1 = sy1; - w->_lastsx1 = sx1; - w->_lastsy2 = sy2; - w->_lastsx2 = sx2; - if (w->_clear) { w->_clear = FALSE; diff --git a/pdcurses/window.c b/pdcurses/window.c index 41b269b1..bb5950f5 100644 --- a/pdcurses/window.c +++ b/pdcurses/window.c @@ -14,7 +14,7 @@ #include #include -RCSID("$Id: window.c,v 1.45 2006/11/05 07:13:40 wmcbrine Exp $"); +RCSID("$Id: window.c,v 1.46 2006/11/09 08:52:37 wmcbrine Exp $"); /*man-start************************************************************** @@ -174,12 +174,8 @@ WINDOW *PDC_makenew(int num_lines, int num_columns, int begy, int begx) win->_maxy = num_lines; /* real max screen size */ win->_maxx = num_columns; /* real max screen size */ - win->_pmaxy = num_lines; /* real max window size */ - win->_pmaxx = num_columns; /* real max window size */ win->_begy = begy; win->_begx = begx; - win->_lastsy2 = LINES - 1; - win->_lastsx2 = COLS - 1; win->_bkgd = ' '; /* wrs 4/10/93 -- initialize background to blank */ win->_clear = (bool) ((num_lines == LINES) && (num_columns == COLS)); win->_bmarg = num_lines - 1; @@ -266,7 +262,7 @@ int delwin(WINDOW *win) /* subwindows use parents' lines */ if (!(win->_flags & (_SUBWIN|_SUBPAD))) - for (i = 0; i < win->_pmaxy && win->_y[i]; i++) + for (i = 0; i < win->_maxy && win->_y[i]; i++) if (win->_y[i]) free(win->_y[i]); @@ -424,16 +420,8 @@ WINDOW *dupwin(WINDOW *win) new->_cury = win->_cury; new->_maxy = win->_maxy; new->_maxx = win->_maxx; - new->_pmaxy = win->_pmaxy; - new->_pmaxx = win->_pmaxx; new->_begy = win->_begy; new->_begx = win->_begx; - new->_lastpy = win->_lastpy; - new->_lastpx = win->_lastpx; - new->_lastsy1 = win->_lastsy1; - new->_lastsx1 = win->_lastsx1; - new->_lastsy2 = win->_lastsy2; - new->_lastsx2 = win->_lastsx2; new->_flags = win->_flags; new->_attrs = win->_attrs; new->_clear = win->_clear;