X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=panel%2Fp_new.c;h=235336c22f5163a6191e8f8e1a1f106d1115edc0;hp=f2f208d6ec7b68cb2a9ebb9eaa302d4fbdd5b8fb;hb=e2d7d0028f4298dca2b0edaf2dc8ce30518d9218;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/panel/p_new.c b/panel/p_new.c
index f2f208d6..235336c2 100644
--- 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,56 +38,85 @@
  */
 #include "panel.priv.h"
 
-MODULE_ID("$Id: p_new.c,v 1.4 1999/09/29 15:22:32 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;
+#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
-	pan->user = "stdscr";
+	  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)
+    returnPanel(pan);
 
-  (void)root_panel();
+  if (!_nc_stdscr_pseudo_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
-      pan->user = "new";
+      if (!new_id)
+	new_id = strdup("new");
+      pan->user = new_id;
 #else
       pan->user = (char *)0;
 #endif
       (void)show_panel(pan);
     }
-  return(pan);
+  returnPanel(pan);
 }