diff options
Diffstat (limited to 'ncurses/base/lib_mvwin.c')
| -rw-r--r-- | ncurses/base/lib_mvwin.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/ncurses/base/lib_mvwin.c b/ncurses/base/lib_mvwin.c index 18d31c13319b4..e4dad4a746f08 100644 --- a/ncurses/base/lib_mvwin.c +++ b/ncurses/base/lib_mvwin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2001,2006 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 * @@ -29,8 +29,6 @@ /**************************************************************************** * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * * and: Eric S. Raymond <esr@snark.thyrsus.com> * - * and: Thomas E. Dickey 1996-on * - * and: Juergen Pfeifer * ****************************************************************************/ /* @@ -42,16 +40,12 @@ #include <curses.priv.h> -MODULE_ID("$Id: lib_mvwin.c,v 1.18 2010/12/19 01:22:58 tom Exp $") +MODULE_ID("$Id: lib_mvwin.c,v 1.14 2006/02/25 22:53:46 tom Exp $") NCURSES_EXPORT(int) mvwin(WINDOW *win, int by, int bx) { -#if NCURSES_SP_FUNCS - SCREEN *sp = _nc_screen_of(win); -#endif - - T((T_CALLED("mvwin(%p,%d,%d)"), (void *) win, by, bx)); + T((T_CALLED("mvwin(%p,%d,%d)"), win, by, bx)); if (!win || (win->_flags & _ISPAD)) returnCode(ERR); @@ -102,8 +96,8 @@ mvwin(WINDOW *win, int by, int bx) } #endif - if (by + win->_maxy > screen_lines(SP_PARM) - 1 - || bx + win->_maxx > screen_columns(SP_PARM) - 1 + if (by + win->_maxy > screen_lines - 1 + || bx + win->_maxx > screen_columns - 1 || by < 0 || bx < 0) returnCode(ERR); @@ -114,7 +108,7 @@ mvwin(WINDOW *win, int by, int bx) * new location. This ensures that if the caller has refreshed another * window at the same location, that this one will be displayed. */ - win->_begy = (NCURSES_SIZE_T) by; - win->_begx = (NCURSES_SIZE_T) bx; + win->_begy = by; + win->_begx = bx; returnCode(touchwin(win)); } |