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_slkinit.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_slkinit.c')
| -rw-r--r-- | ncurses/base/lib_slkinit.c | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/ncurses/base/lib_slkinit.c b/ncurses/base/lib_slkinit.c index 9cbdfea98430..c440109b34e6 100644 --- a/ncurses/base/lib_slkinit.c +++ b/ncurses/base/lib_slkinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * + * Copyright (c) 1998-2007,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 * @@ -30,7 +30,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 2009 * ****************************************************************************/ /* @@ -40,41 +39,17 @@ */ #include <curses.priv.h> -MODULE_ID("$Id: lib_slkinit.c,v 1.13 2009/10/31 00:10:46 tom Exp $") - -#ifdef USE_SP_RIPOFF -#define SoftkeyFormat SP_PARM->slk_format -#else -#define SoftkeyFormat _nc_globals.slk_format -#endif +MODULE_ID("$Id: lib_slkinit.c,v 1.7 2008/01/12 20:23:39 tom Exp $") NCURSES_EXPORT(int) -NCURSES_SP_NAME(slk_init) (NCURSES_SP_DCLx int format) +slk_init(int format) { int code = ERR; - START_TRACE(); - T((T_CALLED("slk_init(%p,%d)"), (void *) SP_PARM, format)); - - if (format >= 0 - && format <= 3 -#ifdef USE_SP_RIPOFF - && SP_PARM - && SP_PARM->_prescreen -#endif - && !SoftkeyFormat) { - SoftkeyFormat = 1 + format; - code = NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_ARGx - -SLK_LINES(SoftkeyFormat), - _nc_slk_initialize); + T((T_CALLED("slk_init(%d)"), format)); + if (format >= 0 && format <= 3 && !_nc_globals.slk_format) { + _nc_globals.slk_format = 1 + format; + code = _nc_ripoffline(-SLK_LINES(_nc_globals.slk_format), _nc_slk_initialize); } returnCode(code); } - -#if NCURSES_SP_FUNCS -NCURSES_EXPORT(int) -slk_init(int format) -{ - return NCURSES_SP_NAME(slk_init) (CURRENT_SCREEN_PRE, format); -} -#endif |