diff options
author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-01-12 23:22:15 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-01-12 23:22:15 +0000 |
commit | 6ee254699bf787d78835419be2b3241fb037d444 (patch) | |
tree | 07fe67dab517e4990f344fe2c00e65cef4d25b81 /lib/libpanel/p_bottom.c | |
parent | 0b62f5dc36fc7203a74cdc812c4234ae188fdfd2 (diff) |
Update to ncurses 5.7, with local changes reapplied.
This is around eight years worth of changes (previously we were around ncurses
5.2), too many to list - many bug fixes and also a few new functions.
A major bump for libcurses, libpanel, libform and libmenu.
ok deraadt
Diffstat (limited to 'lib/libpanel/p_bottom.c')
-rw-r--r-- | lib/libpanel/p_bottom.c | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/lib/libpanel/p_bottom.c b/lib/libpanel/p_bottom.c index 5d4a2b4da48..767de9865eb 100644 --- a/lib/libpanel/p_bottom.c +++ b/lib/libpanel/p_bottom.c @@ -1,7 +1,7 @@ -/* $OpenBSD: p_bottom.c,v 1.5 2001/02/28 22:58:53 millert Exp $ */ +/* $OpenBSD: p_bottom.c,v 1.6 2010/01/12 23:22:08 nicm Exp $ */ /**************************************************************************** - * Copyright (c) 1998,2000 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 * @@ -38,35 +38,37 @@ */ #include "panel.priv.h" -MODULE_ID("$From: p_bottom.c,v 1.9 2001/02/24 23:46:33 tom Exp $") +MODULE_ID("$Id: p_bottom.c,v 1.6 2010/01/12 23:22:08 nicm Exp $") NCURSES_EXPORT(int) -bottom_panel (PANEL *pan) +bottom_panel(PANEL * pan) { int err = OK; - if (pan) { + T((T_CALLED("bottom_panel(%p)"), pan)); + if (pan) + { + if (!Is_Bottom(pan)) + { - if(!Is_Bottom(pan)) { - - dBug(("--> bottom_panel %s", USER_PTR(pan->user))); - - HIDE_PANEL(pan,err,OK); - assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel); - - dStack("<lb%d>",1,pan); - - pan->below = _nc_bottom_panel; - pan->above = _nc_bottom_panel->above; - if (pan->above) - pan->above->below = pan; - _nc_bottom_panel->above = pan; - - dStack("<lb%d>",9,pan); + dBug(("--> bottom_panel %s", USER_PTR(pan->user))); + + HIDE_PANEL(pan, err, OK); + assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel); + + dStack("<lb%d>", 1, pan); + + pan->below = _nc_bottom_panel; + pan->above = _nc_bottom_panel->above; + if (pan->above) + pan->above->below = pan; + _nc_bottom_panel->above = pan; + + dStack("<lb%d>", 9, pan); + } } - } else err = ERR; - - return(err); + + returnCode(err); } |