ncurses 5.7 - patch 20100703

[ncurses.git] / panel / p_above.c

diff --git a/panel/p_above.c b/panel/p_above.c
index 0c3d10fc224c20f5a827b01a0390c938e40ff6ad..8bbf1bc21cea8f14b4b17bd2e9d8649c78a85ab4 100644 (file)
--- a/panel/p_above.c
+++ b/panel/p_above.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2009,2010 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,23 +29,56 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995                    *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995                    *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Juergen Pfeifer                         1997-1999,2008          *

  ****************************************************************************/
 
 /* p_above.c
  */
 #include "panel.priv.h"
 
  ****************************************************************************/
 
 /* p_above.c
  */
 #include "panel.priv.h"
 

-MODULE_ID("$Id: p_above.c,v 1.2 1998/02/11 12:14:01 tom Exp $")
+MODULE_ID("$Id: p_above.c,v 1.8 2010/01/23 21:22:15 tom Exp $")

 
 

-PANEL*
-panel_above(const PANEL *pan)
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(PANEL *)
+ground_panel(SCREEN * sp)

 {
 {

-  if(!pan)
+  T((T_CALLED("ground_panel(%p)"), sp));
+  if (sp)

     {
     {

-      /* if top and bottom are equal, we have no or only the pseudo panel;
-        if not, we return the panel above the pseudo panel */
-      return(_nc_bottom_panel==_nc_top_panel ? (PANEL*)0 : _nc_bottom_panel->above);
+      struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp);
+
+      if (_nc_bottom_panel)    /* this is the pseudo panel */
+       returnPanel(_nc_bottom_panel->above);
+      else
+       returnPanel(0);
+    }
+  else
+    {
+      if (0 == CURRENT_SCREEN)
+       returnPanel(0);
+      else
+       returnPanel(ground_panel(CURRENT_SCREEN));

     }
     }

+}
+#endif
+
+NCURSES_EXPORT(PANEL *)
+panel_above(const PANEL * pan)
+{
+  PANEL *result;
+
+  T((T_CALLED("panel_above(%p)"), (const void *)pan));
+  if (pan)
+    result = pan->above;

   else
   else

-    return(pan->above);
+    {
+#if NCURSES_SP_FUNCS
+      result = ground_panel(CURRENT_SCREEN);
+#else
+      /* if top and bottom are equal, we have no or only the pseudo panel;
+         if not, we return the panel above the pseudo panel */
+      result = EMPTY_STACK()? (PANEL *) 0 : _nc_bottom_panel->above;
+#endif
+    }
+  returnPanel(result);

 }
 }