aboutsummaryrefslogtreecommitdiff
path: root/contrib/ncurses/panel
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ncurses/panel')
-rw-r--r--contrib/ncurses/panel/Makefile.in13
-rw-r--r--contrib/ncurses/panel/p_above.c8
-rw-r--r--contrib/ncurses/panel/p_below.c8
-rw-r--r--contrib/ncurses/panel/p_bottom.c10
-rw-r--r--contrib/ncurses/panel/p_delete.c10
-rw-r--r--contrib/ncurses/panel/p_hidden.c8
-rw-r--r--contrib/ncurses/panel/p_hide.c10
-rw-r--r--contrib/ncurses/panel/p_move.c14
-rw-r--r--contrib/ncurses/panel/p_new.c8
-rw-r--r--contrib/ncurses/panel/p_replace.c14
-rw-r--r--contrib/ncurses/panel/p_show.c10
-rw-r--r--contrib/ncurses/panel/p_top.c8
-rw-r--r--contrib/ncurses/panel/p_update.c10
-rw-r--r--contrib/ncurses/panel/p_user.c13
-rw-r--r--contrib/ncurses/panel/p_win.c8
-rw-r--r--contrib/ncurses/panel/panel.c32
-rw-r--r--contrib/ncurses/panel/panel.h38
-rw-r--r--contrib/ncurses/panel/panel.priv.h32
18 files changed, 133 insertions, 121 deletions
diff --git a/contrib/ncurses/panel/Makefile.in b/contrib/ncurses/panel/Makefile.in
index 9b8092d22ac9..6780007e31bd 100644
--- a/contrib/ncurses/panel/Makefile.in
+++ b/contrib/ncurses/panel/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.34 2000/08/26 21:51:28 tom Exp $
+# $Id: Makefile.in,v 1.36 2001/03/24 19:53:31 tom Exp $
##############################################################################
-# Copyright (c) 1998-2000 Free Software Foundation, Inc. #
+# Copyright (c) 1998,1999,2000,2001 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"), #
@@ -54,6 +54,8 @@ libdir = @libdir@
includedir = @includedir@
datadir = @datadir@
+LIBTOOL = @LIBTOOL@
+
INSTALL = @INSTALL@
INSTALL_LIB = @INSTALL@ @INSTALL_LIB@
INSTALL_DATA = @INSTALL_DATA@
@@ -73,6 +75,7 @@ CPPFLAGS = @CPPFLAGS@ \
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
+CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
CFLAGS_PROFILE = $(CCFLAGS) -pg
@@ -80,7 +83,7 @@ CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@
CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
-LINK = $(CC)
+LINK = $(LIBTOOL) $(CC)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib -L$(libdir)
@@ -88,6 +91,8 @@ SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
MK_SHARED_LIB = @MK_SHARED_LIB@
+NCURSES_MAJOR = @NCURSES_MAJOR@
+NCURSES_MINOR = @NCURSES_MINOR@
REL_VERSION = @cf_cv_rel_version@
ABI_VERSION = @cf_cv_abi_version@
@@ -129,7 +134,7 @@ tags:
@MAKE_UPPER_TAGS@ etags *.[ch]
mostlyclean ::
- -rm -f core tags TAGS *~ *.ln *.atac trace
+ -rm -f core tags TAGS *~ *.i *.ln *.atac trace
clean :: mostlyclean
-rm -f $(AUTO_SRC)
diff --git a/contrib/ncurses/panel/p_above.c b/contrib/ncurses/panel/p_above.c
index fa32196db42b..36e67d2b43df 100644
--- a/contrib/ncurses/panel/p_above.c
+++ b/contrib/ncurses/panel/p_above.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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 *
@@ -35,10 +35,10 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_above.c,v 1.3 1999/09/18 11:03:28 juergen Exp $")
+MODULE_ID("$Id: p_above.c,v 1.4 2000/12/10 02:20:44 tom Exp $")
-PANEL*
-panel_above(const PANEL *pan)
+NCURSES_EXPORT(PANEL *)
+panel_above (const PANEL *pan)
{
if(!pan)
{
diff --git a/contrib/ncurses/panel/p_below.c b/contrib/ncurses/panel/p_below.c
index a7eb4705789e..5420ff9eeb66 100644
--- a/contrib/ncurses/panel/p_below.c
+++ b/contrib/ncurses/panel/p_below.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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 *
@@ -35,10 +35,10 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_below.c,v 1.3 1999/09/18 11:03:33 juergen Exp $")
+MODULE_ID("$Id: p_below.c,v 1.4 2000/12/10 02:20:44 tom Exp $")
-PANEL*
-panel_below(const PANEL *pan)
+NCURSES_EXPORT(PANEL*)
+panel_below (const PANEL *pan)
{
if(!pan)
{
diff --git a/contrib/ncurses/panel/p_bottom.c b/contrib/ncurses/panel/p_bottom.c
index f671864231db..0928e77eb828 100644
--- a/contrib/ncurses/panel/p_bottom.c
+++ b/contrib/ncurses/panel/p_bottom.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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,10 +36,10 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_bottom.c,v 1.7 1999/11/25 13:49:26 juergen Exp $")
+MODULE_ID("$Id: p_bottom.c,v 1.9 2001/02/24 23:46:33 tom Exp $")
-int
-bottom_panel(PANEL *pan)
+NCURSES_EXPORT(int)
+bottom_panel (PANEL *pan)
{
int err = OK;
@@ -49,7 +49,7 @@ bottom_panel(PANEL *pan)
dBug(("--> bottom_panel %s", USER_PTR(pan->user)));
- HIDE_PANEL(pan,err,FALSE);
+ HIDE_PANEL(pan,err,OK);
assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel);
dStack("<lb%d>",1,pan);
diff --git a/contrib/ncurses/panel/p_delete.c b/contrib/ncurses/panel/p_delete.c
index 3f975d3b3e89..1d4670effc06 100644
--- a/contrib/ncurses/panel/p_delete.c
+++ b/contrib/ncurses/panel/p_delete.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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,16 +36,16 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_delete.c,v 1.4 1999/11/25 13:49:26 juergen Exp $")
+MODULE_ID("$Id: p_delete.c,v 1.6 2001/02/24 23:46:41 tom Exp $")
-int
-del_panel(PANEL *pan)
+NCURSES_EXPORT(int)
+del_panel (PANEL *pan)
{
int err = OK;
if(pan)
{
dBug(("--> del_panel %s", USER_PTR(pan->user)));
- HIDE_PANEL(pan,err,FALSE);
+ HIDE_PANEL(pan,err,OK);
free((void *)pan);
}
else
diff --git a/contrib/ncurses/panel/p_hidden.c b/contrib/ncurses/panel/p_hidden.c
index 7a13ec4335df..d5d13f37a5ef 100644
--- a/contrib/ncurses/panel/p_hidden.c
+++ b/contrib/ncurses/panel/p_hidden.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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,10 +36,10 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_hidden.c,v 1.4 1999/11/22 18:02:41 juergen Exp $")
+MODULE_ID("$Id: p_hidden.c,v 1.5 2000/12/10 02:20:44 tom Exp $")
-int
-panel_hidden(const PANEL *pan)
+NCURSES_EXPORT(int)
+panel_hidden (const PANEL *pan)
{
if(!pan)
return(ERR);
diff --git a/contrib/ncurses/panel/p_hide.c b/contrib/ncurses/panel/p_hide.c
index ecc9eed2226f..755997374136 100644
--- a/contrib/ncurses/panel/p_hide.c
+++ b/contrib/ncurses/panel/p_hide.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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,10 +36,10 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_hide.c,v 1.5 1999/11/25 13:49:26 juergen Exp $")
+MODULE_ID("$Id: p_hide.c,v 1.7 2001/02/24 23:46:45 tom Exp $")
-int
-hide_panel(register PANEL *pan)
+NCURSES_EXPORT(int)
+hide_panel (register PANEL *pan)
{
int err = OK;
@@ -49,7 +49,7 @@ hide_panel(register PANEL *pan)
dBug(("--> hide_panel %s", USER_PTR(pan->user)));
dStack("<u%d>",1,pan);
- HIDE_PANEL(pan,err,TRUE);
+ HIDE_PANEL(pan,err,ERR);
dStack("<u%d>",9,pan);
diff --git a/contrib/ncurses/panel/p_move.c b/contrib/ncurses/panel/p_move.c
index d34b4fb84e56..d7dbd2eafc3f 100644
--- a/contrib/ncurses/panel/p_move.c
+++ b/contrib/ncurses/panel/p_move.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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,16 +36,18 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_move.c,v 1.5 1999/11/25 13:49:26 juergen Exp $")
+MODULE_ID("$Id: p_move.c,v 1.7 2001/02/24 23:41:35 tom Exp $")
-int
-move_panel(PANEL *pan, int starty, int startx)
+NCURSES_EXPORT(int)
+move_panel (PANEL *pan, int starty, int startx)
{
if(!pan)
return(ERR);
- if (IS_LINKED(pan))
- PANEL_UPDATE(pan,(PANEL*)0, TRUE);
+ if (IS_LINKED(pan)) {
+ Touchpan(pan);
+ PANEL_UPDATE(pan,(PANEL*)0);
+ }
if (mvwin(pan->win,starty,startx))
return(ERR);
diff --git a/contrib/ncurses/panel/p_new.c b/contrib/ncurses/panel/p_new.c
index 43542fea2154..3dfd80691704 100644
--- a/contrib/ncurses/panel/p_new.c
+++ b/contrib/ncurses/panel/p_new.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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,7 +36,7 @@
*/
#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.6 2000/12/10 02:20:44 tom Exp $")
#ifdef TRACE
static char* stdscr_id;
@@ -74,8 +74,8 @@ root_panel(void)
return _nc_stdscr_pseudo_panel;
}
-PANEL *
-new_panel(WINDOW *win)
+NCURSES_EXPORT(PANEL *)
+new_panel (WINDOW *win)
{
PANEL *pan = (PANEL*)0;
diff --git a/contrib/ncurses/panel/p_replace.c b/contrib/ncurses/panel/p_replace.c
index b7d51746610f..a3b88cbfa88e 100644
--- a/contrib/ncurses/panel/p_replace.c
+++ b/contrib/ncurses/panel/p_replace.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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,16 +36,18 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_replace.c,v 1.5 1999/11/25 13:49:26 juergen Exp $")
+MODULE_ID("$Id: p_replace.c,v 1.7 2001/02/24 23:41:38 tom Exp $")
-int
-replace_panel(PANEL *pan, WINDOW *win)
+NCURSES_EXPORT(int)
+replace_panel (PANEL *pan, WINDOW *win)
{
if(!pan)
return(ERR);
- if (IS_LINKED(pan))
- PANEL_UPDATE(pan,(PANEL*)0, TRUE);
+ if (IS_LINKED(pan)) {
+ Touchpan(pan);
+ PANEL_UPDATE(pan,(PANEL*)0);
+ }
pan->win = win;
diff --git a/contrib/ncurses/panel/p_show.c b/contrib/ncurses/panel/p_show.c
index 4fc7b1dbcba1..0e1968fdea58 100644
--- a/contrib/ncurses/panel/p_show.c
+++ b/contrib/ncurses/panel/p_show.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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,10 +36,10 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_show.c,v 1.7 1999/11/25 13:49:26 juergen Exp $")
+MODULE_ID("$Id: p_show.c,v 1.9 2001/02/24 23:46:50 tom Exp $")
-int
-show_panel(PANEL *pan)
+NCURSES_EXPORT(int)
+show_panel (PANEL *pan)
{
int err = OK;
@@ -51,7 +51,7 @@ show_panel(PANEL *pan)
dBug(("--> show_panel %s", USER_PTR(pan->user)));
- HIDE_PANEL(pan,err,FALSE);
+ HIDE_PANEL(pan,err,OK);
dStack("<lt%d>",1,pan);
assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel);
diff --git a/contrib/ncurses/panel/p_top.c b/contrib/ncurses/panel/p_top.c
index 2ce5bb3e6695..aa7d9d420e5e 100644
--- a/contrib/ncurses/panel/p_top.c
+++ b/contrib/ncurses/panel/p_top.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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,10 +36,10 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_top.c,v 1.2 1998/02/11 12:14:01 tom Exp $")
+MODULE_ID("$Id: p_top.c,v 1.3 2000/12/10 02:20:44 tom Exp $")
-int
-top_panel(PANEL *pan)
+NCURSES_EXPORT(int)
+top_panel (PANEL *pan)
{
return(show_panel(pan));
}
diff --git a/contrib/ncurses/panel/p_update.c b/contrib/ncurses/panel/p_update.c
index 983d0b607288..1a03739d14af 100644
--- a/contrib/ncurses/panel/p_update.c
+++ b/contrib/ncurses/panel/p_update.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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,10 +36,10 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_update.c,v 1.5 1999/11/25 13:49:26 juergen Exp $")
+MODULE_ID("$Id: p_update.c,v 1.7 2001/02/24 23:41:42 tom Exp $")
-void
-update_panels(void)
+NCURSES_EXPORT(void)
+update_panels (void)
{
PANEL *pan;
@@ -47,7 +47,7 @@ update_panels(void)
pan = _nc_bottom_panel;
while(pan && pan->above)
{
- PANEL_UPDATE(pan,pan->above, FALSE);
+ PANEL_UPDATE(pan,pan->above);
pan = pan->above;
}
diff --git a/contrib/ncurses/panel/p_user.c b/contrib/ncurses/panel/p_user.c
index 28b6526bb41c..de1ec7dd84c2 100644
--- a/contrib/ncurses/panel/p_user.c
+++ b/contrib/ncurses/panel/p_user.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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,10 +36,11 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_user.c,v 1.3 1998/02/11 12:14:01 tom Exp $")
+MODULE_ID("$Id: p_user.c,v 1.4 2000/12/10 02:20:44 tom Exp $")
-int
-set_panel_userptr(PANEL *pan, NCURSES_CONST void *uptr)
+NCURSES_EXPORT(int)
+set_panel_userptr
+(PANEL *pan, NCURSES_CONST void *uptr)
{
if(!pan)
return(ERR);
@@ -47,8 +48,8 @@ set_panel_userptr(PANEL *pan, NCURSES_CONST void *uptr)
return(OK);
}
-NCURSES_CONST void*
-panel_userptr(const PANEL *pan)
+NCURSES_EXPORT(NCURSES_CONST void*)
+panel_userptr (const PANEL *pan)
{
return(pan ? pan->user : (NCURSES_CONST void *)0);
}
diff --git a/contrib/ncurses/panel/p_win.c b/contrib/ncurses/panel/p_win.c
index 9c5a313de36f..2b9f5b0c8297 100644
--- a/contrib/ncurses/panel/p_win.c
+++ b/contrib/ncurses/panel/p_win.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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,10 +36,10 @@
*/
#include "panel.priv.h"
-MODULE_ID("$Id: p_win.c,v 1.2 1998/02/11 12:14:01 tom Exp $")
+MODULE_ID("$Id: p_win.c,v 1.3 2000/12/10 02:20:43 tom Exp $")
-WINDOW*
-panel_window(const PANEL *pan)
+NCURSES_EXPORT(WINDOW *)
+panel_window (const PANEL *pan)
{
return(pan ? pan->win : (WINDOW *)0);
}
diff --git a/contrib/ncurses/panel/panel.c b/contrib/ncurses/panel/panel.c
index 1b79b77f147e..a56d57ef5ea8 100644
--- a/contrib/ncurses/panel/panel.c
+++ b/contrib/ncurses/panel/panel.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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 *
@@ -34,11 +34,12 @@
/* panel.c -- implementation of panels library, some core routines */
#include "panel.priv.h"
-MODULE_ID("$Id: panel.c,v 1.18 1999/09/29 15:22:32 juergen Exp $")
+MODULE_ID("$Id: panel.c,v 1.20 2001/02/24 23:17:26 tom Exp $")
#ifdef TRACE
#ifndef TRACE_TXT
-const char *_nc_my_visbuf(const void *ptr)
+NCURSES_EXPORT(const char *)
+_nc_my_visbuf (const void *ptr)
{
char temp[32];
if (ptr != 0)
@@ -55,8 +56,9 @@ const char *_nc_my_visbuf(const void *ptr)
dPanel(text,pan)
--------------------------------------------------------------------------*/
#ifdef TRACE
-void
-_nc_dPanel(const char *text, const PANEL *pan)
+NCURSES_EXPORT(void)
+_nc_dPanel
+(const char *text, const PANEL *pan)
{
_tracef("%s id=%s b=%s a=%s y=%d x=%d",
text, USER_PTR(pan->user),
@@ -70,8 +72,9 @@ _nc_dPanel(const char *text, const PANEL *pan)
dStack(fmt,num,pan)
--------------------------------------------------------------------------*/
#ifdef TRACE
-void
-_nc_dStack(const char *fmt, int num, const PANEL *pan)
+NCURSES_EXPORT(void)
+_nc_dStack
+(const char *fmt, int num, const PANEL *pan)
{
char s80[80];
@@ -94,8 +97,8 @@ _nc_dStack(const char *fmt, int num, const PANEL *pan)
Wnoutrefresh(pan) - debugging hook for wnoutrefresh
--------------------------------------------------------------------------*/
#ifdef TRACE
-void
-_nc_Wnoutrefresh(const PANEL *pan)
+NCURSES_EXPORT(void)
+_nc_Wnoutrefresh (const PANEL *pan)
{
dPanel("wnoutrefresh",pan);
wnoutrefresh(pan->win);
@@ -106,8 +109,8 @@ _nc_Wnoutrefresh(const PANEL *pan)
Touchpan(pan)
--------------------------------------------------------------------------*/
#ifdef TRACE
-void
-_nc_Touchpan(const PANEL *pan)
+NCURSES_EXPORT(void)
+_nc_Touchpan (const PANEL *pan)
{
dPanel("Touchpan",pan);
touchwin(pan->win);
@@ -118,8 +121,9 @@ _nc_Touchpan(const PANEL *pan)
Touchline(pan,start,count)
--------------------------------------------------------------------------*/
#ifdef TRACE
-void
-_nc_Touchline(const PANEL *pan, int start, int count)
+NCURSES_EXPORT(void)
+_nc_Touchline
+(const PANEL *pan, int start, int count)
{
char s80[80];
sprintf(s80,"Touchline s=%d c=%d",start,count);
@@ -131,6 +135,6 @@ _nc_Touchline(const PANEL *pan, int start, int count)
#ifndef TRACE
# ifndef __GNUC__
/* Some C compilers need something defined in a source file */
- static char GCC_UNUSED dummy;
+ void _nc_dummy_panel(void) { }
# endif
#endif
diff --git a/contrib/ncurses/panel/panel.h b/contrib/ncurses/panel/panel.h
index dc33071ba175..3b8542a7adce 100644
--- a/contrib/ncurses/panel/panel.h
+++ b/contrib/ncurses/panel/panel.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,2000 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 *
@@ -33,8 +33,8 @@
/* panel.h -- interface file for panels library */
-#ifndef _PANEL_H
-#define _PANEL_H
+#ifndef NCURSES_PANEL_H_incl
+#define NCURSES_PANEL_H_incl 1
#include <curses.h>
@@ -50,26 +50,26 @@ typedef struct panel
extern "C" {
#endif
-extern WINDOW* panel_window(const PANEL *);
-extern void update_panels(void);
-extern int hide_panel(PANEL *);
-extern int show_panel(PANEL *);
-extern int del_panel(PANEL *);
-extern int top_panel(PANEL *);
-extern int bottom_panel(PANEL *);
-extern PANEL* new_panel(WINDOW *);
-extern PANEL* panel_above(const PANEL *);
-extern PANEL* panel_below(const PANEL *);
-extern int set_panel_userptr(PANEL *, NCURSES_CONST void *);
-extern NCURSES_CONST void* panel_userptr(const PANEL *);
-extern int move_panel(PANEL *, int, int);
-extern int replace_panel(PANEL *,WINDOW *);
-extern int panel_hidden(const PANEL *);
+extern NCURSES_EXPORT(WINDOW*) panel_window (const PANEL *);
+extern NCURSES_EXPORT(void) update_panels (void);
+extern NCURSES_EXPORT(int) hide_panel (PANEL *);
+extern NCURSES_EXPORT(int) show_panel (PANEL *);
+extern NCURSES_EXPORT(int) del_panel (PANEL *);
+extern NCURSES_EXPORT(int) top_panel (PANEL *);
+extern NCURSES_EXPORT(int) bottom_panel (PANEL *);
+extern NCURSES_EXPORT(PANEL*) new_panel (WINDOW *);
+extern NCURSES_EXPORT(PANEL*) panel_above (const PANEL *);
+extern NCURSES_EXPORT(PANEL*) panel_below (const PANEL *);
+extern NCURSES_EXPORT(int) set_panel_userptr (PANEL *, NCURSES_CONST void *);
+extern NCURSES_EXPORT(NCURSES_CONST void*) panel_userptr (const PANEL *);
+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 defined(__cplusplus)
}
#endif
-#endif /* _PANEL_H */
+#endif /* NCURSES_PANEL_H_incl */
/* end of panel.h */
diff --git a/contrib/ncurses/panel/panel.priv.h b/contrib/ncurses/panel/panel.priv.h
index f5a4798f0e0f..d029b1212c83 100644
--- a/contrib/ncurses/panel/panel.priv.h
+++ b/contrib/ncurses/panel/panel.priv.h
@@ -26,10 +26,10 @@
* authorization. *
****************************************************************************/
-/* $Id: panel.priv.h,v 1.14 2000/09/02 18:22:23 tom Exp $ */
+/* $Id: panel.priv.h,v 1.18 2001/03/24 21:38:45 tom Exp $ */
-#ifndef _PANEL_PRIV_H
-#define _PANEL_PRIV_H
+#ifndef NCURSES_PANEL_PRIV_H
+#define NCURSES_PANEL_PRIV_H 1
#if HAVE_CONFIG_H
# include <ncurses_cfg.h>
@@ -47,8 +47,8 @@
# include <dbmalloc.h> /* Conor Cahill's library */
#endif
-#include <nc_panel.h>
#include "panel.h"
+#include <nc_panel.h>
#if ( CC_HAS_INLINE_FUNCS && !defined(TRACE) )
# define INLINE inline
@@ -64,18 +64,18 @@
#ifdef TRACE
- extern const char *_nc_my_visbuf(const void *);
+ extern NCURSES_EXPORT(const char *) _nc_my_visbuf (const void *);
# ifdef TRACE_TXT
# define USER_PTR(ptr) _nc_visbuf((const char *)ptr)
# else
# define USER_PTR(ptr) _nc_my_visbuf((const char *)ptr)
# endif
- extern void _nc_dPanel(const char*, const PANEL*);
- extern void _nc_dStack(const char*, int, const PANEL*);
- extern void _nc_Wnoutrefresh(const PANEL*);
- extern void _nc_Touchpan(const PANEL*);
- extern void _nc_Touchline(const PANEL*, int, int);
+ extern NCURSES_EXPORT(void) _nc_dPanel (const char*, const PANEL*);
+ extern NCURSES_EXPORT(void) _nc_dStack (const char*, int, const PANEL*);
+ extern NCURSES_EXPORT(void) _nc_Wnoutrefresh (const PANEL*);
+ extern NCURSES_EXPORT(void) _nc_Touchpan (const PANEL*);
+ extern NCURSES_EXPORT(void) _nc_Touchline (const PANEL*, int, int);
# define dBug(x) _tracef x
# define dPanel(text,pan) _nc_dPanel(text,pan)
@@ -150,10 +150,8 @@
If the "touch" flag is set, the panel gets touched before it is
updated.
---------------------------------------------------------------------------*/
-#define PANEL_UPDATE(pan,panstart,touch)\
+#define PANEL_UPDATE(pan,panstart)\
{ PANEL* pan2 = ((panstart) ? (panstart) : _nc_bottom_panel);\
- if (touch)\
- Touchpan(pan);\
while(pan2) {\
if ((pan2 != pan) && PANELS_OVERLAPPED(pan,pan2)) {\
int y,ix1,ix2,iy1,iy2;\
@@ -192,12 +190,12 @@
#define HIDE_PANEL(pan,err,err_if_unlinked)\
if (IS_LINKED(pan)) {\
- PANEL_UPDATE(pan,(PANEL*)0,TRUE);\
+ Touchpan(pan);\
+ PANEL_UPDATE(pan,(PANEL*)0);\
PANEL_UNLINK(pan,err);\
} \
else {\
- if (err_if_unlinked)\
- err = ERR;\
+ err = err_if_unlinked;\
}
-#endif /* _PANEL_PRIV_H */
+#endif /* NCURSES_PANEL_PRIV_H */