From 723791050e1d80c4eb7d85a81ea8a5bbe455b115 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Sat, 25 Mar 2006 00:30:36 +0000 Subject: [PATCH] _use_idc and _use_idl have never been used in PDCurses, although the values could be set by idlok() and idcok(). Nor do they make sense in the PDCurses context. The only reason to consider retaining them is compatibility -- HPUX, Solaris and Tru64 curses all have them. But NCurses and BSD don't; and per the standard, the WINDOW struct should be opaque, so it shouldn't matter. idlok() and idcok(), by contrast, must be retained, although they do nothing. --- curses.h | 4 +--- pdcurses/outopts.c | 10 +--------- pdcurses/pdcwin.c | 3 +-- pdcurses/window.c | 4 +--- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/curses.h b/curses.h index a055428d..ea500661 100644 --- a/curses.h +++ b/curses.h @@ -15,7 +15,7 @@ * See the file maintain.er for details of the current maintainer. * ************************************************************************/ -/* $Id: curses.h,v 1.147 2006/03/25 00:11:47 wmcbrine Exp $ */ +/* $Id: curses.h,v 1.148 2006/03/25 00:30:26 wmcbrine Exp $ */ /*----------------------------------------------------------------------* * PDCurses * @@ -576,8 +576,6 @@ typedef struct _win /* definition of a window */ bool _immed; /* immediate update flag */ bool _sync; /* synchronise window ancestors */ bool _use_keypad; /* flags keypad key mode active */ - bool _use_idl; /* True if Ins/Del line can be used */ - bool _use_idc; /* True if Ins/Del character can be used */ chtype **_y; /* pointer to line pointer array */ int *_firstch; /* first changed character in line */ int *_lastch; /* last changed character in line */ diff --git a/pdcurses/outopts.c b/pdcurses/outopts.c index 618172e3..ee68074a 100644 --- a/pdcurses/outopts.c +++ b/pdcurses/outopts.c @@ -31,7 +31,7 @@ #ifdef PDCDEBUG const char *rcsid_outopts = - "$Id: outopts.c,v 1.19 2006/02/23 01:46:52 wmcbrine Exp $"; + "$Id: outopts.c,v 1.20 2006/03/25 00:30:36 wmcbrine Exp $"; #endif /*man-start************************************************************** @@ -142,20 +142,12 @@ int idlok(WINDOW *win, bool bf) { PDC_LOG(("idlok() - called\n")); - if (win == (WINDOW *)NULL) - return ERR; - - win->_use_idl = bf; - return OK; } void idcok(WINDOW *win, bool bf) { PDC_LOG(("idcok() - called\n")); - - if (win != (WINDOW *)NULL) - win->_use_idc = bf; } void immedok(WINDOW *win, bool bf) diff --git a/pdcurses/pdcwin.c b/pdcurses/pdcwin.c index d4460a06..9d2623bc 100644 --- a/pdcurses/pdcwin.c +++ b/pdcurses/pdcwin.c @@ -24,7 +24,7 @@ #ifdef PDCDEBUG const char *rcsid_PDCwin = - "$Id: pdcwin.c,v 1.32 2006/03/25 00:11:53 wmcbrine Exp $"; + "$Id: pdcwin.c,v 1.33 2006/03/25 00:30:36 wmcbrine Exp $"; #endif /*man-start************************************************************** @@ -206,7 +206,6 @@ WINDOW * PDC_makenew(int num_lines, int num_columns, int begy, int begx) win->_bkgd = ' '; /* wrs 4/10/93 -- initialize background to blank */ win->_tabsize = 8; win->_clear = (bool) ((num_lines == LINES) && (num_columns == COLS)); - win->_use_idc = TRUE; win->_bmarg = num_lines - 1; win->_parx = win->_pary = -1; diff --git a/pdcurses/window.c b/pdcurses/window.c index 350fb4e1..0cc8cbc2 100644 --- a/pdcurses/window.c +++ b/pdcurses/window.c @@ -47,7 +47,7 @@ #ifdef PDCDEBUG const char *rcsid_window = - "$Id: window.c,v 1.25 2006/03/25 00:11:53 wmcbrine Exp $"; + "$Id: window.c,v 1.26 2006/03/25 00:30:36 wmcbrine Exp $"; #endif /*man-start************************************************************** @@ -396,8 +396,6 @@ WINDOW *dupwin(WINDOW *win) new->_scroll = win->_scroll; new->_nodelay = win->_nodelay; new->_use_keypad = win->_use_keypad; - new->_use_idl = win->_use_idl; - new->_use_idc = win->_use_idc; new->_tmarg = win->_tmarg; new->_bmarg = win->_bmarg; new->_parx = win->_parx;