ncurses 6.2 - patch 20200718

+ reduce redefinition-warnings for KEY_EVENT when building with Visual
  Studio C++.
+ define NCURSES_STATIC when compiling programs to link with static
  libraries, to work with MinGW vs Visual Studio C++.
> additional changes for building with Visual Studio C++ and msys2
  (reports/patches by "Maarten Anonymous")
+ modify c++/Makefile.in to set the current directory while compiling
  the main program, so the linker can find related objects.
+ several changes to allow the c++/demo program to compile/link.
+ change an ifdef in test-directory, to use VC++ wide-character funcs.

diff --git a/NEWS b/NEWS
index 13eb7aa44ff60261500d3793bcb059dbf95c2705..00eacd1112844099d91eeb806c63cbd3f0d8d1ce 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.3519 2020/07/11 23:21:07 tom Exp $
+-- $Id: NEWS,v 1.3523 2020/07/18 22:43:57 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -46,6 +46,18 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20200718
+       + reduce redefinition-warnings for KEY_EVENT when building with Visual
+         Studio C++.
+       + define NCURSES_STATIC when compiling programs to link with static
+         libraries, to work with MinGW vs Visual Studio C++.
+       > additional changes for building with Visual Studio C++ and msys2
+         (reports/patches by "Maarten Anonymous")
+       + modify c++/Makefile.in to set the current directory while compiling
+         the main program, so the linker can find related objects.
+       + several changes to allow the c++/demo program to compile/link.
+       + change an ifdef in test-directory, to use VC++ wide-character funcs.
+

 20200711
        + fix pound-sign mapping in acsc of linux2.6 entry (report by Ingo
          Bruckl).
 20200711
        + fix pound-sign mapping in acsc of linux2.6 entry (report by Ingo
          Bruckl).

diff --git a/VERSION b/VERSION
index ad06e270e888dd74a406e27f8e3c4c21221c4333..ecfc27e3fddb3ea3fd304ecdbb1d8b10f49b023b 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.2     20200711
+5:0:10 6.2     20200718

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 5d864238d9289b6b940bc539617ac6246f522f2c..15926a2c6400c3787d92774146bc7e3d29a3d578 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.123 2020/05/24 01:40:20 anonymous.maarten Exp $
+# $Id: Makefile.in,v 1.125 2020/07/18 20:33:27 tom Exp $

 ##############################################################################
 # Copyright 2018,2020 Thomas E. Dickey                                       #
 # Copyright 1998-2015,2016 Free Software Foundation, Inc.                    #
 ##############################################################################
 # Copyright 2018,2020 Thomas E. Dickey                                       #
 # Copyright 1998-2015,2016 Free Software Foundation, Inc.                    #


@@ -97,10 +97,10 @@ ETAGS               = @ETAGS@
 CC             = ${CXX}
 CCFLAGS                = $(CPPFLAGS) $(CXXFLAGS)
 
 CC             = ${CXX}
 CCFLAGS                = $(CPPFLAGS) $(CXXFLAGS)
 

-CFLAGS_LIBTOOL = $(CCFLAGS) -DNCURSES_STATIC
+CFLAGS_LIBTOOL = $(CCFLAGS)

 CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC
 CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC

-CFLAGS_DEBUG   = $(CCFLAGS) @CXX_G_OPT@ -DTRACE
-CFLAGS_PROFILE = $(CCFLAGS) -pg
+CFLAGS_DEBUG   = $(CCFLAGS) -DNCURSES_STATIC @CXX_G_OPT@ -DTRACE
+CFLAGS_PROFILE = $(CCFLAGS) -DNCURSES_STATIC -pg

 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)


@@ -245,7 +245,7 @@ $(MODEL)/demo$o : $(srcdir)/demo.cc \
                $(cursesm_h) \
                $(cursesapp_h)
        @echo 'compiling demo (obj_s)'
                $(cursesm_h) \
                $(cursesapp_h)
        @echo 'compiling demo (obj_s)'

-       @$(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(srcdir)/demo.cc -o $@
+       @cd $(MODEL) && $(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(top_srcdir)/c++/demo.cc -o $@

 
 demo$x:        $(OBJS_DEMO) \
        $(LIBRARIES)  \
 
 demo$x:        $(OBJS_DEMO) \
        $(LIBRARIES)  \

diff --git a/c++/cursesapp.cc b/c++/cursesapp.cc
index 522c57065091234743ee03a52a0f144dcfd44908..81f60983ab62dea65188434022a54d641a407c00 100644 (file)
--- a/c++/cursesapp.cc
+++ b/c++/cursesapp.cc
@@ -36,7 +36,7 @@
 #include "internal.h"
 #include "cursesapp.h"
 
 #include "internal.h"
 #include "cursesapp.h"
 

-MODULE_ID("$Id: cursesapp.cc,v 1.17 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: cursesapp.cc,v 1.18 2020/07/18 19:57:11 anonymous.maarten Exp $")

 
 void
 NCursesApplication::init(bool bColors)
 
 void
 NCursesApplication::init(bool bColors)


@@ -69,6 +69,11 @@ NCursesApplication* NCursesApplication::theApp = 0;
 NCursesWindow* NCursesApplication::titleWindow = 0;
 NCursesApplication::SLK_Link* NCursesApplication::slk_stack = 0;
 
 NCursesWindow* NCursesApplication::titleWindow = 0;
 NCursesApplication::SLK_Link* NCursesApplication::slk_stack = 0;
 

+
+NCursesWindow *&NCursesApplication::getTitleWindow() {
+  return titleWindow;
+}
+

 NCursesApplication::~NCursesApplication() THROWS(NCursesException)
 {
   Soft_Label_Key_Set* S;
 NCursesApplication::~NCursesApplication() THROWS(NCursesException)
 {
   Soft_Label_Key_Set* S;


@@ -87,6 +92,10 @@ NCursesApplication::~NCursesApplication() THROWS(NCursesException)
   ::endwin();
 }
 
   ::endwin();
 }
 

+NCursesApplication* NCursesApplication::getApplication() {
+  return theApp;
+}
+

 int NCursesApplication::rinit(NCursesWindow& w)
 {
   titleWindow = &w;
 int NCursesApplication::rinit(NCursesWindow& w)
 {
   titleWindow = &w;

diff --git a/c++/cursesapp.h b/c++/cursesapp.h
index bafc95a80b7477d9b6d683e9dd3f977fe11b4488..0c4010a9e4f62395a4840adafe8d752664b52b12 100644 (file)
--- a/c++/cursesapp.h
+++ b/c++/cursesapp.h
@@ -32,13 +32,24 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 

-// $Id: cursesapp.h,v 1.15 2020/05/24 01:40:20 anonymous.maarten Exp $
+// $Id: cursesapp.h,v 1.16 2020/07/18 19:57:11 anonymous.maarten Exp $

 
 #ifndef NCURSES_CURSESAPP_H_incl
 #define NCURSES_CURSESAPP_H_incl
 
 #include <cursslk.h>
 
 
 #ifndef NCURSES_CURSESAPP_H_incl
 #define NCURSES_CURSESAPP_H_incl
 
 #include <cursslk.h>
 

+#ifdef _WIN32
+# define NCURSES_CXX_MAIN_NAME cursespp_main
+# define NCURSES_CXX_MAIN \
+  int main(int argc, char *argv[]) { \
+       return NCURSES_CXX_MAIN_NAME(argc, argv); \
+  }
+#else
+# define NCURSES_CXX_MAIN_NAME main
+#endif
+NCURSES_CXX_IMPEXP int NCURSES_CXX_MAIN_NAME(int argc, char *argv[]);
+

 class NCURSES_CXX_IMPEXP NCursesApplication {
 public:
   typedef struct _slk_link {          // This structure is used to maintain
 class NCURSES_CXX_IMPEXP NCursesApplication {
 public:
   typedef struct _slk_link {          // This structure is used to maintain


@@ -106,13 +117,13 @@ protected:
   {
   }
 
   {
   }
 

+  static NCursesWindow *&getTitleWindow();
+

 public:
   virtual ~NCursesApplication() THROWS(NCursesException);
 
   // Get a pointer to the current application object
 public:
   virtual ~NCursesApplication() THROWS(NCursesException);
 
   // Get a pointer to the current application object

-  static NCursesApplication* getApplication() {
-    return theApp;
-  }
+  static NCursesApplication* getApplication();

 
   // This method runs the application and returns its exit value
   int operator()(void);
 
   // This method runs the application and returns its exit value
   int operator()(void);

diff --git a/c++/cursesf.cc b/c++/cursesf.cc
index fea592a0f3ee0d58301152890baf2e6da98610d4..fcf0080f9db5bfd1cdade3b4fa72a3455ccad2f5 100644 (file)
--- a/c++/cursesf.cc
+++ b/c++/cursesf.cc
@@ -36,7 +36,7 @@
 #include "cursesf.h"
 #include "cursesapp.h"
 
 #include "cursesf.h"
 #include "cursesapp.h"
 

-MODULE_ID("$Id: cursesf.cc,v 1.24 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: cursesf.cc,v 1.25 2020/07/18 19:57:11 anonymous.maarten Exp $")

 
 NCursesFormField::~NCursesFormField () THROWS(NCursesException)
 {
 
 NCursesFormField::~NCursesFormField () THROWS(NCursesException)
 {


@@ -406,10 +406,19 @@ FIELDTYPE* UserDefinedFieldType::generic_fieldtype =
   ::new_fieldtype(_nc_xx_fld_fcheck,
                  _nc_xx_fld_ccheck);
 
   ::new_fieldtype(_nc_xx_fld_fcheck,
                  _nc_xx_fld_ccheck);
 

+
+UserDefinedFieldType::UserDefinedFieldType() : NCursesFieldType(generic_fieldtype) {
+}
+

 FIELDTYPE* UserDefinedFieldType_With_Choice::generic_fieldtype_with_choice =
   ::new_fieldtype(_nc_xx_fld_fcheck,
                  _nc_xx_fld_ccheck);
 
 FIELDTYPE* UserDefinedFieldType_With_Choice::generic_fieldtype_with_choice =
   ::new_fieldtype(_nc_xx_fld_fcheck,
                  _nc_xx_fld_ccheck);
 

+
+UserDefinedFieldType_With_Choice::UserDefinedFieldType_With_Choice() {
+  fieldtype = generic_fieldtype_with_choice;
+}
+

 bool _nc_xx_next_choice(FIELD *f, const void *u)
 {
   (void) f;
 bool _nc_xx_next_choice(FIELD *f, const void *u)
 {
   (void) f;


@@ -461,3 +470,5 @@ public:
 };
 
 UDF_Init* UDF_Init::I = new UDF_Init();
 };
 
 UDF_Init* UDF_Init::I = new UDF_Init();

+
+

diff --git a/c++/cursesf.h b/c++/cursesf.h
index d5d2ec0ee06a58ab97d76e93e84528cdbadbf5f6..c7000948e16e6684bb99dc82dac4987e8b41cfd8 100644 (file)
--- a/c++/cursesf.h
+++ b/c++/cursesf.h
@@ -32,7 +32,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 

-// $Id: cursesf.h,v 1.36 2020/05/24 01:40:20 anonymous.maarten Exp $
+// $Id: cursesf.h,v 1.37 2020/07/18 19:57:11 anonymous.maarten Exp $

 
 #ifndef NCURSES_CURSESF_H_incl
 #define NCURSES_CURSESF_H_incl 1
 
 #ifndef NCURSES_CURSESF_H_incl
 #define NCURSES_CURSESF_H_incl 1


@@ -925,8 +925,7 @@ protected:
   virtual bool char_check (int c) = 0;
 
 public:
   virtual bool char_check (int c) = 0;
 
 public:

-  UserDefinedFieldType() : NCursesFieldType(generic_fieldtype) {
-  }
+  UserDefinedFieldType();

 };
 
 extern "C" {
 };
 
 extern "C" {


@@ -962,9 +961,7 @@ protected:
   virtual bool previous(NCursesFormField& f) = 0;
 
 public:
   virtual bool previous(NCursesFormField& f) = 0;
 
 public:

-  UserDefinedFieldType_With_Choice() {
-    fieldtype = generic_fieldtype_with_choice;
-  }
+  UserDefinedFieldType_With_Choice();

 };
 
 #endif /* NCURSES_CURSESF_H_incl */
 };
 
 #endif /* NCURSES_CURSESF_H_incl */

diff --git a/c++/cursesmain.cc b/c++/cursesmain.cc
index a45ec8b483f6af0f035b9fae2f0a9a3db4126c57..cc41b50be0bdc27c45db723e933e8fc2c5536de3 100644 (file)
--- a/c++/cursesmain.cc
+++ b/c++/cursesmain.cc
@@ -44,7 +44,7 @@
 #define CPP_HAS_TRY_CATCH 0
 #endif
 
 #define CPP_HAS_TRY_CATCH 0
 #endif
 

-MODULE_ID("$Id: cursesmain.cc,v 1.19 2020/05/24 01:40:20 anonymous.maarten Exp $")
+MODULE_ID("$Id: cursesmain.cc,v 1.20 2020/07/18 19:57:11 anonymous.maarten Exp $")

 
 #if HAVE_LOCALE_H
 #include <locale.h>
 
 #if HAVE_LOCALE_H
 #include <locale.h>


@@ -60,7 +60,7 @@ MODULE_ID("$Id: cursesmain.cc,v 1.19 2020/05/24 01:40:20 anonymous.maarten Exp $
  * You only have to instantiate a static NCursesApplication object in your
  * main application source file and link this module with your application.
  */
  * You only have to instantiate a static NCursesApplication object in your
  * main application source file and link this module with your application.
  */

-NCURSES_CXX_IMPEXP int main(int argc, char* argv[])
+int NCURSES_CXX_MAIN_NAME(int argc, char* argv[])

 {
   setlocale(LC_ALL, "");
 
 {
   setlocale(LC_ALL, "");
 

diff --git a/c++/cursslk.cc b/c++/cursslk.cc
index 78a426e23afdfb85aef391d61eec73a22f1d4c67..9922163cd360692192e09dcf121f7ba9b852cf0a 100644 (file)
--- a/c++/cursslk.cc
+++ b/c++/cursslk.cc
@@ -36,7 +36,7 @@
 #include "cursslk.h"
 #include "cursesapp.h"
 
 #include "cursslk.h"
 #include "cursesapp.h"
 

-MODULE_ID("$Id: cursslk.cc,v 1.18 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: cursslk.cc,v 1.19 2020/07/18 19:57:11 anonymous.maarten Exp $")

 
 Soft_Label_Key_Set::Soft_Label_Key&
   Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text)
 
 Soft_Label_Key_Set::Soft_Label_Key&
   Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text)


@@ -102,6 +102,10 @@ Soft_Label_Key_Set::Soft_Label_Key& Soft_Label_Key_Set::operator[](int i) {
   return slk_array[i-1];
 }
 
   return slk_array[i-1];
 }
 

+int Soft_Label_Key_Set::labels() const {
+  return num_labels;
+}
+

 void Soft_Label_Key_Set::activate_label(int i, bool bf) {
   if (!b_attrInit) {
     NCursesApplication* A = NCursesApplication::getApplication();
 void Soft_Label_Key_Set::activate_label(int i, bool bf) {
   if (!b_attrInit) {
     NCursesApplication* A = NCursesApplication::getApplication();

diff --git a/c++/cursslk.h b/c++/cursslk.h
index f93d0d85b9fb06600e7c6e55c611e928b827d1b0..4a34400916d38f830c1c52140a7e19ecdc9ba8b0 100644 (file)
--- a/c++/cursslk.h
+++ b/c++/cursslk.h
@@ -32,7 +32,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 

-// $Id: cursslk.h,v 1.17 2020/05/24 01:40:20 anonymous.maarten Exp $
+// $Id: cursslk.h,v 1.18 2020/07/18 19:57:11 anonymous.maarten Exp $

 
 #ifndef NCURSES_CURSSLK_H_incl
 #define NCURSES_CURSSLK_H_incl
 
 #ifndef NCURSES_CURSSLK_H_incl
 #define NCURSES_CURSSLK_H_incl


@@ -168,7 +168,7 @@ public:
   Soft_Label_Key& operator[](int i);
 
   // Retrieve number of Labels
   Soft_Label_Key& operator[](int i);
 
   // Retrieve number of Labels

-  inline int labels() const { return num_labels; }
+  int labels() const;

 
   // Refresh the SLK portion of the screen
   inline void refresh() {
 
   // Refresh the SLK portion of the screen
   inline void refresh() {

diff --git a/c++/demo.cc b/c++/demo.cc
index f651e18eddc6172bbc0f6415a23dea29156e311c..d99052cb09c87873b6938197d00d077014b622e8 100644 (file)
--- a/c++/demo.cc
+++ b/c++/demo.cc
@@ -36,7 +36,7 @@
  *   Demo code for NCursesMenu and NCursesForm written by
  *   Juergen Pfeifer
  *
  *   Demo code for NCursesMenu and NCursesForm written by
  *   Juergen Pfeifer
  *

- * $Id: demo.cc,v 1.46 2020/05/24 01:40:20 anonymous.maarten Exp $
+ * $Id: demo.cc,v 1.47 2020/07/18 19:57:11 anonymous.maarten Exp $

  */
 
 #include "internal.h"
  */
 
 #include "internal.h"


@@ -552,9 +552,9 @@ void TestApplication::title()
   const char * const titleText = "Simple C++ Binding Demo";
   const int len = ::strlen(titleText);
 
   const char * const titleText = "Simple C++ Binding Demo";
   const int len = ::strlen(titleText);
 

-  titleWindow->bkgd(screen_titles());
-  titleWindow->addstr(0, (titleWindow->cols() - len)/2, titleText);
-  titleWindow->noutrefresh();
+  getTitleWindow()->bkgd(screen_titles());
+  getTitleWindow()->addstr(0, (getTitleWindow()->cols() - len)/2, titleText);
+  getTitleWindow()->noutrefresh();

 }
 
 
 }
 
 


@@ -569,3 +569,8 @@ int TestApplication::run()
 // -------------------------------------------------------------------------
 //
 static TestApplication *Demo = new TestApplication();
 // -------------------------------------------------------------------------
 //
 static TestApplication *Demo = new TestApplication();

+
+#ifdef _WIN32
+// This is actually only needed when ncurses is a dll
+NCURSES_CXX_MAIN
+#endif

diff --git a/dist.mk b/dist.mk
index 8c94e9d56361d31ae8c7bf6f4fefa2ceb7b91094..763ee2dfc071b1d344dbff8bb4b647a21e288fe2 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1360 2020/07/11 08:26:05 tom Exp $
+# $Id: dist.mk,v 1.1361 2020/07/18 14:36:05 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 2
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 2

-NCURSES_PATCH = 20200711
+NCURSES_PATCH = 20200718

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/form/Makefile.in b/form/Makefile.in
index b70feab84750678bc8c6eda75cebd021b73cd04f..8035555250fd970e4e491b01228bcf545d9ddbef 100644 (file)
--- a/form/Makefile.in
+++ b/form/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.68 2020/05/24 01:40:20 anonymous.maarten Exp $
+# $Id: Makefile.in,v 1.69 2020/07/18 19:16:52 tom Exp $

 ##############################################################################
 # Copyright 2020 Thomas E. Dickey                                            #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 ##############################################################################
 # Copyright 2020 Thomas E. Dickey                                            #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #


@@ -98,10 +98,10 @@ CPPFLAGS    = -I$(BASE_DIR) -DHAVE_CONFIG_H -DBUILDING_FORM @CPPFLAGS@
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 

-CFLAGS_LIBTOOL = $(CCFLAGS) -DNCURSES_STATIC
+CFLAGS_LIBTOOL = $(CCFLAGS)

 CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC
 CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC

-CFLAGS_DEBUG   = $(CCFLAGS) @CC_G_OPT@ -DTRACE
-CFLAGS_PROFILE = $(CCFLAGS) -pg
+CFLAGS_DEBUG   = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE
+CFLAGS_PROFILE = $(CCFLAGS) -DNCURSES_STATIC -pg

 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)

diff --git a/menu/Makefile.in b/menu/Makefile.in
index ba9c96b8616c1ced2df074107e3077eda228494e..77a83ed7beec4ba6ac2e03f22b74b88886910ae3 100644 (file)
--- a/menu/Makefile.in
+++ b/menu/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.68 2020/05/24 01:40:20 anonymous.maarten Exp $
+# $Id: Makefile.in,v 1.69 2020/07/18 19:17:20 tom Exp $

 ##############################################################################
 # Copyright 2020 Thomas E. Dickey                                            #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 ##############################################################################
 # Copyright 2020 Thomas E. Dickey                                            #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #


@@ -98,10 +98,10 @@ CPPFLAGS    = -I$(BASE_DIR) -DHAVE_CONFIG_H -DBUILDING_MENU @CPPFLAGS@
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 

-CFLAGS_LIBTOOL = $(CCFLAGS) -DNCURSES_STATIC
+CFLAGS_LIBTOOL = $(CCFLAGS)

 CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC
 CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC

-CFLAGS_DEBUG   = $(CCFLAGS) @CC_G_OPT@ -DTRACE
-CFLAGS_PROFILE = $(CCFLAGS) -pg
+CFLAGS_DEBUG   = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE
+CFLAGS_PROFILE = $(CCFLAGS) -DNCURSES_STATIC -pg

 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index 6d55ce58d79b68e3b16b414ff4b397448ae4121c..096497fa4cc904602744f62dd349e66f9c7c7d5e 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.170 2020/05/24 01:40:20 anonymous.maarten Exp $
+# $Id: Makefile.in,v 1.171 2020/07/18 19:17:35 tom Exp $

 ##############################################################################
 # Copyright 2018-2019,2020 Thomas E. Dickey                                  #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
 ##############################################################################
 # Copyright 2018-2019,2020 Thomas E. Dickey                                  #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #


@@ -118,10 +118,10 @@ BUILD_LIBS        = @BUILD_LIBS@
 BUILD_EXEEXT   = @BUILD_EXEEXT@
 x              = @EXEEXT@
 
 BUILD_EXEEXT   = @BUILD_EXEEXT@
 x              = @EXEEXT@
 

-CFLAGS_LIBTOOL = $(CCFLAGS) -DNCURSES_STATIC
+CFLAGS_LIBTOOL = $(CCFLAGS)

 CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC
 CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC

-CFLAGS_DEBUG   = $(CCFLAGS) @CC_G_OPT@ -DTRACE
-CFLAGS_PROFILE = $(CCFLAGS) -pg
+CFLAGS_DEBUG   = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE
+CFLAGS_PROFILE = $(CCFLAGS) -DNCURSES_STATIC -pg

 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)

diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index bf2115dd0641c69e479ad8ead4a9b43489af281b..2b0abfce851a98d3eeca96f8e9ccf6c51e702560 100644 (file)
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -41,9 +41,10 @@
 **
 */
 
 **
 */
 

+#define NEED_KEY_EVENT

 #include <curses.priv.h>
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_getch.c,v 1.139 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.140 2020/07/18 20:02:24 tom Exp $")

 
 #include <fifo_defs.h>
 
 
 #include <fifo_defs.h>
 

diff --git a/ncurses/base/lib_getstr.c b/ncurses/base/lib_getstr.c
index d0b09a3b927ecc04f6cb6f36cb2a7d7ff4517087..7871fb357a62a6d75388fa71127050a4a81c476b 100644 (file)
--- a/ncurses/base/lib_getstr.c
+++ b/ncurses/base/lib_getstr.c
@@ -39,9 +39,10 @@
 **
 */
 
 **
 */
 

+#define NEED_KEY_EVENT

 #include <curses.priv.h>
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_getstr.c,v 1.34 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_getstr.c,v 1.35 2020/07/18 20:02:24 tom Exp $")

 
 /*
  * This wipes out the last character, no matter whether it was a tab, control
 
 /*
  * This wipes out the last character, no matter whether it was a tab, control

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 20f35659c472ccaca5f8bd645bdbc2090db6f70d..daa94c9bded65a33d4b7f22a81ba082608cc3958 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*

- * $Id: curses.priv.h,v 1.630 2020/07/11 20:48:42 anonymous.maarten Exp $
+ * $Id: curses.priv.h,v 1.631 2020/07/18 20:03:25 tom Exp $

  *
  *     curses.priv.h
  *
  *
  *     curses.priv.h
  *


@@ -337,6 +337,10 @@ typedef TRIES {
 
 #include <curses.h>    /* we'll use -Ipath directive to get the right one! */
 
 
 #include <curses.h>    /* we'll use -Ipath directive to get the right one! */
 

+#ifndef NEED_KEY_EVENT
+#undef KEY_EVENT               /* reduce compiler-warnings with Visual C++ */
+#endif
+

 typedef struct
 {
     int red, green, blue;      /* what color_content() returns */
 typedef struct
 {
     int red, green, blue;      /* what color_content() returns */

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 075c096e728dfcb94d7825d0e183d3ab60eaaf97..3ebc2a044f68df9279c0f44a1456bd5bb9420573 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200711) unstable; urgency=low
+ncurses6 (6.2+20200718) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Jul 2020 04:26:05 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 18 Jul 2020 10:36:05 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 075c096e728dfcb94d7825d0e183d3ab60eaaf97..3ebc2a044f68df9279c0f44a1456bd5bb9420573 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200711) unstable; urgency=low
+ncurses6 (6.2+20200718) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Jul 2020 04:26:05 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 18 Jul 2020 10:36:05 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index 1a55f78e1cfe6d3b15a18152b46a39a86a700142..db19b1b94939975cc5f98cf2c94a5d72a15836c5 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200711) unstable; urgency=low
+ncurses6 (6.2+20200718) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Jul 2020 04:26:05 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 18 Jul 2020 10:36:05 -0400

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index f46c2c20efa7281ce75a598e2b5b8cee75f94dc2..c05d893fde319b282953ec025b3f01fa2cd65a74 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.404 2020/07/11 08:26:05 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.405 2020/07/18 14:36:05 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "2"\r
 !define VERSION_YYYY  "2020"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "2"\r
 !define VERSION_YYYY  "2020"\r

-!define VERSION_MMDD  "0711"\r
+!define VERSION_MMDD  "0718"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0a0ac1f1ed60df4b05b6f37381d2fb44dbb60d94..102e2502ee93b6a516f59d66968576db6e603fe1 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.2
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.2

-Release: 20200711
+Release: 20200718

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 411804b75f60ea197eb890fe66e07469d47f293c..e0fd5f7eb2e4a52fbe31379a9b07b9034f6c26c9 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2

-Release: 20200711
+Release: 20200718

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index ab545da0975d1176bc091b06844d2d583b6e1598..eb29df17f75776d7c7160cd2fb107b44e152c77b 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2

-Release: 20200711
+Release: 20200718

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/panel/Makefile.in b/panel/Makefile.in
index 1cba313cbe4f80785024e7c0b1a83644b11a0363..78af0c21fbb4ca9d811a3513a8e30728332c31c2 100644 (file)
--- a/panel/Makefile.in
+++ b/panel/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.73 2020/05/24 01:40:20 anonymous.maarten Exp $
+# $Id: Makefile.in,v 1.74 2020/07/18 19:17:45 tom Exp $

 ##############################################################################
 # Copyright 2020 Thomas E. Dickey                                            #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 ##############################################################################
 # Copyright 2020 Thomas E. Dickey                                            #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #


@@ -100,10 +100,10 @@ CPPFLAGS  = -I$(BASE_DIR) -DHAVE_CONFIG_H -DBUILDING_PANEL @CPPFLAGS@
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 

-CFLAGS_LIBTOOL = $(CCFLAGS) -DNCURSES_STATIC
+CFLAGS_LIBTOOL = $(CCFLAGS)

 CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC
 CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC

-CFLAGS_DEBUG   = $(CCFLAGS) @CC_G_OPT@ -DTRACE
-CFLAGS_PROFILE = $(CCFLAGS) -pg
+CFLAGS_DEBUG   = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE
+CFLAGS_PROFILE = $(CCFLAGS) -DNCURSES_STATIC -pg

 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)

diff --git a/progs/Makefile.in b/progs/Makefile.in
index 4606b25ccfa9eb983dedc73e7df35e524e6e6295..1b5a80f562aa66f2e0106bfd3a6683fb78d3b2cd 100644 (file)
--- a/progs/Makefile.in
+++ b/progs/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.104 2020/05/24 01:40:20 anonymous.maarten Exp $
+# $Id: Makefile.in,v 1.105 2020/07/18 18:48:31 tom Exp $

 ##############################################################################
 # Copyright 2020 Thomas E. Dickey                                            #
 # Copyright 1998-2016,2018 Free Software Foundation, Inc.                    #
 ##############################################################################
 # Copyright 2020 Thomas E. Dickey                                            #
 # Copyright 1998-2016,2018 Free Software Foundation, Inc.                    #


@@ -97,10 +97,10 @@ CPPFLAGS    = -DHAVE_CONFIG_H -I../progs @CPPFLAGS@
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 

-CFLAGS_LIBTOOL = $(CCFLAGS) -DNCURSES_STATIC
+CFLAGS_LIBTOOL = $(CCFLAGS)

 CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC
 CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC

-CFLAGS_DEBUG   = $(CCFLAGS) @CC_G_OPT@ -DTRACE
-CFLAGS_PROFILE = $(CCFLAGS) -pg
+CFLAGS_DEBUG   = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE
+CFLAGS_PROFILE = $(CCFLAGS) -DNCURSES_STATIC -pg

 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)

diff --git a/test/Makefile.in b/test/Makefile.in
index f4a533b3bfc4312431254a0efb757365381d51aa..ebc6510ef9de7d0be3856575a1eb2563cba14e03 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.124 2020/03/21 16:09:06 tom Exp $
+# $Id: Makefile.in,v 1.125 2020/07/18 18:47:54 tom Exp $

 ##############################################################################
 # Copyright 2020 Thomas E. Dickey                                            #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
 ##############################################################################
 # Copyright 2020 Thomas E. Dickey                                            #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #


@@ -90,9 +90,9 @@ CPPFLAGS      = -I. -I$(srcdir) -I../test -DHAVE_CONFIG_H -DDATA_DIR=\"$(datadir)\" @
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
 CFLAGS_LIBTOOL = $(CCFLAGS)
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
 CFLAGS_LIBTOOL = $(CCFLAGS)

-CFLAGS_NORMAL  = $(CCFLAGS)
-CFLAGS_DEBUG   = $(CCFLAGS) @CC_G_OPT@ -DTRACE
-CFLAGS_PROFILE = $(CCFLAGS) -pg
+CFLAGS_NORMAL  = $(CCFLAGS) -DNCURSES_STATIC
+CFLAGS_DEBUG   = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE
+CFLAGS_PROFILE = $(CCFLAGS) -DNCURSES_STATIC -pg

 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
 CFLAGS_SHARED  = $(CCFLAGS) @CC_SHARED_OPTS@
 
 CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)

diff --git a/test/widechars.h b/test/widechars.h
index 87c828fc31ccea9260627e9da77c27179f6752ff..18c72013542ca56d0c9382697fb07bf3b5d1b6b9 100644 (file)
--- a/test/widechars.h
+++ b/test/widechars.h
@@ -34,7 +34,7 @@
 
 #if USE_WIDEC_SUPPORT
 
 
 #if USE_WIDEC_SUPPORT
 

-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(_MSC_VER)

 /*
  * MinGW has wide-character functions, but they do not work correctly.
  */
 /*
  * MinGW has wide-character functions, but they do not work correctly.
  */