aboutsummaryrefslogtreecommitdiff
path: root/panel
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
committerXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
commit4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a (patch)
treeb8f6e12b479a78216f3bffb8e1258d54087268de /panel
parente07762606a5bf651a501cb095c98cba90e4a8fe2 (diff)
downloadsrc-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.tar.gz
src-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.zip
Undo two previous imports which was never done in preparation of doing a
new import.
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=262616
Diffstat (limited to 'panel')
-rw-r--r--panel/Makefile.in19
-rw-r--r--panel/llib-lpanel21
-rw-r--r--panel/llib-lpanelt197
-rw-r--r--panel/llib-lpaneltw197
-rw-r--r--panel/llib-lpanelw21
-rw-r--r--panel/modules34
-rw-r--r--panel/p_above.c46
-rw-r--r--panel/p_below.c43
-rw-r--r--panel/p_bottom.c8
-rw-r--r--panel/p_delete.c14
-rw-r--r--panel/p_hidden.c18
-rw-r--r--panel/p_hide.c24
-rw-r--r--panel/p_move.c24
-rw-r--r--panel/p_new.c29
-rw-r--r--panel/p_replace.c26
-rw-r--r--panel/p_show.c39
-rw-r--r--panel/p_top.c6
-rw-r--r--panel/p_update.c43
-rw-r--r--panel/p_user.c8
-rw-r--r--panel/p_win.c6
-rw-r--r--panel/panel.c10
-rw-r--r--panel/panel.h12
-rw-r--r--panel/panel.priv.h59
23 files changed, 160 insertions, 744 deletions
diff --git a/panel/Makefile.in b/panel/Makefile.in
index f0f0a4922bd0..89dbeeac9009 100644
--- a/panel/Makefile.in
+++ b/panel/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.58 2010/11/27 21:45:27 tom Exp $
+# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $
##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2006,2007 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 "Software"), #
@@ -43,7 +43,6 @@
.SUFFIXES:
SHELL = /bin/sh
-VPATH = @srcdir@
THIS = Makefile
x = @EXEEXT@
@@ -65,7 +64,6 @@ LIBTOOL_COMPILE = @LIB_COMPILE@
LIBTOOL_LINK = @LIB_LINK@
LIBTOOL_INSTALL = @LIB_INSTALL@
LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
-LT_UNDEF = @LT_UNDEF@
INSTALL = @INSTALL@
INSTALL_LIB = @INSTALL@ @INSTALL_LIB@
@@ -73,14 +71,11 @@ INSTALL_PROG = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
AR = @AR@
-ARFLAGS = @ARFLAGS@
+AR_OPTS = @AR_OPTS@
AWK = @AWK@
LD = @LD@
LN_S = @LN_S@
-CTAGS = @CTAGS@
-ETAGS = @ETAGS@
-
CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@
@@ -130,7 +125,7 @@ sources: $(AUTO_SRC)
$(DESTDIR)$(bindir) \
$(DESTDIR)$(libdir) :
- mkdir -p $@
+ sh $(srcdir)/../mkdirs.sh $@
# make a copy to simplify include-paths while still keeping panel's include
# file in this directory.
@@ -138,15 +133,15 @@ $(DESTDIR)$(libdir) :
-rm -f $@
cp $(srcdir)/panel.h $@
-HEADER_DEPS = \
+PANEL_PRIV_H = \
$(srcdir)/panel.priv.h \
$(srcdir)/panel.h
tags:
- $(CTAGS) *.[ch]
+ ctags *.[ch]
@MAKE_UPPER_TAGS@TAGS:
-@MAKE_UPPER_TAGS@ $(ETAGS) *.[ch]
+@MAKE_UPPER_TAGS@ etags *.[ch]
mostlyclean ::
-rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace
diff --git a/panel/llib-lpanel b/panel/llib-lpanel
index 85371ec73e06..de49c234ecaa 100644
--- a/panel/llib-lpanel
+++ b/panel/llib-lpanel
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2002,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 *
@@ -27,13 +27,13 @@
****************************************************************************/
/****************************************************************************
- * Author: Thomas E. Dickey 1997,2005,2010 *
+ * Author: Thomas E. Dickey 1997,2002,2005 *
****************************************************************************/
/* LINTLIBRARY */
/* ./panel.c */
-#include <panel.priv.h>
+#include "panel.priv.h"
#undef _nc_retrace_panel
PANEL *_nc_retrace_panel(
@@ -77,11 +77,6 @@ void _nc_Touchline(
/* ./p_above.c */
-#undef ground_panel
-PANEL *ground_panel(
- SCREEN *sp)
- { return(*(PANEL **)0); }
-
#undef panel_above
PANEL *panel_above(
const PANEL *pan)
@@ -89,11 +84,6 @@ PANEL *panel_above(
/* ./p_below.c */
-#undef ceiling_panel
-PANEL *ceiling_panel(
- SCREEN *sp)
- { return(*(PANEL **)0); }
-
#undef panel_below
PANEL *panel_below(
const PANEL *pan)
@@ -167,11 +157,6 @@ int top_panel(
/* ./p_update.c */
-#undef update_panels_sp
-void update_panels_sp(
- SCREEN *sp)
- { /* void */ }
-
#undef update_panels
void update_panels(void)
{ /* void */ }
diff --git a/panel/llib-lpanelt b/panel/llib-lpanelt
deleted file mode 100644
index 8fcd42c9b6de..000000000000
--- a/panel/llib-lpanelt
+++ /dev/null
@@ -1,197 +0,0 @@
-/****************************************************************************
- * Copyright (c) 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 *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, distribute with modifications, sublicense, and/or sell *
- * copies of the Software, and to permit persons to whom the Software is *
- * furnished to do so, subject to the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be included *
- * in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
- * *
- * Except as contained in this notice, the name(s) of the above copyright *
- * holders shall not be used in advertising or otherwise to promote the *
- * sale, use or other dealings in this Software without prior written *
- * authorization. *
- ****************************************************************************/
-
-/****************************************************************************
- * Author: Thomas E. Dickey 2010 *
- ****************************************************************************/
-/* LINTLIBRARY */
-
-/* ./panel.c */
-
-#include <panel.priv.h>
-
-#undef _nc_retrace_panel
-PANEL *_nc_retrace_panel(
- PANEL *pan)
- { return(*(PANEL **)0); }
-
-#undef _nc_my_visbuf
-const char *_nc_my_visbuf(
- const void *ptr)
- { return(*(const char **)0); }
-
-#undef _nc_dPanel
-void _nc_dPanel(
- const char *text,
- const PANEL *pan)
- { /* void */ }
-
-#undef _nc_dStack
-void _nc_dStack(
- const char *fmt,
- int num,
- const PANEL *pan)
- { /* void */ }
-
-#undef _nc_Wnoutrefresh
-void _nc_Wnoutrefresh(
- const PANEL *pan)
- { /* void */ }
-
-#undef _nc_Touchpan
-void _nc_Touchpan(
- const PANEL *pan)
- { /* void */ }
-
-#undef _nc_Touchline
-void _nc_Touchline(
- const PANEL *pan,
- int start,
- int count)
- { /* void */ }
-
-/* ./p_above.c */
-
-#undef ground_panel
-PANEL *ground_panel(
- SCREEN *sp)
- { return(*(PANEL **)0); }
-
-#undef panel_above
-PANEL *panel_above(
- const PANEL *pan)
- { return(*(PANEL **)0); }
-
-/* ./p_below.c */
-
-#undef ceiling_panel
-PANEL *ceiling_panel(
- SCREEN *sp)
- { return(*(PANEL **)0); }
-
-#undef panel_below
-PANEL *panel_below(
- const PANEL *pan)
- { return(*(PANEL **)0); }
-
-/* ./p_bottom.c */
-
-#undef bottom_panel
-int bottom_panel(
- PANEL *pan)
- { return(*(int *)0); }
-
-/* ./p_delete.c */
-
-#undef del_panel
-int del_panel(
- PANEL *pan)
- { return(*(int *)0); }
-
-/* ./p_hide.c */
-
-#undef hide_panel
-int hide_panel(
- PANEL *pan)
- { return(*(int *)0); }
-
-/* ./p_hidden.c */
-
-#undef panel_hidden
-int panel_hidden(
- const PANEL *pan)
- { return(*(int *)0); }
-
-/* ./p_move.c */
-
-#undef move_panel
-int move_panel(
- PANEL *pan,
- int starty,
- int startx)
- { return(*(int *)0); }
-
-/* ./p_new.c */
-
-#undef new_panel
-PANEL *new_panel(
- WINDOW *win)
- { return(*(PANEL **)0); }
-
-/* ./p_replace.c */
-
-#undef replace_panel
-int replace_panel(
- PANEL *pan,
- WINDOW *win)
- { return(*(int *)0); }
-
-/* ./p_show.c */
-
-#undef show_panel
-int show_panel(
- PANEL *pan)
- { return(*(int *)0); }
-
-/* ./p_top.c */
-
-#undef top_panel
-int top_panel(
- PANEL *pan)
- { return(*(int *)0); }
-
-/* ./p_update.c */
-
-#undef update_panels_sp
-void update_panels_sp(
- SCREEN *sp)
- { /* void */ }
-
-#undef update_panels
-void update_panels(void)
- { /* void */ }
-
-/* ./p_user.c */
-
-#undef set_panel_userptr
-int set_panel_userptr(
- PANEL *pan,
- void *uptr)
- { return(*(int *)0); }
-
-#undef panel_userptr
-void *panel_userptr(
- const PANEL *pan)
- { return(*(void **)0); }
-
-/* ./p_win.c */
-
-#undef panel_window
-WINDOW *panel_window(
- const PANEL *pan)
- { return(*(WINDOW **)0); }
diff --git a/panel/llib-lpaneltw b/panel/llib-lpaneltw
deleted file mode 100644
index 1d3cd8d84c8f..000000000000
--- a/panel/llib-lpaneltw
+++ /dev/null
@@ -1,197 +0,0 @@
-/****************************************************************************
- * Copyright (c) 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 *
- * "Software"), to deal in the Software without restriction, including *
- * without limitation the rights to use, copy, modify, merge, publish, *
- * distribute, distribute with modifications, sublicense, and/or sell *
- * copies of the Software, and to permit persons to whom the Software is *
- * furnished to do so, subject to the following conditions: *
- * *
- * The above copyright notice and this permission notice shall be included *
- * in all copies or substantial portions of the Software. *
- * *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
- * *
- * Except as contained in this notice, the name(s) of the above copyright *
- * holders shall not be used in advertising or otherwise to promote the *
- * sale, use or other dealings in this Software without prior written *
- * authorization. *
- ****************************************************************************/
-
-/****************************************************************************
- * Author: Thomas E. Dickey 2010 *
- ****************************************************************************/
-/* LINTLIBRARY */
-
-/* ./panel.c */
-
-#include <panel.priv.h>
-
-#undef _nc_retrace_panel
-PANEL *_nc_retrace_panel(
- PANEL *pan)
- { return(*(PANEL **)0); }
-
-#undef _nc_my_visbuf
-const char *_nc_my_visbuf(
- const void *ptr)
- { return(*(const char **)0); }
-
-#undef _nc_dPanel
-void _nc_dPanel(
- const char *text,
- const PANEL *pan)
- { /* void */ }
-
-#undef _nc_dStack
-void _nc_dStack(
- const char *fmt,
- int num,
- const PANEL *pan)
- { /* void */ }
-
-#undef _nc_Wnoutrefresh
-void _nc_Wnoutrefresh(
- const PANEL *pan)
- { /* void */ }
-
-#undef _nc_Touchpan
-void _nc_Touchpan(
- const PANEL *pan)
- { /* void */ }
-
-#undef _nc_Touchline
-void _nc_Touchline(
- const PANEL *pan,
- int start,
- int count)
- { /* void */ }
-
-/* ./p_above.c */
-
-#undef ground_panel
-PANEL *ground_panel(
- SCREEN *sp)
- { return(*(PANEL **)0); }
-
-#undef panel_above
-PANEL *panel_above(
- const PANEL *pan)
- { return(*(PANEL **)0); }
-
-/* ./p_below.c */
-
-#undef ceiling_panel
-PANEL *ceiling_panel(
- SCREEN *sp)
- { return(*(PANEL **)0); }
-
-#undef panel_below
-PANEL *panel_below(
- const PANEL *pan)
- { return(*(PANEL **)0); }
-
-/* ./p_bottom.c */
-
-#undef bottom_panel
-int bottom_panel(
- PANEL *pan)
- { return(*(int *)0); }
-
-/* ./p_delete.c */
-
-#undef del_panel
-int del_panel(
- PANEL *pan)
- { return(*(int *)0); }
-
-/* ./p_hide.c */
-
-#undef hide_panel
-int hide_panel(
- PANEL *pan)
- { return(*(int *)0); }
-
-/* ./p_hidden.c */
-
-#undef panel_hidden
-int panel_hidden(
- const PANEL *pan)
- { return(*(int *)0); }
-
-/* ./p_move.c */
-
-#undef move_panel
-int move_panel(
- PANEL *pan,
- int starty,
- int startx)
- { return(*(int *)0); }
-
-/* ./p_new.c */
-
-#undef new_panel
-PANEL *new_panel(
- WINDOW *win)
- { return(*(PANEL **)0); }
-
-/* ./p_replace.c */
-
-#undef replace_panel
-int replace_panel(
- PANEL *pan,
- WINDOW *win)
- { return(*(int *)0); }
-
-/* ./p_show.c */
-
-#undef show_panel
-int show_panel(
- PANEL *pan)
- { return(*(int *)0); }
-
-/* ./p_top.c */
-
-#undef top_panel
-int top_panel(
- PANEL *pan)
- { return(*(int *)0); }
-
-/* ./p_update.c */
-
-#undef update_panels_sp
-void update_panels_sp(
- SCREEN *sp)
- { /* void */ }
-
-#undef update_panels
-void update_panels(void)
- { /* void */ }
-
-/* ./p_user.c */
-
-#undef set_panel_userptr
-int set_panel_userptr(
- PANEL *pan,
- void *uptr)
- { return(*(int *)0); }
-
-#undef panel_userptr
-void *panel_userptr(
- const PANEL *pan)
- { return(*(void **)0); }
-
-/* ./p_win.c */
-
-#undef panel_window
-WINDOW *panel_window(
- const PANEL *pan)
- { return(*(WINDOW **)0); }
diff --git a/panel/llib-lpanelw b/panel/llib-lpanelw
index 503b34345ba8..48bd1e0db5a7 100644
--- a/panel/llib-lpanelw
+++ b/panel/llib-lpanelw
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2002-2005,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 2002,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 *
@@ -27,13 +27,13 @@
****************************************************************************/
/****************************************************************************
- * Author: Thomas E. Dickey 2002-2005,2010 *
+ * Author: Thomas E. Dickey 2002,2005 *
****************************************************************************/
/* LINTLIBRARY */
/* ./panel.c */
-#include <panel.priv.h>
+#include "panel.priv.h"
#undef _nc_retrace_panel
PANEL *_nc_retrace_panel(
@@ -77,11 +77,6 @@ void _nc_Touchline(
/* ./p_above.c */
-#undef ground_panel
-PANEL *ground_panel(
- SCREEN *sp)
- { return(*(PANEL **)0); }
-
#undef panel_above
PANEL *panel_above(
const PANEL *pan)
@@ -89,11 +84,6 @@ PANEL *panel_above(
/* ./p_below.c */
-#undef ceiling_panel
-PANEL *ceiling_panel(
- SCREEN *sp)
- { return(*(PANEL **)0); }
-
#undef panel_below
PANEL *panel_below(
const PANEL *pan)
@@ -167,11 +157,6 @@ int top_panel(
/* ./p_update.c */
-#undef update_panels_sp
-void update_panels_sp(
- SCREEN *sp)
- { /* void */ }
-
#undef update_panels
void update_panels(void)
{ /* void */ }
diff --git a/panel/modules b/panel/modules
index cd3f545630f7..d0f7a796678f 100644
--- a/panel/modules
+++ b/panel/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.10 2010/01/23 16:31:16 tom Exp $
+# $Id: modules,v 1.9 2006/12/24 00:53:17 tom Exp $
##############################################################################
-# Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. #
+# Copyright (c) 1998,2006 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 "Software"), #
@@ -32,20 +32,20 @@
@ base
# Library objects
-panel lib $(srcdir) $(HEADER_DEPS)
-p_above lib $(srcdir) $(HEADER_DEPS)
-p_below lib $(srcdir) $(HEADER_DEPS)
-p_bottom lib $(srcdir) $(HEADER_DEPS)
-p_delete lib $(srcdir) $(HEADER_DEPS)
-p_hide lib $(srcdir) $(HEADER_DEPS)
-p_hidden lib $(srcdir) $(HEADER_DEPS)
-p_move lib $(srcdir) $(HEADER_DEPS)
-p_new lib $(srcdir) $(HEADER_DEPS)
-p_replace lib $(srcdir) $(HEADER_DEPS)
-p_show lib $(srcdir) $(HEADER_DEPS)
-p_top lib $(srcdir) $(HEADER_DEPS)
-p_update lib $(srcdir) $(HEADER_DEPS)
-p_user lib $(srcdir) $(HEADER_DEPS)
-p_win lib $(srcdir) $(HEADER_DEPS)
+panel lib $(srcdir) $(PANEL_PRIV_H)
+p_above lib $(srcdir) $(PANEL_PRIV_H)
+p_below lib $(srcdir) $(PANEL_PRIV_H)
+p_bottom lib $(srcdir) $(PANEL_PRIV_H)
+p_delete lib $(srcdir) $(PANEL_PRIV_H)
+p_hide lib $(srcdir) $(PANEL_PRIV_H)
+p_hidden lib $(srcdir) $(PANEL_PRIV_H)
+p_move lib $(srcdir) $(PANEL_PRIV_H)
+p_new lib $(srcdir) $(PANEL_PRIV_H)
+p_replace lib $(srcdir) $(PANEL_PRIV_H)
+p_show lib $(srcdir) $(PANEL_PRIV_H)
+p_top lib $(srcdir) $(PANEL_PRIV_H)
+p_update lib $(srcdir) $(PANEL_PRIV_H)
+p_user lib $(srcdir) $(PANEL_PRIV_H)
+p_win lib $(srcdir) $(PANEL_PRIV_H)
# vile:makemode
diff --git a/panel/p_above.c b/panel/p_above.c
index 8bbf1bc21cea..32495f627f2d 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);
}
diff --git a/panel/p_below.c b/panel/p_below.c
index f276ef959da5..c4b241015f5b 100644
--- a/panel/p_below.c
+++ b/panel/p_below.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,57 +29,26 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
- * and: Juergen Pfeifer 1997-1999,2008 *
****************************************************************************/
/* p_below.c
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_below.c,v 1.8 2010/01/23 21:22:15 tom Exp $")
+MODULE_ID("$Id: p_below.c,v 1.6 2005/02/19 16:45:10 tom Exp $")
-#if NCURSES_SP_FUNCS
NCURSES_EXPORT(PANEL *)
-ceiling_panel(SCREEN * sp)
+panel_below(const PANEL * pan)
{
- T((T_CALLED("ceiling_panel(%p)"), sp));
- if (sp)
+ T((T_CALLED("panel_below(%p)"), pan));
+ if (!pan)
{
- struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp);
-
/* if top and bottom are equal, we have no or only the pseudo panel */
returnPanel(EMPTY_STACK()? (PANEL *) 0 : _nc_top_panel);
}
else
{
- if (0 == CURRENT_SCREEN)
- returnPanel(0);
- else
- returnPanel(ceiling_panel(CURRENT_SCREEN));
- }
-}
-#endif
-
-NCURSES_EXPORT(PANEL *)
-panel_below(const PANEL * pan)
-{
- PANEL *result;
-
- T((T_CALLED("panel_below(%p)"), (const void *)pan));
- if (pan)
- {
- GetHook(pan);
/* we must not return the pseudo panel */
- result = Is_Pseudo(pan->below) ? (PANEL *) 0 : pan->below;
- }
- else
- {
-#if NCURSES_SP_FUNCS
- result = ceiling_panel(CURRENT_SCREEN);
-#else
- /* if top and bottom are equal, we have no or only the pseudo panel */
- result = EMPTY_STACK()? (PANEL *) 0 : _nc_top_panel;
-#endif
+ returnPanel(Is_Pseudo(pan->below) ? (PANEL *) 0 : pan->below);
}
- returnPanel(result);
}
diff --git a/panel/p_bottom.c b/panel/p_bottom.c
index db814415375c..b861fd9b2ce7 100644
--- a/panel/p_bottom.c
+++ b/panel/p_bottom.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,7 +29,6 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
- * and: Juergen Pfeifer 1997-1999,2008 *
****************************************************************************/
/* p_bottom.c
@@ -37,17 +36,16 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_bottom.c,v 1.13 2010/01/23 21:22:16 tom Exp $")
+MODULE_ID("$Id: p_bottom.c,v 1.11 2005/02/19 16:38:16 tom Exp $")
NCURSES_EXPORT(int)
bottom_panel(PANEL * pan)
{
int err = OK;
- T((T_CALLED("bottom_panel(%p)"), (void *)pan));
+ T((T_CALLED("bottom_panel(%p)"), pan));
if (pan)
{
- GetHook(pan);
if (!Is_Bottom(pan))
{
diff --git a/panel/p_delete.c b/panel/p_delete.c
index 39b055377c16..24ee26b4ff23 100644
--- a/panel/p_delete.c
+++ b/panel/p_delete.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,7 +29,6 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
- * and: Juergen Pfeifer 1999,2008 *
****************************************************************************/
/* p_delete.c
@@ -37,22 +36,19 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_delete.c,v 1.10 2010/01/23 21:22:16 tom Exp $")
+MODULE_ID("$Id: p_delete.c,v 1.8 2005/02/19 16:38:45 tom Exp $")
NCURSES_EXPORT(int)
del_panel(PANEL * pan)
{
int err = OK;
- T((T_CALLED("del_panel(%p)"), (void *)pan));
+ T((T_CALLED("del_panel(%p)"), pan));
if (pan)
{
dBug(("--> del_panel %s", USER_PTR(pan->user)));
- {
- GetHook(pan);
- HIDE_PANEL(pan, err, OK);
- free((void *)pan);
- }
+ HIDE_PANEL(pan, err, OK);
+ free((void *)pan);
}
else
err = ERR;
diff --git a/panel/p_hidden.c b/panel/p_hidden.c
index 01b69b91d919..624c07dae0ba 100644
--- a/panel/p_hidden.c
+++ b/panel/p_hidden.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,7 +29,6 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
- * and: Juergen Pfeifer 1997-1999,2008 *
****************************************************************************/
/* p_hidden.c
@@ -37,18 +36,13 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_hidden.c,v 1.9 2010/01/23 21:22:15 tom Exp $")
+MODULE_ID("$Id: p_hidden.c,v 1.7 2005/02/19 16:39:17 tom Exp $")
NCURSES_EXPORT(int)
panel_hidden(const PANEL * pan)
{
- int rc = ERR;
-
- T((T_CALLED("panel_hidden(%p)"), (const void *)pan));
- if (pan)
- {
- GetHook(pan);
- rc = (IS_LINKED(pan) ? FALSE : TRUE);
- }
- returnCode(rc);
+ T((T_CALLED("panel_hidden(%p)"), pan));
+ if (!pan)
+ returnCode(ERR);
+ returnCode(IS_LINKED(pan) ? FALSE : TRUE);
}
diff --git a/panel/p_hide.c b/panel/p_hide.c
index 7b780d464e16..08d8853a201c 100644
--- a/panel/p_hide.c
+++ b/panel/p_hide.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,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 *
@@ -36,27 +36,23 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_hide.c,v 1.11 2010/01/23 21:22:16 tom Exp $")
+MODULE_ID("$Id: p_hide.c,v 1.9 2005/02/19 16:39:41 tom Exp $")
NCURSES_EXPORT(int)
hide_panel(register PANEL * pan)
{
- int err = ERR;
+ int err = OK;
- T((T_CALLED("hide_panel(%p)"), (void *)pan));
+ T((T_CALLED("hide_panel(%p)"), pan));
+ if (!pan)
+ returnCode(ERR);
- if (pan)
- {
- GetHook(pan);
+ dBug(("--> hide_panel %s", USER_PTR(pan->user)));
+ dStack("<u%d>", 1, pan);
- dBug(("--> hide_panel %s", USER_PTR(pan->user)));
- dStack("<u%d>", 1, pan);
+ HIDE_PANEL(pan, err, ERR);
- HIDE_PANEL(pan, err, ERR);
+ dStack("<u%d>", 9, pan);
- err = OK;
-
- dStack("<u%d>", 9, pan);
- }
returnCode(err);
}
diff --git a/panel/p_move.c b/panel/p_move.c
index adae64583220..3818e8cba860 100644
--- a/panel/p_move.c
+++ b/panel/p_move.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2008,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,7 +29,6 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
- * and: Juergen Pfeifer 1997-1999,2009 *
****************************************************************************/
/* p_move.c
@@ -37,24 +36,21 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_move.c,v 1.11 2010/01/23 21:22:15 tom Exp $")
+MODULE_ID("$Id: p_move.c,v 1.9 2005/02/19 16:46:49 tom Exp $")
NCURSES_EXPORT(int)
move_panel(PANEL * pan, int starty, int startx)
{
- int rc = ERR;
+ T((T_CALLED("move_panel(%p,%d,%d)"), pan, starty, startx));
- T((T_CALLED("move_panel(%p,%d,%d)"), (void *)pan, starty, startx));
+ if (!pan)
+ returnCode(ERR);
- if (pan)
+ if (IS_LINKED(pan))
{
- GetHook(pan);
- if (IS_LINKED(pan))
- {
- Touchpan(pan);
- PANEL_UPDATE(pan, (PANEL *) 0);
- }
- rc = mvwin(pan->win, starty, startx);
+ Touchpan(pan);
+ PANEL_UPDATE(pan, (PANEL *) 0);
}
- returnCode(rc);
+
+ returnCode(mvwin(pan->win, starty, startx));
}
diff --git a/panel/p_new.c b/panel/p_new.c
index 235336c22f51..2719316888e0 100644
--- a/panel/p_new.c
+++ b/panel/p_new.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2005,2008 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,7 +38,7 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_new.c,v 1.16 2010/01/23 21:22:16 tom Exp $")
+MODULE_ID("$Id: p_new.c,v 1.10 2008/08/04 18:25:48 tom Exp $")
#ifdef TRACE
static char *stdscr_id;
@@ -50,27 +50,20 @@ static char *new_id;
Establish the pseudo panel for stdscr if necessary.
--------------------------------------------------------------------------*/
static PANEL *
-root_panel(NCURSES_SP_DCL0)
+root_panel(void)
{
-#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(SP_PARM && SP_PARM->_stdscr && !_nc_bottom_panel && !_nc_top_panel);
+ assert(stdscr && !_nc_bottom_panel && !_nc_top_panel);
#if NO_LEAKS
- ph->destroy = del_panel;
+ _nc_panelhook()->destroy = del_panel;
#endif
- _nc_stdscr_pseudo_panel = typeMalloc(PANEL, 1);
+ _nc_stdscr_pseudo_panel = (PANEL *) malloc(sizeof(PANEL));
if (_nc_stdscr_pseudo_panel != 0)
{
PANEL *pan = _nc_stdscr_pseudo_panel;
- WINDOW *win = SP_PARM->_stdscr;
+ WINDOW *win = stdscr;
pan->win = win;
pan->below = (PANEL *) 0;
@@ -93,18 +86,16 @@ new_panel(WINDOW *win)
{
PANEL *pan = (PANEL *) 0;
- GetWindowHook(win);
-
- T((T_CALLED("new_panel(%p)"), (void *)win));
+ T((T_CALLED("new_panel(%p)"), win));
if (!win)
returnPanel(pan);
if (!_nc_stdscr_pseudo_panel)
- (void)root_panel(NCURSES_SP_ARG);
+ (void)root_panel();
assert(_nc_stdscr_pseudo_panel);
- if (!(win->_flags & _ISPAD) && (pan = typeMalloc(PANEL, 1)))
+ if (!(win->_flags & _ISPAD) && (pan = (PANEL *) malloc(sizeof(PANEL))))
{
pan->win = win;
pan->above = (PANEL *) 0;
diff --git a/panel/p_replace.c b/panel/p_replace.c
index d3733ed22e2f..5d0d295c8b17 100644
--- a/panel/p_replace.c
+++ b/panel/p_replace.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,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 *
@@ -36,25 +36,23 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_replace.c,v 1.11 2010/01/23 21:22:16 tom Exp $")
+MODULE_ID("$Id: p_replace.c,v 1.9 2005/02/19 16:41:31 tom Exp $")
NCURSES_EXPORT(int)
replace_panel(PANEL * pan, WINDOW *win)
{
- int rc = ERR;
+ T((T_CALLED("replace_panel(%p,%p)"), pan, win));
- T((T_CALLED("replace_panel(%p,%p)"), (void *)pan, (void *)win));
+ if (!pan)
+ returnCode(ERR);
- if (pan)
+ if (IS_LINKED(pan))
{
- GetHook(pan);
- if (IS_LINKED(pan))
- {
- Touchpan(pan);
- PANEL_UPDATE(pan, (PANEL *) 0);
- }
- pan->win = win;
- rc = OK;
+ Touchpan(pan);
+ PANEL_UPDATE(pan, (PANEL *) 0);
}
- returnCode(rc);
+
+ pan->win = win;
+
+ returnCode(OK);
}
diff --git a/panel/p_show.c b/panel/p_show.c
index d5b09bd94260..35eee237b958 100644
--- a/panel/p_show.c
+++ b/panel/p_show.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,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 *
@@ -36,37 +36,34 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_show.c,v 1.13 2010/01/23 21:22:16 tom Exp $")
+MODULE_ID("$Id: p_show.c,v 1.11 2005/02/19 16:42:02 tom Exp $")
NCURSES_EXPORT(int)
show_panel(PANEL * pan)
{
- int err = ERR;
+ int err = OK;
- T((T_CALLED("show_panel(%p)"), (void *)pan));
+ T((T_CALLED("show_panel(%p)"), pan));
- if (pan)
- {
- GetHook(pan);
+ if (!pan)
+ returnCode(ERR);
- if (Is_Top(pan))
- returnCode(OK);
+ if (Is_Top(pan))
+ returnCode(OK);
- dBug(("--> show_panel %s", USER_PTR(pan->user)));
+ dBug(("--> show_panel %s", USER_PTR(pan->user)));
- HIDE_PANEL(pan, err, OK);
+ HIDE_PANEL(pan, err, OK);
- dStack("<lt%d>", 1, pan);
- assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel);
+ dStack("<lt%d>", 1, pan);
+ assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel);
- _nc_top_panel->above = pan;
- pan->below = _nc_top_panel;
- pan->above = (PANEL *) 0;
- _nc_top_panel = pan;
+ _nc_top_panel->above = pan;
+ pan->below = _nc_top_panel;
+ pan->above = (PANEL *) 0;
+ _nc_top_panel = pan;
- err = OK;
+ dStack("<lt%d>", 9, pan);
- dStack("<lt%d>", 9, pan);
- }
- returnCode(err);
+ returnCode(OK);
}
diff --git a/panel/p_top.c b/panel/p_top.c
index fdcdee9afcdc..8bd1d9fb3fec 100644
--- a/panel/p_top.c
+++ b/panel/p_top.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,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 *
@@ -36,11 +36,11 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_top.c,v 1.6 2010/01/23 21:22:16 tom Exp $")
+MODULE_ID("$Id: p_top.c,v 1.5 2005/02/19 16:42:23 tom Exp $")
NCURSES_EXPORT(int)
top_panel(PANEL * pan)
{
- T((T_CALLED("top_panel(%p)"), (void *)pan));
+ T((T_CALLED("top_panel(%p)"), pan));
returnCode(show_panel(pan));
}
diff --git a/panel/p_update.c b/panel/p_update.c
index a2f45063cf5c..5967718160ff 100644
--- a/panel/p_update.c
+++ b/panel/p_update.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,7 +29,6 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
- * and: Juergen Pfeifer 1997-1999,2008 *
****************************************************************************/
/* p_update.c
@@ -37,42 +36,28 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_update.c,v 1.11 2010/01/23 21:22:16 tom Exp $")
+MODULE_ID("$Id: p_update.c,v 1.9 2005/02/19 16:49:47 tom Exp $")
NCURSES_EXPORT(void)
-NCURSES_SP_NAME(update_panels) (NCURSES_SP_DCL0)
+update_panels(void)
{
PANEL *pan;
- T((T_CALLED("update_panels(%p)"), (void *)SP_PARM));
+ T((T_CALLED("update_panels()")));
dBug(("--> update_panels"));
-
- if (SP_PARM)
+ pan = _nc_bottom_panel;
+ while (pan && pan->above)
{
- GetScreenHook(SP_PARM);
-
- pan = _nc_bottom_panel;
- while (pan && pan->above)
- {
- PANEL_UPDATE(pan, pan->above);
- pan = pan->above;
- }
+ PANEL_UPDATE(pan, pan->above);
+ pan = pan->above;
+ }
- pan = _nc_bottom_panel;
- while (pan)
- {
- Wnoutrefresh(pan);
- pan = pan->above;
- }
+ pan = _nc_bottom_panel;
+ while (pan)
+ {
+ Wnoutrefresh(pan);
+ pan = pan->above;
}
returnVoid;
}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(void)
-update_panels(void)
-{
- NCURSES_SP_NAME(update_panels) (CURRENT_SCREEN);
-}
-#endif
diff --git a/panel/p_user.c b/panel/p_user.c
index deb5bdf7e4c5..ffa25f85ae12 100644
--- a/panel/p_user.c
+++ b/panel/p_user.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,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 *
@@ -36,12 +36,12 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_user.c,v 1.8 2010/01/23 23:18:35 tom Exp $")
+MODULE_ID("$Id: p_user.c,v 1.6 2005/02/19 16:52:44 tom Exp $")
NCURSES_EXPORT(int)
set_panel_userptr(PANEL * pan, NCURSES_CONST void *uptr)
{
- T((T_CALLED("set_panel_userptr(%p,%p)"), (void *)pan, (NCURSES_CONST void *)uptr));
+ T((T_CALLED("set_panel_userptr(%p,%p)"), pan, uptr));
if (!pan)
returnCode(ERR);
pan->user = uptr;
@@ -51,6 +51,6 @@ set_panel_userptr(PANEL * pan, NCURSES_CONST void *uptr)
NCURSES_EXPORT(NCURSES_CONST void *)
panel_userptr(const PANEL * pan)
{
- T((T_CALLED("panel_userptr(%p)"), (const void *)pan));
+ T((T_CALLED("panel_userptr(%p)"), pan));
returnCVoidPtr(pan ? pan->user : (NCURSES_CONST void *)0);
}
diff --git a/panel/p_win.c b/panel/p_win.c
index 6643d5c2671f..e7d2cea8e3fe 100644
--- a/panel/p_win.c
+++ b/panel/p_win.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,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 *
@@ -36,11 +36,11 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_win.c,v 1.6 2010/01/23 21:22:15 tom Exp $")
+MODULE_ID("$Id: p_win.c,v 1.5 2005/02/19 16:44:16 tom Exp $")
NCURSES_EXPORT(WINDOW *)
panel_window(const PANEL * pan)
{
- T((T_CALLED("panel_window(%p)"), (const void *)pan));
+ T((T_CALLED("panel_window(%p)"), pan));
returnWin(pan ? pan->win : (WINDOW *)0);
}
diff --git a/panel/panel.c b/panel/panel.c
index 96cbbab77400..16a8083d64b2 100644
--- a/panel/panel.c
+++ b/panel/panel.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2004,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,14 +29,12 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
- * and: Juergen Pfeifer 1996-1999,2008 *
- * and: Thomas E. Dickey *
****************************************************************************/
/* panel.c -- implementation of panels library, some core routines */
#include "panel.priv.h"
-MODULE_ID("$Id: panel.c,v 1.25 2010/01/23 21:22:16 tom Exp $")
+MODULE_ID("$Id: panel.c,v 1.23 2005/02/19 18:04:31 tom Exp $")
/*+-------------------------------------------------------------------------
_nc_retrace_panel (pan)
@@ -45,7 +43,7 @@ MODULE_ID("$Id: panel.c,v 1.25 2010/01/23 21:22:16 tom Exp $")
NCURSES_EXPORT(PANEL *)
_nc_retrace_panel(PANEL * pan)
{
- T((T_RETURN("%p"), (void *)pan));
+ T((T_RETURN("%p"), pan));
return pan;
}
#endif
@@ -93,8 +91,6 @@ _nc_dStack(const char *fmt, int num, const PANEL * pan)
{
char s80[80];
- GetPanelHook(pan);
-
sprintf(s80, fmt, num, pan);
_tracef("%s b=%s t=%s", s80,
(_nc_bottom_panel) ? USER_PTR(_nc_bottom_panel->user) : "--",
diff --git a/panel/panel.h b/panel/panel.h
index 6ed2061d1ff8..1e02091d97f2 100644
--- a/panel/panel.h
+++ b/panel/panel.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2001,2006 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,10 +29,9 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
- * and: Juergen Pfeifer 1996-1999,2008 *
****************************************************************************/
-/* $Id: panel.h,v 1.11 2009/04/11 19:50:40 tom Exp $ */
+/* $Id: panel.h,v 1.10 2006/05/27 19:49:40 tom Exp $ */
/* panel.h -- interface file for panels library */
@@ -69,13 +68,6 @@ extern NCURSES_EXPORT(int) move_panel (PANEL *, int, int);
extern NCURSES_EXPORT(int) replace_panel (PANEL *,WINDOW *);
extern NCURSES_EXPORT(int) panel_hidden (const PANEL *);
-#if NCURSES_SP_FUNCS
-extern NCURSES_EXPORT(PANEL *) ground_panel(SCREEN *);
-extern NCURSES_EXPORT(PANEL *) ceiling_panel(SCREEN *);
-
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(update_panels) (SCREEN*);
-#endif
-
#if defined(__cplusplus)
}
#endif
diff --git a/panel/panel.priv.h b/panel/panel.priv.h
index ce4f98937fc9..4fb8144e1b77 100644
--- a/panel/panel.priv.h
+++ b/panel/panel.priv.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2005,2008 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 *
@@ -26,7 +26,7 @@
* authorization. *
****************************************************************************/
-/* $Id: panel.priv.h,v 1.23 2009/04/11 20:33:55 tom Exp $ */
+/* $Id: panel.priv.h,v 1.22 2008/09/27 22:36:11 tom Exp $ */
#ifndef NCURSES_PANEL_PRIV_H
#define NCURSES_PANEL_PRIV_H 1
@@ -39,11 +39,9 @@
#include <string.h>
#include <assert.h>
-struct screen; /* forward declaration */
-
-#include "curses.priv.h" /* includes nc_panel.h */
+#include "curses.priv.h"
#include "panel.h"
-
+#include <nc_panel.h>
#if USE_RCS_IDS
# define MODULE_ID(id) static const char Ident[] = id;
@@ -85,38 +83,14 @@ struct screen; /* forward declaration */
# define Touchline(pan,start,count) touchline((pan)->win,start,count)
#endif
-#if NCURSES_SP_FUNCS
-#define GetScreenHook(sp) \
- struct panelhook* ph = NCURSES_SP_NAME(_nc_panelhook)(sp)
-#define GetPanelHook(pan) \
- GetScreenHook(_nc_screen_of((pan)->win))
-#define GetWindowHook(win) \
- SCREEN* sp = _nc_screen_of(win); \
- GetScreenHook(sp)
-#define GetHook(pan) SCREEN* sp = _nc_screen_of(pan->win); \
- GetScreenHook(sp)
-
-#define _nc_stdscr_pseudo_panel ((ph)->stdscr_pseudo_panel)
-#define _nc_top_panel ((ph)->top_panel)
-#define _nc_bottom_panel ((ph)->bottom_panel)
-
-#else /* !NCURSES_SP_FUNCS */
-
-#define GetScreenHook(sp) /* nothing */
-#define GetPanelHook(pan) /* nothing */
-#define GetWindowHook(win) /* nothing */
-#define GetHook(pan) /* nothing */
-
#define _nc_stdscr_pseudo_panel _nc_panelhook()->stdscr_pseudo_panel
-#define _nc_top_panel _nc_panelhook()->top_panel
-#define _nc_bottom_panel _nc_panelhook()->bottom_panel
-
-#endif /* NCURSES_SP_FUNCS */
+#define _nc_top_panel _nc_panelhook()->top_panel
+#define _nc_bottom_panel _nc_panelhook()->bottom_panel
-#define EMPTY_STACK() (_nc_top_panel == _nc_bottom_panel)
-#define Is_Bottom(p) (((p) != (PANEL*)0) && !EMPTY_STACK() && (_nc_bottom_panel->above == (p)))
-#define Is_Top(p) (((p) != (PANEL*)0) && !EMPTY_STACK() && (_nc_top_panel == (p)))
-#define Is_Pseudo(p) (((p) != (PANEL*)0) && ((p) == _nc_bottom_panel))
+#define EMPTY_STACK() (_nc_top_panel==_nc_bottom_panel)
+#define Is_Bottom(p) (((p)!=(PANEL*)0) && !EMPTY_STACK() && (_nc_bottom_panel->above==(p)))
+#define Is_Top(p) (((p)!=(PANEL*)0) && !EMPTY_STACK() && (_nc_top_panel==(p)))
+#define Is_Pseudo(p) ((p) && ((p)==_nc_bottom_panel))
/*+-------------------------------------------------------------------------
IS_LINKED(pan) - check to see if panel is in the stack
@@ -148,7 +122,7 @@ struct screen; /* forward declaration */
ix2 = (PENDX(pan1) < PENDX(pan2)) ? PENDX(pan1) : PENDX(pan2);\
iy1 = (PSTARTY(pan1) < PSTARTY(pan2)) ? PSTARTY(pan2) : PSTARTY(pan1);\
iy2 = (PENDY(pan1) < PENDY(pan2)) ? PENDY(pan1) : PENDY(pan2);\
- assert((ix1<=ix2) && (iy1<=iy2))
+ assert((ix1<=ix2) && (iy1<=iy2));\
/*+-------------------------------------------------------------------------
@@ -162,12 +136,12 @@ struct screen; /* forward declaration */
{ PANEL* pan2 = ((panstart) ? (panstart) : _nc_bottom_panel);\
while(pan2) {\
if ((pan2 != pan) && PANELS_OVERLAPPED(pan,pan2)) {\
- int y, ix1, ix2, iy1, iy2;\
- COMPUTE_INTERSECTION(pan, pan2, ix1, ix2, iy1, iy2);\
+ int y,ix1,ix2,iy1,iy2;\
+ COMPUTE_INTERSECTION(pan,pan2,ix1,ix2,iy1,iy2);\
for(y = iy1; y <= iy2; y++) {\
if (is_linetouched(pan->win,y - PSTARTY(pan))) {\
struct ldat* line = &(pan2->win->_line[y - PSTARTY(pan2)]);\
- CHANGED_RANGE(line, ix1 - PSTARTX(pan2), ix2 - PSTARTX(pan2));\
+ CHANGED_RANGE(line,ix1-PSTARTX(pan2),ix2-PSTARTX(pan2));\
}\
}\
}\
@@ -206,9 +180,4 @@ struct screen; /* forward declaration */
err = err_if_unlinked;\
}
-#if NCURSES_SP_FUNCS
-/* These may become later renamed and part of panel.h and the public API */
-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_update_panels)(SCREEN*);
-#endif
-
#endif /* NCURSES_PANEL_PRIV_H */