diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-02-28 19:12:44 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-02-28 19:12:44 +0000 |
| commit | 4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a (patch) | |
| tree | b8f6e12b479a78216f3bffb8e1258d54087268de /ncurses/base/lib_getstr.c | |
| parent | e07762606a5bf651a501cb095c98cba90e4a8fe2 (diff) | |
| download | src-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.tar.gz src-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.zip | |
Undo two previous imports which was never done in preparation of doing a
new import.
Notes
Notes:
svn path=/vendor/ncurses/dist/; revision=262616
Diffstat (limited to 'ncurses/base/lib_getstr.c')
| -rw-r--r-- | ncurses/base/lib_getstr.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ncurses/base/lib_getstr.c b/ncurses/base/lib_getstr.c index 21d8baa05c8b..b17df03d2a41 100644 --- a/ncurses/base/lib_getstr.c +++ b/ncurses/base/lib_getstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2008 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 * @@ -39,8 +39,9 @@ */ #include <curses.priv.h> +#include <term.h> -MODULE_ID("$Id: lib_getstr.c,v 1.29 2009/10/24 21:59:02 tom Exp $") +MODULE_ID("$Id: lib_getstr.c,v 1.27 2008/08/16 19:20:04 tom Exp $") /* * This wipes out the last character, no matter whether it was a tab, control @@ -83,24 +84,24 @@ wgetnstr_events(WINDOW *win, int ch; int y, x; - T((T_CALLED("wgetnstr(%p,%p,%d)"), (void *) win, (void *) str, maxlen)); + T((T_CALLED("wgetnstr(%p,%p, %d)"), win, str, maxlen)); if (!win) returnCode(ERR); - NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_ARGx &buf); + _nc_get_tty_mode(&buf); oldnl = sp->_nl; oldecho = sp->_echo; oldraw = sp->_raw; oldcbreak = sp->_cbreak; - NCURSES_SP_NAME(nl) (NCURSES_SP_ARG); - NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG); - NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG); - NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG); + nl(); + noecho(); + noraw(); + cbreak(); - erasec = NCURSES_SP_NAME(erasechar) (NCURSES_SP_ARG); - killc = NCURSES_SP_NAME(killchar) (NCURSES_SP_ARG); + erasec = erasechar(); + killc = killchar(); oldstr = str; getyx(win, y, x); @@ -143,7 +144,7 @@ wgetnstr_events(WINDOW *win, } } else if (ch >= KEY_MIN || (maxlen >= 0 && str - oldstr >= maxlen)) { - NCURSES_SP_NAME(beep) (NCURSES_SP_ARG); + beep(); } else { *str++ = (char) ch; if (oldecho == TRUE) { @@ -192,7 +193,7 @@ wgetnstr_events(WINDOW *win, sp->_raw = oldraw; sp->_cbreak = oldcbreak; - NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf); + _nc_set_tty_mode(&buf); *str = '\0'; if (ch == ERR) |