diff options
Diffstat (limited to 'panel')
| -rw-r--r-- | panel/Makefile.in | 19 | ||||
| -rw-r--r-- | panel/p_above.c | 6 | ||||
| -rw-r--r-- | panel/p_below.c | 6 | ||||
| -rw-r--r-- | panel/panel.c | 12 | ||||
| -rw-r--r-- | panel/panel.priv.h | 12 |
5 files changed, 34 insertions, 21 deletions
diff --git a/panel/Makefile.in b/panel/Makefile.in index f0f0a49..713f99b 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.66 2014/12/20 20:28:09 tom Exp $ ############################################################################## -# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # +# Copyright (c) 1998-2013,2014 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"), # @@ -51,15 +51,23 @@ o = .@OBJEXT@ MODEL = @DFT_LWR_MODEL@ DESTDIR = @DESTDIR@ +top_srcdir = @top_srcdir@ srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ includedir = @includedir@ +datarootdir = @datarootdir@ datadir = @datadir@ +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@ @@ -85,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) @@ -103,6 +111,9 @@ LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ SHLIB_DIRS = -L../lib SHLIB_LIST = $(SHLIB_DIRS) -lncurses@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@ @@ -112,7 +123,7 @@ ABI_VERSION = @cf_cv_abi_version@ RANLIB = @LIB_PREP@ -LIBRARIES = @LIBS_TO_MAKE@ +LIBRARIES = @Libs_To_Make@ LINT = @LINT@ LINT_OPTS = @LINT_OPTS@ diff --git a/panel/p_above.c b/panel/p_above.c index 8bbf1bc..76209fe 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-2010,2012 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,13 +36,13 @@ */ #include "panel.priv.h" -MODULE_ID("$Id: p_above.c,v 1.8 2010/01/23 21:22:15 tom Exp $") +MODULE_ID("$Id: p_above.c,v 1.9 2012/03/10 23:43:41 tom Exp $") #if NCURSES_SP_FUNCS NCURSES_EXPORT(PANEL *) ground_panel(SCREEN * sp) { - T((T_CALLED("ground_panel(%p)"), sp)); + T((T_CALLED("ground_panel(%p)"), (void *)sp)); if (sp) { struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp); diff --git a/panel/p_below.c b/panel/p_below.c index f276ef9..913efa9 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-2010,2012 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,13 +36,13 @@ */ #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.9 2012/03/10 23:43:41 tom Exp $") #if NCURSES_SP_FUNCS NCURSES_EXPORT(PANEL *) ceiling_panel(SCREEN * sp) { - T((T_CALLED("ceiling_panel(%p)"), sp)); + T((T_CALLED("ceiling_panel(%p)"), (void *)sp)); if (sp) { struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp); diff --git a/panel/panel.c b/panel/panel.c index 96cbbab..97bebca 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-2010,2012 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 @@ /* 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.26 2012/02/23 10:02:15 tom Exp $") /*+------------------------------------------------------------------------- _nc_retrace_panel (pan) @@ -61,9 +61,9 @@ _nc_my_visbuf(const void *ptr) char temp[32]; if (ptr != 0) - sprintf(temp, "ptr:%p", ptr); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "ptr:%p", ptr); else - strcpy(temp, "<null>"); + _nc_STRCPY(temp, "<null>", sizeof(temp)); return _nc_visbuf(temp); } #endif @@ -95,7 +95,7 @@ _nc_dStack(const char *fmt, int num, const PANEL * pan) GetPanelHook(pan); - sprintf(s80, fmt, num, pan); + _nc_SPRINTF(s80, _nc_SLIMIT(sizeof(s80)) fmt, num, pan); _tracef("%s b=%s t=%s", s80, (_nc_bottom_panel) ? USER_PTR(_nc_bottom_panel->user) : "--", (_nc_top_panel) ? USER_PTR(_nc_top_panel->user) : "--"); @@ -143,7 +143,7 @@ _nc_Touchline(const PANEL * pan, int start, int count) { char s80[80]; - sprintf(s80, "Touchline s=%d c=%d", start, count); + _nc_SPRINTF(s80, _nc_SLIMIT(sizeof(s80)) "Touchline s=%d c=%d", start, count); dPanel(s80, pan); touchline(pan->win, start, count); } diff --git a/panel/panel.priv.h b/panel/panel.priv.h index ce4f989..1156c72 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-2012,2014 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.23 2009/04/11 20:33:55 tom Exp $ */ +/* $Id: panel.priv.h,v 1.26 2014/11/01 14:48:03 tom Exp $ */ #ifndef NCURSES_PANEL_PRIV_H #define NCURSES_PANEL_PRIV_H 1 +/* *INDENT-OFF* */ #if HAVE_CONFIG_H # include <ncurses_cfg.h> @@ -60,7 +61,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*); @@ -89,7 +90,7 @@ struct screen; /* forward declaration */ #define GetScreenHook(sp) \ struct panelhook* ph = NCURSES_SP_NAME(_nc_panelhook)(sp) #define GetPanelHook(pan) \ - GetScreenHook(_nc_screen_of((pan)->win)) + GetScreenHook(pan ? _nc_screen_of((pan)->win) : 0) #define GetWindowHook(win) \ SCREEN* sp = _nc_screen_of(win); \ GetScreenHook(sp) @@ -160,7 +161,7 @@ struct screen; /* forward declaration */ ---------------------------------------------------------------------------*/ #define PANEL_UPDATE(pan,panstart)\ { PANEL* pan2 = ((panstart) ? (panstart) : _nc_bottom_panel);\ - while(pan2) {\ + while(pan2 && pan2->win) {\ if ((pan2 != pan) && PANELS_OVERLAPPED(pan,pan2)) {\ int y, ix1, ix2, iy1, iy2;\ COMPUTE_INTERSECTION(pan, pan2, ix1, ix2, iy1, iy2);\ @@ -210,5 +211,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 */ |