aboutsummaryrefslogtreecommitdiff
path: root/ncurses/base/lib_slkclear.c
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
committerXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
commit4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a (patch)
treeb8f6e12b479a78216f3bffb8e1258d54087268de /ncurses/base/lib_slkclear.c
parente07762606a5bf651a501cb095c98cba90e4a8fe2 (diff)
downloadsrc-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_slkclear.c')
-rw-r--r--ncurses/base/lib_slkclear.c30
1 files changed, 11 insertions, 19 deletions
diff --git a/ncurses/base/lib_slkclear.c b/ncurses/base/lib_slkclear.c
index 264c8c40812c..946ceeaf0e0d 100644
--- a/ncurses/base/lib_slkclear.c
+++ b/ncurses/base/lib_slkclear.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 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 *
@@ -40,35 +40,27 @@
*/
#include <curses.priv.h>
-MODULE_ID("$Id: lib_slkclear.c,v 1.14 2009/11/07 16:27:05 tom Exp $")
+MODULE_ID("$Id: lib_slkclear.c,v 1.10 2007/12/29 17:51:47 tom Exp $")
NCURSES_EXPORT(int)
-NCURSES_SP_NAME(slk_clear) (NCURSES_SP_DCL0)
+slk_clear(void)
{
int rc = ERR;
- T((T_CALLED("slk_clear(%p)"), (void *) SP_PARM));
+ T((T_CALLED("slk_clear()")));
- if (SP_PARM != 0 && SP_PARM->_slk != 0) {
- SP_PARM->_slk->hidden = TRUE;
+ if (SP != NULL && SP->_slk != NULL) {
+ SP->_slk->hidden = TRUE;
/* For simulated SLK's it looks much more natural to
inherit those attributes from the standard screen */
- SP_PARM->_slk->win->_nc_bkgd = StdScreen(SP_PARM)->_nc_bkgd;
- WINDOW_ATTRS(SP_PARM->_slk->win) = WINDOW_ATTRS(StdScreen(SP_PARM));
- if (SP_PARM->_slk->win == StdScreen(SP_PARM)) {
+ SP->_slk->win->_nc_bkgd = stdscr->_nc_bkgd;
+ WINDOW_ATTRS(SP->_slk->win) = WINDOW_ATTRS(stdscr);
+ if (SP->_slk->win == stdscr) {
rc = OK;
} else {
- werase(SP_PARM->_slk->win);
- rc = wrefresh(SP_PARM->_slk->win);
+ werase(SP->_slk->win);
+ rc = wrefresh(SP->_slk->win);
}
}
returnCode(rc);
}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(int)
-slk_clear(void)
-{
- return NCURSES_SP_NAME(slk_clear) (CURRENT_SCREEN);
-}
-#endif