ncurses 5.9 - patch 20111224

[ncurses.git] / panel / p_new.c

diff --git a/panel/p_new.c b/panel/p_new.c
index 43542fea2154313e796b6b373420081eaab4c833..235336c22f5163a6191e8f8e1a1f106d1115edc0 100644 (file)
--- a/panel/p_new.c
+++ b/panel/p_new.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            *
@@ -29,6 +29,8 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995                    *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Juergen Pfeifer                         1997-1999               *
+ *     and: Thomas E. Dickey                        2000-on                 *
  ****************************************************************************/
 
 /* p_new.c
@@ -36,61 +38,77 @@
  */
 #include "panel.priv.h"
 
-MODULE_ID("$Id: p_new.c,v 1.5 1999/11/22 18:02:41 juergen Exp $")
+MODULE_ID("$Id: p_new.c,v 1.16 2010/01/23 21:22:16 tom Exp $")
 
 #ifdef TRACE
-static char* stdscr_id;
-static char* new_id;
+static char *stdscr_id;
+static char *new_id;
 #endif
 
 /*+-------------------------------------------------------------------------
   Get root (i.e. stdscr's) panel.
   Establish the pseudo panel for stdscr if necessary.
 --------------------------------------------------------------------------*/
-static PANEL*
-root_panel(void)
+static PANEL *
+root_panel(NCURSES_SP_DCL0)
 {
-  if(_nc_stdscr_pseudo_panel == (PANEL*)0)
+#if NCURSES_SP_FUNCS
+  struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp);
+
+#elif NO_LEAKS
+  struct panelhook *ph = _nc_panelhook();
+#endif
+
+  if (_nc_stdscr_pseudo_panel == (PANEL *) 0)
     {
-      
-      assert(stdscr && !_nc_bottom_panel && !_nc_top_panel);
-      _nc_stdscr_pseudo_panel = (PANEL*)malloc(sizeof(PANEL));
-      if (_nc_stdscr_pseudo_panel != 0) {
-       PANEL* pan  = _nc_stdscr_pseudo_panel;
-       WINDOW* win = stdscr;
-       pan->win = win;
-       pan->below   = (PANEL*)0;
-       pan->above   = (PANEL*)0;
+
+      assert(SP_PARM && SP_PARM->_stdscr && !_nc_bottom_panel && !_nc_top_panel);
+#if NO_LEAKS
+      ph->destroy = del_panel;
+#endif
+      _nc_stdscr_pseudo_panel = typeMalloc(PANEL, 1);
+      if (_nc_stdscr_pseudo_panel != 0)
+       {
+         PANEL *pan = _nc_stdscr_pseudo_panel;
+         WINDOW *win = SP_PARM->_stdscr;
+
+         pan->win = win;
+         pan->below = (PANEL *) 0;
+         pan->above = (PANEL *) 0;
 #ifdef TRACE
-       if (!stdscr_id)
-         stdscr_id = strdup("stdscr");
-       pan->user = stdscr_id;
+         if (!stdscr_id)
+           stdscr_id = strdup("stdscr");
+         pan->user = stdscr_id;
 #else
-       pan->user = (void*)0;
+         pan->user = (void *)0;
 #endif
-       _nc_bottom_panel = _nc_top_panel = pan;
-      }
+         _nc_bottom_panel = _nc_top_panel = pan;
+       }
     }
   return _nc_stdscr_pseudo_panel;
 }
 
-PANEL *
+NCURSES_EXPORT(PANEL *)
 new_panel(WINDOW *win)
 {
-  PANEL *pan = (PANEL*)0;
+  PANEL *pan = (PANEL *) 0;
+
+  GetWindowHook(win);
+
+  T((T_CALLED("new_panel(%p)"), (void *)win));
 
   if (!win)
-    return(pan);
+    returnPanel(pan);
 
   if (!_nc_stdscr_pseudo_panel)
-    (void)root_panel();
+    (void)root_panel(NCURSES_SP_ARG);
   assert(_nc_stdscr_pseudo_panel);
 
-  if (!(win->_flags & _ISPAD) && (pan = (PANEL*)malloc(sizeof(PANEL))))
+  if (!(win->_flags & _ISPAD) && (pan = typeMalloc(PANEL, 1)))
     {
       pan->win = win;
-      pan->above = (PANEL *)0;
-      pan->below = (PANEL *)0;
+      pan->above = (PANEL *) 0;
+      pan->below = (PANEL *) 0;
 #ifdef TRACE
       if (!new_id)
        new_id = strdup("new");
@@ -100,5 +118,5 @@ new_panel(WINDOW *win)
 #endif
       (void)show_panel(pan);
     }
-  return(pan);
+  returnPanel(pan);
 }