diff options
Diffstat (limited to 'panel/p_above.c')
| -rw-r--r-- | panel/p_above.c | 46 |
1 files changed, 7 insertions, 39 deletions
diff --git a/panel/p_above.c b/panel/p_above.c index 8bbf1bc21cea8..32495f627f2db 100644 --- a/panel/p_above.c +++ b/panel/p_above.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 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 * @@ -29,56 +29,24 @@ /**************************************************************************** * 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" -MODULE_ID("$Id: p_above.c,v 1.8 2010/01/23 21:22:15 tom Exp $") - -#if NCURSES_SP_FUNCS -NCURSES_EXPORT(PANEL *) -ground_panel(SCREEN * sp) -{ - T((T_CALLED("ground_panel(%p)"), sp)); - if (sp) - { - 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 +MODULE_ID("$Id: p_above.c,v 1.6 2005/02/19 16:44:57 tom Exp $") 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 + T((T_CALLED("panel_above(%p)"), pan)); + if (!pan) { -#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(EMPTY_STACK()? (PANEL *) 0 : _nc_bottom_panel->above); } - returnPanel(result); + else + returnPanel(pan->above); } |