X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=panel%2Fp_new.c;h=3e48e3696735dc71c8958a741f41041a92cc615e;hp=f2f208d6ec7b68cb2a9ebb9eaa302d4fbdd5b8fb;hb=efd59f16f336b4c4c698ff783e1723f3161026ef;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce;ds=sidebyside diff --git a/panel/p_new.c b/panel/p_new.c index f2f208d6..3e48e369 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-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 * @@ -36,56 +36,73 @@ */ #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.8 2005/02/19 16:41:03 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* +static PANEL * root_panel(void) { - if(_nc_stdscr_pseudo_panel == (PANEL*)0) + 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; + _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; #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; + + T((T_CALLED("new_panel(%p)"), win)); + + if (!win) + returnPanel(pan); - (void)root_panel(); + if (!_nc_stdscr_pseudo_panel) + (void)root_panel(); assert(_nc_stdscr_pseudo_panel); - if (!(win->_flags & _ISPAD) && (pan = (PANEL*)malloc(sizeof(PANEL)))) + if (!(win->_flags & _ISPAD) && (pan = (PANEL *) malloc(sizeof(PANEL)))) { 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); }