aboutsummaryrefslogtreecommitdiff
path: root/panel
diff options
context:
space:
mode:
Diffstat (limited to 'panel')
-rw-r--r--panel/Makefile.in19
-rw-r--r--panel/llib-lpanel10
-rw-r--r--panel/llib-lpanelt10
-rw-r--r--panel/llib-lpaneltw10
-rw-r--r--panel/llib-lpanelw10
-rw-r--r--panel/panel.h9
-rw-r--r--panel/panel.priv.h17
7 files changed, 46 insertions, 39 deletions
diff --git a/panel/Makefile.in b/panel/Makefile.in
index baa080b3c7b0..953e55243f47 100644
--- a/panel/Makefile.in
+++ b/panel/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.62 2013/08/04 20:23:32 tom Exp $
+# $Id: Makefile.in,v 1.70 2018/01/15 19:28:45 tom Exp $
##############################################################################
-# Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2015,2018 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"), #
@@ -42,7 +42,7 @@
# turn off _all_ suffix rules; we'll generate our own
.SUFFIXES:
-SHELL = /bin/sh
+SHELL = @SHELL@
VPATH = @srcdir@
THIS = Makefile
@@ -51,6 +51,7 @@ o = .@OBJEXT@
MODEL = @DFT_LWR_MODEL@
DESTDIR = @DESTDIR@
+top_srcdir = @top_srcdir@
srcdir = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -63,7 +64,10 @@ includesubdir = @includesubdir@
INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir)
+PACKAGE = @PACKAGE@
+
LIBTOOL = @LIBTOOL@
+LIBTOOL_OPTS = @LIBTOOL_OPTS@ @EXPORT_SYMS@
LIBTOOL_CLEAN = @LIB_CLEAN@
LIBTOOL_COMPILE = @LIB_COMPILE@
LIBTOOL_LINK = @LIB_LINK@
@@ -73,7 +77,7 @@ LT_UNDEF = @LT_UNDEF@
INSTALL = @INSTALL@
INSTALL_LIB = @INSTALL@ @INSTALL_LIB@
-INSTALL_PROG = @INSTALL_PROGRAM@
+INSTALL_PROG = @INSTALL_PROGRAM@ @INSTALL_OPT_S@
INSTALL_DATA = @INSTALL_DATA@
AR = @AR@
@@ -89,7 +93,7 @@ CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@
-CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H @CPPFLAGS@
+CPPFLAGS = -I${top_srcdir}/ncurses -DHAVE_CONFIG_H @CPPFLAGS@
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
@@ -105,9 +109,11 @@ LINK = $(LIBTOOL_LINK)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
RPATH_LIST = @RPATH_LIST@
+RESULTING_SYMS = @RESULTING_SYMS@
+VERSIONED_SYMS = @VERSIONED_SYMS@
MK_SHARED_LIB = @MK_SHARED_LIB@
NCURSES_MAJOR = @NCURSES_MAJOR@
@@ -158,6 +164,7 @@ mostlyclean ::
clean :: mostlyclean
-rm -f $(AUTO_SRC)
+ -rm -rf .libs *.dSYM
distclean :: clean
-rm -f Makefile
diff --git a/panel/llib-lpanel b/panel/llib-lpanel
index 85371ec73e06..02e105468ebb 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-2010,2015 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,7 +27,7 @@
****************************************************************************/
/****************************************************************************
- * Author: Thomas E. Dickey 1997,2005,2010 *
+ * Author: Thomas E. Dickey 1996-on *
****************************************************************************/
/* LINTLIBRARY */
@@ -181,13 +181,13 @@ void update_panels(void)
#undef set_panel_userptr
int set_panel_userptr(
PANEL *pan,
- void *uptr)
+ const void *uptr)
{ return(*(int *)0); }
#undef panel_userptr
-void *panel_userptr(
+const void *panel_userptr(
const PANEL *pan)
- { return(*(void **)0); }
+ { return(*(const void **)0); }
/* ./p_win.c */
diff --git a/panel/llib-lpanelt b/panel/llib-lpanelt
index 8fcd42c9b6de..2877dbafd0c1 100644
--- a/panel/llib-lpanelt
+++ b/panel/llib-lpanelt
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2010 Free Software Foundation, Inc. *
+ * Copyright (c) 2010,2015 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,7 +27,7 @@
****************************************************************************/
/****************************************************************************
- * Author: Thomas E. Dickey 2010 *
+ * Author: Thomas E. Dickey 2010-on *
****************************************************************************/
/* LINTLIBRARY */
@@ -181,13 +181,13 @@ void update_panels(void)
#undef set_panel_userptr
int set_panel_userptr(
PANEL *pan,
- void *uptr)
+ const void *uptr)
{ return(*(int *)0); }
#undef panel_userptr
-void *panel_userptr(
+const void *panel_userptr(
const PANEL *pan)
- { return(*(void **)0); }
+ { return(*(const void **)0); }
/* ./p_win.c */
diff --git a/panel/llib-lpaneltw b/panel/llib-lpaneltw
index 1d3cd8d84c8f..2877dbafd0c1 100644
--- a/panel/llib-lpaneltw
+++ b/panel/llib-lpaneltw
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 2010 Free Software Foundation, Inc. *
+ * Copyright (c) 2010,2015 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,7 +27,7 @@
****************************************************************************/
/****************************************************************************
- * Author: Thomas E. Dickey 2010 *
+ * Author: Thomas E. Dickey 2010-on *
****************************************************************************/
/* LINTLIBRARY */
@@ -181,13 +181,13 @@ void update_panels(void)
#undef set_panel_userptr
int set_panel_userptr(
PANEL *pan,
- void *uptr)
+ const void *uptr)
{ return(*(int *)0); }
#undef panel_userptr
-void *panel_userptr(
+const void *panel_userptr(
const PANEL *pan)
- { return(*(void **)0); }
+ { return(*(const void **)0); }
/* ./p_win.c */
diff --git a/panel/llib-lpanelw b/panel/llib-lpanelw
index 503b34345ba8..4d6688e5e13e 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-2010,2015 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,7 +27,7 @@
****************************************************************************/
/****************************************************************************
- * Author: Thomas E. Dickey 2002-2005,2010 *
+ * Author: Thomas E. Dickey 2002-on *
****************************************************************************/
/* LINTLIBRARY */
@@ -181,13 +181,13 @@ void update_panels(void)
#undef set_panel_userptr
int set_panel_userptr(
PANEL *pan,
- void *uptr)
+ const void *uptr)
{ return(*(int *)0); }
#undef panel_userptr
-void *panel_userptr(
+const void *panel_userptr(
const PANEL *pan)
- { return(*(void **)0); }
+ { return(*(const void **)0); }
/* ./p_win.c */
diff --git a/panel/panel.h b/panel/panel.h
index 6ed2061d1ff8..7135e7e5fbd1 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-2009,2017 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 *
@@ -32,7 +32,7 @@
* 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.12 2017/02/11 16:50:28 tom Exp $ */
/* panel.h -- interface file for panels library */
@@ -42,12 +42,15 @@
#include <curses.h>
typedef struct panel
+#if !NCURSES_OPAQUE_PANEL
{
WINDOW *win;
struct panel *below;
struct panel *above;
NCURSES_CONST void *user;
-} PANEL;
+}
+#endif /* !NCURSES_OPAQUE_PANEL */
+PANEL;
#if defined(__cplusplus)
extern "C" {
diff --git a/panel/panel.priv.h b/panel/panel.priv.h
index 76607fb2c0ca..7934018ff6b2 100644
--- a/panel/panel.priv.h
+++ b/panel/panel.priv.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2014,2017 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,10 +26,11 @@
* authorization. *
****************************************************************************/
-/* $Id: panel.priv.h,v 1.25 2012/12/15 23:57:43 tom Exp $ */
+/* $Id: panel.priv.h,v 1.27 2017/02/11 16:50:43 tom Exp $ */
#ifndef NCURSES_PANEL_PRIV_H
#define NCURSES_PANEL_PRIV_H 1
+/* *INDENT-OFF* */
#if HAVE_CONFIG_H
# include <ncurses_cfg.h>
@@ -42,15 +43,10 @@
struct screen; /* forward declaration */
#include "curses.priv.h" /* includes nc_panel.h */
-#include "panel.h"
-
-#if USE_RCS_IDS
-# define MODULE_ID(id) static const char Ident[] = id;
-#else
-# define MODULE_ID(id) /*nothing*/
-#endif
+#define NCURSES_OPAQUE_PANEL 0
+#include "panel.h"
#ifdef TRACE
extern NCURSES_EXPORT(const char *) _nc_my_visbuf (const void *);
@@ -60,7 +56,7 @@ struct screen; /* forward declaration */
# define USER_PTR(ptr) _nc_my_visbuf((const char *)ptr)
# endif
-# define returnPanel(code) TRACE_RETURN(code,panel)
+# define returnPanel(code) TRACE_RETURN1(code,panel)
extern NCURSES_EXPORT(PANEL *) _nc_retrace_panel (PANEL *);
extern NCURSES_EXPORT(void) _nc_dPanel (const char*, const PANEL*);
@@ -210,5 +206,6 @@ struct screen; /* forward declaration */
/* 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
+/* *INDENT-ON* */
#endif /* NCURSES_PANEL_PRIV_H */