X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=panel%2Fp_show.c;h=35eee237b958007d378339d8b4801e3d31881911;hp=10781efb73a2b9708560a28f7b339574a35405a2;hb=772f879d17117c5b766022f28099e341ebea825b;hpb=661078ddbde3ce0f3b06e95642fbb9b5fef7dca1

diff --git a/panel/p_show.c b/panel/p_show.c
index 10781efb..35eee237 100644
--- a/panel/p_show.c
+++ b/panel/p_show.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2000,2005 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            *
@@ -36,41 +36,34 @@
  */
 #include "panel.priv.h"
 
-MODULE_ID("$Id: p_show.c,v 1.2 1998/02/11 12:14:01 tom Exp $")
+MODULE_ID("$Id: p_show.c,v 1.11 2005/02/19 16:42:02 tom Exp $")
 
-static void
-panel_link_top(PANEL *pan)
+NCURSES_EXPORT(int)
+show_panel(PANEL * pan)
 {
-#ifdef TRACE
-  dStack("<lt%d>",1,pan);
-  if(_nc_panel_is_linked(pan))
-    return;
-#endif
+  int err = OK;
 
-  pan->above = (PANEL *)0;
-  pan->below = (PANEL *)0;
-  if(_nc_top_panel)
-    {
-      _nc_top_panel->above = pan;
-      pan->below = _nc_top_panel;
-    }
-  _nc_top_panel = pan;
-  if(!_nc_bottom_panel)
-    _nc_bottom_panel = pan;
-  _nc_calculate_obscure();
-  dStack("<lt%d>",9,pan);
-}
+  T((T_CALLED("show_panel(%p)"), pan));
+
+  if (!pan)
+    returnCode(ERR);
+
+  if (Is_Top(pan))
+    returnCode(OK);
 
-int
-show_panel(PANEL *pan)
-{
-  if(!pan)
-    return(ERR);
-  if(pan == _nc_top_panel)
-    return(OK);
   dBug(("--> show_panel %s", USER_PTR(pan->user)));
-  if(_nc_panel_is_linked(pan))
-    (void)hide_panel(pan);
-  panel_link_top(pan);
-  return(OK);
+
+  HIDE_PANEL(pan, err, OK);
+
+  dStack("<lt%d>", 1, pan);
+  assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel);
+
+  _nc_top_panel->above = pan;
+  pan->below = _nc_top_panel;
+  pan->above = (PANEL *) 0;
+  _nc_top_panel = pan;
+
+  dStack("<lt%d>", 9, pan);
+
+  returnCode(OK);
 }