aboutsummaryrefslogtreecommitdiff
path: root/contrib/ncurses/panel/p_show.c
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2000-07-03 09:24:12 +0000
committerPeter Wemm <peter@FreeBSD.org>2000-07-03 09:24:12 +0000
commit15589c42fa2774d2f8ee650f4f31eb8d3a861316 (patch)
tree27e79485df3c9195e6fe58960df47f675f41f1e9 /contrib/ncurses/panel/p_show.c
parent6b9085fd58b7602b14be0cd2059285baa764a7ee (diff)
downloadsrc-15589c42fa2774d2f8ee650f4f31eb8d3a861316.tar.gz
src-15589c42fa2774d2f8ee650f4f31eb8d3a861316.zip
Import the most recent ncurses 5.1 prerelease (20000701).
Mostly this is intended to resolve the trace() badness once and for all. Obtained from: ftp://dickey.his.com/ncurses/
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=62449
Diffstat (limited to 'contrib/ncurses/panel/p_show.c')
-rw-r--r--contrib/ncurses/panel/p_show.c40
1 files changed, 14 insertions, 26 deletions
diff --git a/contrib/ncurses/panel/p_show.c b/contrib/ncurses/panel/p_show.c
index d129fd50715b..4fc7b1dbcba1 100644
--- a/contrib/ncurses/panel/p_show.c
+++ b/contrib/ncurses/panel/p_show.c
@@ -36,32 +36,13 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_show.c,v 1.5 1999/09/29 15:22:32 juergen Exp $")
-
-static void
-panel_link_top(PANEL *pan)
-{
-#ifdef TRACE
- dStack("<lt%d>",1,pan);
- if(_nc_panel_is_linked(pan))
- return;
-#endif
-
- assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel);
-
- pan->above = (PANEL *)0;
- pan->below = (PANEL *)0;
-
- _nc_top_panel->above = pan;
- pan->below = _nc_top_panel;
- _nc_top_panel = pan;
-
- dStack("<lt%d>",9,pan);
-}
+MODULE_ID("$Id: p_show.c,v 1.7 1999/11/25 13:49:26 juergen Exp $")
int
show_panel(PANEL *pan)
-{
+{
+ int err = OK;
+
if(!pan)
return(ERR);
@@ -70,10 +51,17 @@ show_panel(PANEL *pan)
dBug(("--> show_panel %s", USER_PTR(pan->user)));
- if(_nc_panel_is_linked(pan))
- (void)hide_panel(pan);
+ HIDE_PANEL(pan,err,FALSE);
+
+ dStack("<lt%d>",1,pan);
+ assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel);
- panel_link_top(pan);
+ _nc_top_panel->above = pan;
+ pan->below = _nc_top_panel;
+ pan->above = (PANEL *)0;
+ _nc_top_panel = pan;
+
+ dStack("<lt%d>",9,pan);
return(OK);
}