Reversing myself -- I had changed all move()'s to wmove(stdscr) (and

some already were that way), but it's no more direct, and move() is one
less parameter.
This commit is contained in:
William McBrine
2006-01-14 06:42:03 +00:00
parent 3c801a621d
commit ecdbfeb380
12 changed files with 42 additions and 42 deletions

View File

@@ -17,7 +17,7 @@
* See the file maintain.er for details of the current maintainer.
***************************************************************************
*/
#define CURSES_LIBRARY 1
#define CURSES_LIBRARY 1
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -41,7 +41,7 @@
#endif
#ifdef PDCDEBUG
char *rcsid_addchstr = "$Id: addchstr.c,v 1.10 2006/01/13 01:17:59 wmcbrine Exp $";
char *rcsid_addchstr = "$Id: addchstr.c,v 1.11 2006/01/14 06:42:03 wmcbrine Exp $";
#endif
/*man-start*********************************************************************
@@ -239,7 +239,7 @@ chtype *ch;
{
PDC_LOG(("mvaddchstr() - called: y %d x %d\n", y, x));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return waddchnstr(stdscr, ch, -1);
@@ -259,7 +259,7 @@ int n;
{
PDC_LOG(("mvaddchnstr() - called: y %d x %d n %d\n", y, x, n));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return waddchnstr(stdscr, ch, n);

View File

@@ -17,7 +17,7 @@
* See the file maintain.er for details of the current maintainer.
***************************************************************************
*/
#define CURSES_LIBRARY 1
#define CURSES_LIBRARY 1
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -42,7 +42,7 @@
#endif
#ifdef PDCDEBUG
char *rcsid_addstr = "$Id: addstr.c,v 1.6 2006/01/13 01:17:59 wmcbrine Exp $";
char *rcsid_addstr = "$Id: addstr.c,v 1.7 2006/01/14 06:42:03 wmcbrine Exp $";
#endif
/*man-start*********************************************************************
@@ -186,7 +186,7 @@ char *str;
{
PDC_LOG(("mvaddstr() - called: y %d x %d string=\"%s\"\n", y, x, str));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return waddnstr(stdscr, str, -1);
@@ -207,7 +207,7 @@ int n;
PDC_LOG(("mvaddnstr() - called: y %d x %d string=\"%s\" n %d \n",
y, x, str, n));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return waddnstr(stdscr, str, n);

View File

@@ -17,7 +17,7 @@
* See the file maintain.er for details of the current maintainer.
***************************************************************************
*/
#define CURSES_LIBRARY 1
#define CURSES_LIBRARY 1
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -46,7 +46,7 @@
#ifdef PDCDEBUG
char *rcsid_delch = "$Id: delch.c,v 1.4 2006/01/13 01:17:59 wmcbrine Exp $";
char *rcsid_delch = "$Id: delch.c,v 1.5 2006/01/14 06:42:03 wmcbrine Exp $";
#endif
/*man-start*********************************************************************
@@ -126,7 +126,7 @@ WINDOW *win;
maxx = win->_maxx - 1;
temp1 = &win->_y[y][x];
memmove( temp1, temp1 + 1, (maxx - x) * sizeof(chtype) );
memmove(temp1, temp1 + 1, (maxx - x) * sizeof(chtype));
#if defined(PDCURSES_WCLR)
win->_y[y][maxx] = win->_blank | win->_attrs;
@@ -157,7 +157,7 @@ int x;
{
PDC_LOG(("mvdelch() - called\n"));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return wdelch(stdscr);

View File

@@ -17,7 +17,7 @@
* See the file maintain.er for details of the current maintainer.
***************************************************************************
*/
#define CURSES_LIBRARY 1
#define CURSES_LIBRARY 1
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -39,7 +39,7 @@
#endif
#ifdef PDCDEBUG
char *rcsid_getch = "$Id: getch.c,v 1.14 2006/01/13 01:17:59 wmcbrine Exp $";
char *rcsid_getch = "$Id: getch.c,v 1.15 2006/01/14 06:42:03 wmcbrine Exp $";
#endif
/*man-start*********************************************************************
@@ -287,7 +287,7 @@ int x;
{
PDC_LOG(("mvgetch() - called\n"));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return wgetch(stdscr);

View File

@@ -43,7 +43,7 @@
#endif
#ifdef PDCDEBUG
char *rcsid_getstr = "$Id: getstr.c,v 1.12 2006/01/13 01:17:59 wmcbrine Exp $";
char *rcsid_getstr = "$Id: getstr.c,v 1.13 2006/01/14 06:42:03 wmcbrine Exp $";
#endif
/*man-start*********************************************************************
@@ -143,7 +143,7 @@ char *str;
{
PDC_LOG(("mvgetstr() - called\n"));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return wgetnstr(stdscr, str, MAXLINE);

View File

@@ -17,7 +17,7 @@
* See the file maintain.er for details of the current maintainer.
***************************************************************************
*/
#define CURSES_LIBRARY 1
#define CURSES_LIBRARY 1
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -36,7 +36,7 @@
#endif
#ifdef PDCDEBUG
char *rcsid_inch = "$Id: inch.c,v 1.4 2006/01/13 01:17:59 wmcbrine Exp $";
char *rcsid_inch = "$Id: inch.c,v 1.5 2006/01/14 06:42:03 wmcbrine Exp $";
#endif
/*man-start*********************************************************************
@@ -114,7 +114,7 @@ int x;
{
PDC_LOG(("mvinch() - called\n"));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return (chtype)ERR;
return stdscr->_y[stdscr->_cury][stdscr->_curx];

View File

@@ -17,7 +17,7 @@
* See the file maintain.er for details of the current maintainer.
***************************************************************************
*/
#define CURSES_LIBRARY 1
#define CURSES_LIBRARY 1
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -40,7 +40,7 @@
#endif
#ifdef PDCDEBUG
char *rcsid_inchstr = "$Id: inchstr.c,v 1.4 2006/01/13 01:17:59 wmcbrine Exp $";
char *rcsid_inchstr = "$Id: inchstr.c,v 1.5 2006/01/14 06:42:03 wmcbrine Exp $";
#endif
/*man-start*********************************************************************
@@ -176,7 +176,7 @@ chtype *ch;
{
PDC_LOG(("mvinchstr() - called: y %d x %d\n", y, x));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return winchnstr(stdscr, ch, stdscr->_maxx - stdscr->_curx);
@@ -196,7 +196,7 @@ int n;
{
PDC_LOG(("mvinchnstr() - called: y %d x %d n %d\n", y, x, n));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return winchnstr(stdscr, ch, n);
@@ -238,7 +238,7 @@ int n;
{
PDC_LOG(("mvwinchnstr() - called: y %d x %d n %d \n", y, x, n));
if (wmove(win,y,x) == ERR)
if (wmove(win, y, x) == ERR)
return ERR;
return winchnstr(win, ch, n);

View File

@@ -17,7 +17,7 @@
* See the file maintain.er for details of the current maintainer.
***************************************************************************
*/
#define CURSES_LIBRARY 1
#define CURSES_LIBRARY 1
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -38,7 +38,7 @@
#endif
#ifdef PDCDEBUG
char *rcsid_insch = "$Id: insch.c,v 1.4 2006/01/13 01:17:59 wmcbrine Exp $";
char *rcsid_insch = "$Id: insch.c,v 1.5 2006/01/14 06:42:03 wmcbrine Exp $";
#endif
/*man-start*********************************************************************
@@ -169,7 +169,7 @@ chtype ch;
{
PDC_LOG(("mvinsch() - called\n"));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return PDC_chins(stdscr, ch, (bool)(!(SP->raw_out)));

View File

@@ -17,7 +17,7 @@
* See the file maintain.er for details of the current maintainer.
***************************************************************************
*/
#define CURSES_LIBRARY 1
#define CURSES_LIBRARY 1
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -43,7 +43,7 @@
#endif
#ifdef PDCDEBUG
char *rcsid_insstr = "$Id: insstr.c,v 1.8 2006/01/13 01:17:59 wmcbrine Exp $";
char *rcsid_insstr = "$Id: insstr.c,v 1.9 2006/01/14 06:42:03 wmcbrine Exp $";
#endif
/*man-start*********************************************************************
@@ -190,7 +190,7 @@ char *str;
PDC_LOG(("mvinsstr() - called: y %d x %d string=\"%s\"\n",
y, x, str));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return winsnstr(stdscr, str, -1);
@@ -211,7 +211,7 @@ int n;
PDC_LOG(("mvinsnstr() - called: y %d x %d string=\"%s\" n %d \n",
y, x, str, n));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return winsnstr(stdscr, str, n);

View File

@@ -17,7 +17,7 @@
* See the file maintain.er for details of the current maintainer.
***************************************************************************
*/
#define CURSES_LIBRARY 1
#define CURSES_LIBRARY 1
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -43,7 +43,7 @@
#endif
#ifdef PDCDEBUG
char *rcsid_instr = "$Id: instr.c,v 1.5 2006/01/13 01:17:59 wmcbrine Exp $";
char *rcsid_instr = "$Id: instr.c,v 1.6 2006/01/14 06:42:03 wmcbrine Exp $";
#endif
/*man-start*********************************************************************
@@ -192,7 +192,7 @@ char *str;
{
PDC_LOG(("mvinstr() - called: y %d x %d \n", y, x));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return winnstr(stdscr, str, stdscr->_maxx);
@@ -212,7 +212,7 @@ int n;
{
PDC_LOG(("mvinnstr() - called: y %d x %d n %d \n", y, x, n));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
return winnstr(stdscr, str, n);

View File

@@ -17,7 +17,7 @@
* See the file maintain.er for details of the current maintainer.
***************************************************************************
*/
#define CURSES_LIBRARY 1
#define CURSES_LIBRARY 1
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -44,7 +44,7 @@
#endif
#ifdef PDCDEBUG
char *rcsid_printw = "$Id: printw.c,v 1.4 2006/01/13 01:17:59 wmcbrine Exp $";
char *rcsid_printw = "$Id: printw.c,v 1.5 2006/01/14 06:42:03 wmcbrine Exp $";
#endif
/*man-start*********************************************************************
@@ -181,7 +181,7 @@ va_dcl
PDC_LOG(("mvprintw() - called\n"));
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
#ifdef HAVE_STDARG_H_HAVE_PROTO

View File

@@ -17,7 +17,7 @@
* See the file maintain.er for details of the current maintainer.
***************************************************************************
*/
#define CURSES_LIBRARY 1
#define CURSES_LIBRARY 1
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -50,7 +50,7 @@
#endif
#ifdef PDCDEBUG
char *rcsid_scanw = "$Id: scanw.c,v 1.4 2006/01/13 01:17:59 wmcbrine Exp $";
char *rcsid_scanw = "$Id: scanw.c,v 1.5 2006/01/14 06:42:03 wmcbrine Exp $";
#endif
/*man-start*********************************************************************
@@ -191,7 +191,7 @@ va_dcl
PDC_LOG(("mvscanw() - called\n"));
#if !defined(HC)
if (wmove(stdscr, y, x) == ERR)
if (move(y, x) == ERR)
return ERR;
/* get string */