mxe-octave: src/msvc-ncurses-1.patch annotate

annotate src/msvc-ncurses-1.patch @ 3725:2acaa9943159

qscintilla: update 2.8.4 * src/qscintilla.mk: update to version and checksum for 2.8.4

author	John Donoghue
date	Mon, 20 Oct 2014 11:01:00 -0400
parents	21f598a028ec
children

rev	line source
3121 21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1 diff -ur ncurses-5.9-orig/c++/Makefile.in ncurses-5.9/c++/Makefile.in
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2 --- ncurses-5.9-orig/c++/Makefile.in 2010-11-27 16:45:27 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3 +++ ncurses-5.9/c++/Makefile.in 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	4 @@ -76,7 +76,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	5 CXXLIBS = @CXXLIBS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	6
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	7 INCDIR = ../include
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	8 -CPPFLAGS = -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	9 +CPPFLAGS = -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H -DNCURSESXX_DLL @CPPFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	10
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	11 CTAGS = @CTAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	12 ETAGS = @ETAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	13 @@ -166,7 +166,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	14 $(RANLIB) $@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	15
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	16 ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	17 - cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	18 + cd ../lib && $(LIBTOOL_LINK) $(CXX) -shared $(CXXFLAGS) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	19 -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	20 -rpath $(INSTALL_PREFIX)$(libdir) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	21 $(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	22 @@ -179,7 +179,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	23 demo$x: $(OBJS_DEMO) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	24 $(MY_LIBRARY) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	25 @TEST_DEPS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	26 - @ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	27 + @ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT) -Wl,-subsystem:console
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	28
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	29 etip.h: $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	30 cp $(srcdir)/etip.h.in $@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	31 @@ -243,6 +243,8 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	32 $(INCDIR)/panel.h :
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	33 cd ../panel && $(MAKE) $@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	34
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	35 +../obj_lo/demo$o: CPPFLAGS := $(filter-out -DNCURSESXX_DLL,$(CPPFLAGS))
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	36 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	37 ###############################################################################
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	38 # The remainder of this file is automatically generated during configuration
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	39 ###############################################################################
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	40 diff -ur ncurses-5.9-orig/c++/cursesapp.h ncurses-5.9/c++/cursesapp.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	41 --- ncurses-5.9-orig/c++/cursesapp.h 2005-05-28 17:57:44 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	42 +++ ncurses-5.9/c++/cursesapp.h 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	43 @@ -38,7 +38,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	44
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	45 #include <cursslk.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	46
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	47 -class NCURSES_IMPEXP NCursesApplication {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	48 +class NCURSESXX_IMPEXP NCursesApplication {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	49 public:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	50 typedef struct _slk_link { // This structure is used to maintain
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	51 struct _slk_link* prev; // a stack of SLKs
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	52 diff -ur ncurses-5.9-orig/c++/cursesf.h ncurses-5.9/c++/cursesf.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	53 --- ncurses-5.9-orig/c++/cursesf.h 2005-08-13 14:08:24 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	54 +++ ncurses-5.9/c++/cursesf.h 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	55 @@ -50,11 +50,11 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	56 // The abstract base class for buitin and user defined Fieldtypes.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	57 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	58 //
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	59 -class NCURSES_IMPEXP NCursesFormField; // forward declaration
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	60 +class NCURSESXX_IMPEXP NCursesFormField; // forward declaration
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	61
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	62 // Class to represent builtin field types as well as C++ written new
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	63 // fieldtypes (see classes UserDefineFieldType...
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	64 -class NCURSES_IMPEXP NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	65 +class NCURSESXX_IMPEXP NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	66 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	67 friend class NCursesFormField;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	68
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	69 @@ -100,7 +100,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	70 // The class representing a forms field, wrapping the lowlevel FIELD struct
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	71 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	72 //
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	73 -class NCURSES_IMPEXP NCursesFormField
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	74 +class NCURSESXX_IMPEXP NCursesFormField
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	75 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	76 friend class NCursesForm;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	77
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	78 @@ -337,7 +337,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	79 // The class representing a form, wrapping the lowlevel FORM struct
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	80 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	81 //
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	82 -class NCURSES_IMPEXP NCursesForm : public NCursesPanel
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	83 +class NCURSESXX_IMPEXP NCursesForm : public NCursesPanel
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	84 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	85 protected:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	86 FORM* form; // the lowlevel structure
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	87 @@ -628,7 +628,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	88 // data belongs to some class T. Use T as template argument
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	89 // to create a UserField.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	90 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	91 -template<class T> class NCURSES_IMPEXP NCursesUserField : public NCursesFormField
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	92 +template<class T> class NCURSESXX_IMPEXP NCursesUserField : public NCursesFormField
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	93 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	94 public:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	95 NCursesUserField (int rows,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	96 @@ -661,7 +661,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	97 // The same mechanism is used to attach user data to a form
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	98 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	99 //
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	100 -template<class T> class NCURSES_IMPEXP NCursesUserForm : public NCursesForm
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	101 +template<class T> class NCURSESXX_IMPEXP NCursesUserForm : public NCursesForm
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	102 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	103 protected:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	104 // 'Internal' constructor, builds an object without association to a
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	105 @@ -718,7 +718,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	106 // Builtin Fieldtypes
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	107 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	108 //
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	109 -class NCURSES_IMPEXP Alpha_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	110 +class NCURSESXX_IMPEXP Alpha_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	111 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	112 private:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	113 int min_field_width;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	114 @@ -734,7 +734,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	115 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	116 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	117
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	118 -class NCURSES_IMPEXP Alphanumeric_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	119 +class NCURSESXX_IMPEXP Alphanumeric_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	120 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	121 private:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	122 int min_field_width;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	123 @@ -750,7 +750,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	124 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	125 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	126
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	127 -class NCURSES_IMPEXP Integer_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	128 +class NCURSESXX_IMPEXP Integer_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	129 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	130 private:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	131 int precision;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	132 @@ -768,7 +768,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	133 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	134 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	135
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	136 -class NCURSES_IMPEXP Numeric_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	137 +class NCURSESXX_IMPEXP Numeric_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	138 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	139 private:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	140 int precision;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	141 @@ -786,7 +786,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	142 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	143 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	144
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	145 -class NCURSES_IMPEXP Regular_Expression_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	146 +class NCURSESXX_IMPEXP Regular_Expression_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	147 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	148 private:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	149 char* regex;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	150 @@ -831,7 +831,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	151 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	152 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	153
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	154 -class NCURSES_IMPEXP Enumeration_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	155 +class NCURSESXX_IMPEXP Enumeration_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	156 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	157 private:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	158 const char** list;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	159 @@ -870,7 +870,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	160 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	161 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	162
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	163 -class NCURSES_IMPEXP IPV4_Address_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	164 +class NCURSESXX_IMPEXP IPV4_Address_Field : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	165 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	166 private:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	167 void set(NCursesFormField& f) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	168 @@ -893,7 +893,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	169 // Abstract base class for User-Defined Fieldtypes
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	170 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	171 //
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	172 -class NCURSES_IMPEXP UserDefinedFieldType : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	173 +class NCURSESXX_IMPEXP UserDefinedFieldType : public NCursesFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	174 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	175 friend class UDF_Init; // Internal helper to set up statics
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	176 private:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	177 @@ -936,7 +936,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	178 // Abstract base class for User-Defined Fieldtypes with Choice functions
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	179 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	180 //
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	181 -class NCURSES_IMPEXP UserDefinedFieldType_With_Choice : public UserDefinedFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	182 +class NCURSESXX_IMPEXP UserDefinedFieldType_With_Choice : public UserDefinedFieldType
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	183 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	184 friend class UDF_Init; // Internal helper to set up statics
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	185 private:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	186 diff -ur ncurses-5.9-orig/c++/cursesm.cc ncurses-5.9/c++/cursesm.cc
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	187 --- ncurses-5.9-orig/c++/cursesm.cc 2005-04-02 16:39:05 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	188 +++ ncurses-5.9/c++/cursesm.cc 2013-07-04 18:38:58 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	189 @@ -180,8 +180,8 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	190 UserHook* hook = reinterpret_cast<UserHook*>(::menu_userptr(menu));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	191 delete hook;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	192 if (b_sub_owner) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	193 - delete sub;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	194 ::set_menu_sub(menu, static_cast<WINDOW *>(0));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	195 + delete sub;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	196 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	197 if (menu) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	198 ITEM** itms = ::menu_items(menu);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	199 diff -ur ncurses-5.9-orig/c++/cursesm.h ncurses-5.9/c++/cursesm.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	200 --- ncurses-5.9-orig/c++/cursesm.h 2005-08-13 14:10:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	201 +++ ncurses-5.9/c++/cursesm.h 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	202 @@ -46,7 +46,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	203 // This wraps the ITEM type of <menu.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	204 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	205 //
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	206 -class NCURSES_IMPEXP NCursesMenuItem
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	207 +class NCURSESXX_IMPEXP NCursesMenuItem
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	208 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	209 friend class NCursesMenu;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	210
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	211 @@ -151,7 +151,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	212 // If you don't like to create a child class for individual items to
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	213 // overload action(), you may use this class and provide a callback
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	214 // function pointer for items.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	215 -class NCURSES_IMPEXP NCursesMenuCallbackItem : public NCursesMenuItem
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	216 +class NCURSESXX_IMPEXP NCursesMenuCallbackItem : public NCursesMenuItem
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	217 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	218 private:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	219 ITEMCALLBACK* p_fct;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	220 @@ -198,7 +198,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	221 // This wraps the MENU type of <menu.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	222 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	223 //
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	224 -class NCURSES_IMPEXP NCursesMenu : public NCursesPanel
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	225 +class NCURSESXX_IMPEXP NCursesMenu : public NCursesPanel
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	226 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	227 protected:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	228 MENU *menu;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	229 @@ -594,7 +594,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	230 // to create a UserItem.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	231 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	232 //
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	233 -template<class T> class NCURSES_IMPEXP NCursesUserItem : public NCursesMenuItem
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	234 +template<class T> class NCursesUserItem : public NCursesMenuItem
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	235 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	236 public:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	237 NCursesUserItem (const char* p_name,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	238 @@ -621,7 +621,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	239 // The same mechanism is used to attach user data to a menu
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	240 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	241 //
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	242 -template<class T> class NCURSES_IMPEXP NCursesUserMenu : public NCursesMenu
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	243 +template<class T> class NCursesUserMenu : public NCursesMenu
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	244 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	245 protected:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	246 NCursesUserMenu( int nlines,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	247 diff -ur ncurses-5.9-orig/c++/cursesp.h ncurses-5.9/c++/cursesp.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	248 --- ncurses-5.9-orig/c++/cursesp.h 2008-08-16 13:20:23 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	249 +++ ncurses-5.9/c++/cursesp.h 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	250 @@ -42,7 +42,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	251 # include <panel.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	252 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	253
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	254 -class NCURSES_IMPEXP NCursesPanel
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	255 +class NCURSESXX_IMPEXP NCursesPanel
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	256 : public NCursesWindow
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	257 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	258 protected:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	259 diff -ur ncurses-5.9-orig/c++/cursesw.h ncurses-5.9/c++/cursesw.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	260 --- ncurses-5.9-orig/c++/cursesw.h 2008-01-19 16:09:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	261 +++ ncurses-5.9/c++/cursesw.h 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	262 @@ -750,7 +750,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	263 extern "C" int _nc_xx_ripoff_init(WINDOW *, int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	264 extern "C" int _nc_has_mouse(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	265
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	266 -class NCURSES_IMPEXP NCursesWindow
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	267 +class NCURSESXX_IMPEXP NCursesWindow
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	268 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	269 friend class NCursesMenu;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	270 friend class NCursesForm;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	271 @@ -1364,7 +1364,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	272 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	273 // We leave this here for compatibility reasons.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	274 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	275 -class NCURSES_IMPEXP NCursesColorWindow : public NCursesWindow
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	276 +class NCURSESXX_IMPEXP NCursesColorWindow : public NCursesWindow
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	277 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	278 public:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	279 NCursesColorWindow(WINDOW* &window) // useful only for stdscr
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	280 @@ -1410,7 +1410,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	281 // Pad Support. We allow an association of a pad with a "real" window
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	282 // through which the pad may be viewed.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	283 // -------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	284 -class NCURSES_IMPEXP NCursesPad : public NCursesWindow
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	285 +class NCURSESXX_IMPEXP NCursesPad : public NCursesWindow
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	286 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	287 private:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	288 NCursesWindow* viewWin; // the "viewport" window
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	289 @@ -1523,7 +1523,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	290 // A FramedPad is constructed always with a viewport window. This viewport
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	291 // will be framed (by a box() command) and the interior of the box is the
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	292 // viewport subwindow. On the frame we display scrollbar sliders.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	293 -class NCURSES_IMPEXP NCursesFramedPad : public NCursesPad
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	294 +class NCURSESXX_IMPEXP NCursesFramedPad : public NCursesPad
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	295 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	296 protected:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	297 virtual void OnOperation(int pad_req);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	298 diff -ur ncurses-5.9-orig/c++/cursslk.h ncurses-5.9/c++/cursslk.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	299 --- ncurses-5.9-orig/c++/cursslk.h 2005-05-28 17:58:18 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	300 +++ ncurses-5.9/c++/cursslk.h 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	301 @@ -38,10 +38,10 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	302
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	303 #include <cursesw.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	304
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	305 -class NCURSES_IMPEXP Soft_Label_Key_Set {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	306 +class NCURSESXX_IMPEXP Soft_Label_Key_Set {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	307 public:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	308 // This inner class represents the attributes of a Soft Label Key (SLK)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	309 - class NCURSES_IMPEXP Soft_Label_Key {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	310 + class NCURSESXX_IMPEXP Soft_Label_Key {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	311 friend class Soft_Label_Key_Set;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	312 public:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	313 typedef enum { Left=0, Center=1, Right=2 } Justification;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	314 @@ -100,10 +100,10 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	315 } Label_Layout;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	316
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	317 private:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	318 - static long NCURSES_IMPEXP count; // Number of Key Sets
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	319 - static Label_Layout NCURSES_IMPEXP format; // Layout of the Key Sets
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	320 - static int NCURSES_IMPEXP num_labels; // Number Of Labels in Key Sets
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	321 - bool NCURSES_IMPEXP b_attrInit; // Are attributes initialized
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	322 + static long count; // Number of Key Sets
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	323 + static Label_Layout format; // Layout of the Key Sets
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	324 + static int num_labels; // Number Of Labels in Key Sets
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	325 + bool b_attrInit; // Are attributes initialized
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	326
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	327 Soft_Label_Key *slk_array; // The array of SLK's
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	328
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	329 @@ -143,7 +143,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	330
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	331 // This constructor assumes, that you already constructed a Key Set
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	332 // with a layout by the constructor above. This layout will be reused.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	333 - NCURSES_IMPEXP Soft_Label_Key_Set();
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	334 + Soft_Label_Key_Set();
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	335
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	336 Soft_Label_Key_Set& operator=(const Soft_Label_Key_Set& rhs)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	337 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	338 @@ -164,7 +164,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	339 virtual ~Soft_Label_Key_Set();
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	340
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	341 // Get Label# i. Label counting starts with 1!
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	342 - NCURSES_IMPEXP Soft_Label_Key& operator[](int i);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	343 + Soft_Label_Key& operator[](int i);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	344
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	345 // Retrieve number of Labels
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	346 inline int labels() const { return num_labels; }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	347 diff -ur ncurses-5.9-orig/c++/demo.cc ncurses-5.9/c++/demo.cc
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	348 --- ncurses-5.9-orig/c++/demo.cc 2008-12-06 21:07:34 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	349 +++ ncurses-5.9/c++/demo.cc 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	350 @@ -43,11 +43,11 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	351 #include "cursesm.h"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	352 #include "cursesf.h"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	353
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	354 -#ifdef __MINGW32__
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	355 +#if defined(__MINGW32__) \|\| defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	356 #undef KEY_EVENT
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	357 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	358
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	359 -#ifndef __MINGW32__
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	360 +#if !defined(__MINGW32__) && !defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	361 extern "C" unsigned int sleep(unsigned int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	362 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	363
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	364 @@ -186,7 +186,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	365 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	366
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	367 template class MyAction<UserData>;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	368 -template class NCURSES_IMPEXP NCursesUserItem<UserData>;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	369 +template class NCursesUserItem<UserData>;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	370
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	371 class QuitItem : public NCursesMenuItem
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	372 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	373 diff -ur ncurses-5.9-orig/c++/etip.h.in ncurses-5.9/c++/etip.h.in
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	374 --- ncurses-5.9-orig/c++/etip.h.in 2008-08-30 15:27:32 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	375 +++ ncurses-5.9/c++/etip.h.in 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	376 @@ -139,11 +139,11 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	377 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	378
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	379 // Forward Declarations
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	380 -class NCURSES_IMPEXP NCursesPanel;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	381 -class NCURSES_IMPEXP NCursesMenu;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	382 -class NCURSES_IMPEXP NCursesForm;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	383 +class NCURSESXX_IMPEXP NCursesPanel;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	384 +class NCURSESXX_IMPEXP NCursesMenu;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	385 +class NCURSESXX_IMPEXP NCursesForm;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	386
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	387 -class NCURSES_IMPEXP NCursesException
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	388 +class NCURSESXX_IMPEXP NCursesException
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	389 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	390 public:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	391 const char *message;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	392 @@ -177,7 +177,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	393 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	394 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	395
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	396 -class NCURSES_IMPEXP NCursesPanelException : public NCursesException
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	397 +class NCURSESXX_IMPEXP NCursesPanelException : public NCursesException
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	398 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	399 public:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	400 const NCursesPanel* p;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	401 @@ -228,7 +228,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	402 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	403 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	404
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	405 -class NCURSES_IMPEXP NCursesMenuException : public NCursesException
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	406 +class NCURSESXX_IMPEXP NCursesMenuException : public NCursesException
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	407 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	408 public:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	409 const NCursesMenu* m;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	410 @@ -279,7 +279,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	411 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	412 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	413
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	414 -class NCURSES_IMPEXP NCursesFormException : public NCursesException
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	415 +class NCURSESXX_IMPEXP NCursesFormException : public NCursesException
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	416 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	417 public:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	418 const NCursesForm* f;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	419 @@ -340,7 +340,9 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	420 # else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	421 # include <iostream.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	422 # endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	423 - extern "C" void exit(int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	424 +# ifndef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	425 + extern "C" void exit(int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	426 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	427 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	428
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	429 inline void THROW(const NCursesException *e) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	430 diff -ur ncurses-5.9-orig/c++/internal.h ncurses-5.9/c++/internal.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	431 --- ncurses-5.9-orig/c++/internal.h 2008-12-06 21:07:34 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	432 +++ ncurses-5.9/c++/internal.h 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	433 @@ -44,7 +44,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	434 #define MODULE_ID(id) /nothing/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	435 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	436
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	437 -#ifdef __MINGW32__
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	438 +#if defined(__MINGW32__) \|\| defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	439 #include <nc_mingw.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	440 #undef KEY_EVENT
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	441 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	442 diff -ur ncurses-5.9-orig/form/Makefile.in ncurses-5.9/form/Makefile.in
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	443 --- ncurses-5.9-orig/form/Makefile.in 2010-11-27 16:45:27 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	444 +++ ncurses-5.9/form/Makefile.in 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	445 @@ -84,7 +84,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	446 CPP = @CPP@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	447 CFLAGS = @CFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	448
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	449 -CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H @CPPFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	450 +CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H -DNCFORM_DLL @CPPFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	451
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	452 CCFLAGS = $(CPPFLAGS) $(CFLAGS)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	453
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	454 diff -ur ncurses-5.9-orig/form/f_trace.c ncurses-5.9/form/f_trace.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	455 --- ncurses-5.9-orig/form/f_trace.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	456 +++ ncurses-5.9/form/f_trace.c 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	457 @@ -34,35 +34,35 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	458
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	459 MODULE_ID("$Id: f_trace.c,v 1.2 2010/01/23 21:14:36 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	460
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	461 -NCURSES_EXPORT(FIELD **)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	462 +NCFORM_EXPORT(FIELD **)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	463 _nc_retrace_field_ptr(FIELD **code)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	464 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	465 T((T_RETURN("%p"), (void *)code));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	466 return code;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	467 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	468
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	469 -NCURSES_EXPORT(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	470 +NCFORM_EXPORT(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	471 _nc_retrace_field(FIELD *code)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	472 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	473 T((T_RETURN("%p"), (void *)code));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	474 return code;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	475 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	476
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	477 -NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	478 +NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	479 _nc_retrace_field_type(FIELDTYPE *code)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	480 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	481 T((T_RETURN("%p"), (void *)code));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	482 return code;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	483 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	484
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	485 -NCURSES_EXPORT(FORM *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	486 +NCFORM_EXPORT(FORM *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	487 _nc_retrace_form(FORM *code)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	488 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	489 T((T_RETURN("%p"), (void *)code));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	490 return code;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	491 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	492
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	493 -NCURSES_EXPORT(Form_Hook)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	494 +NCFORM_EXPORT(Form_Hook)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	495 _nc_retrace_form_hook(Form_Hook code)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	496 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	497 T((T_RETURN("%p"), code));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	498 diff -ur ncurses-5.9-orig/form/fld_arg.c ncurses-5.9/form/fld_arg.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	499 --- ncurses-5.9-orig/form/fld_arg.c 2010-01-23 16:14:35 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	500 +++ ncurses-5.9/form/fld_arg.c 2013-07-04 18:38:36 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	501 @@ -60,7 +60,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	502 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	503 \| E_BAD_ARGUMENT - invalid argument
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	504 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	505 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	506 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	507 set_fieldtype_arg(FIELDTYPE *typ,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	508 void (const make_arg)(va_list *),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	509 void (const copy_arg)(const void *),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	510 @@ -88,7 +88,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	511 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	512 \| Return Values : Pointer to structure or NULL if none is defined.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	513 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	514 -NCURSES_EXPORT(void *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	515 +NCFORM_EXPORT(void *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	516 field_arg(const FIELD *field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	517 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	518 T((T_CALLED("field_arg(%p)"), (const void *)field));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	519 diff -ur ncurses-5.9-orig/form/fld_attr.c ncurses-5.9/form/fld_attr.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	520 --- ncurses-5.9-orig/form/fld_attr.c 2010-01-23 16:12:08 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	521 +++ ncurses-5.9/form/fld_attr.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	522 @@ -39,7 +39,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	523 --------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	524 /* "Template" macro to generate a function to set a fields attribute */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	525 #define GEN_FIELD_ATTR_SET_FCT( name ) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	526 -NCURSES_IMPEXP int NCURSES_API set_field_ ## name (FIELD * field, chtype attr)\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	527 +NCFORM_IMPEXP int NCFORM_API set_field_ ## name (FIELD * field, chtype attr)\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	528 {\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	529 int res = E_BAD_ARGUMENT;\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	530 T((T_CALLED("set_field_" #name "(%p,%s)"), field, _traceattr(attr)));\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	531 @@ -64,7 +64,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	532
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	533 /* "Template" macro to generate a function to get a fields attribute */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	534 #define GEN_FIELD_ATTR_GET_FCT( name ) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	535 -NCURSES_IMPEXP chtype NCURSES_API field_ ## name (const FIELD * field)\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	536 +NCFORM_IMPEXP chtype NCFORM_API field_ ## name (const FIELD * field)\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	537 {\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	538 T((T_CALLED("field_" #name "(%p)"), (const void *) field));\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	539 returnAttr( A_ATTRIBUTES & (Normalize_Field( field ) -> name) );\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	540 diff -ur ncurses-5.9-orig/form/fld_current.c ncurses-5.9/form/fld_current.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	541 --- ncurses-5.9-orig/form/fld_current.c 2010-01-23 16:14:35 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	542 +++ ncurses-5.9/form/fld_current.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	543 @@ -47,7 +47,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	544 \| E_INVALID_FIELD - current field can't be left
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	545 \| E_SYSTEM_ERROR - system error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	546 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	547 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	548 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	549 set_current_field(FORM form, FIELD field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	550 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	551 int err = E_OK;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	552 @@ -110,7 +110,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	553 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	554 \| Return Values : Pointer to the current field.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	555 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	556 -NCURSES_EXPORT(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	557 +NCFORM_EXPORT(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	558 current_field(const FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	559 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	560 T((T_CALLED("current_field(%p)"), (const void *)form));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	561 @@ -127,7 +127,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	562 \| Return Values : >= 0 : field index
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	563 \| -1 : fieldpointer invalid or field not connected
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	564 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	565 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	566 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	567 field_index(const FIELD *field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	568 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	569 T((T_CALLED("field_index(%p)"), (const void *)field));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	570 diff -ur ncurses-5.9-orig/form/fld_def.c ncurses-5.9/form/fld_def.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	571 --- ncurses-5.9-orig/form/fld_def.c 2010-01-23 16:14:35 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	572 +++ ncurses-5.9/form/fld_def.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	573 @@ -65,7 +65,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	574 NCURSES_FIELD_EXTENSION
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	575 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	576
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	577 -NCURSES_EXPORT_VAR(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	578 +NCFORM_EXPORT_VAR(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	579 _nc_Default_Field = &default_field;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	580
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	581 /*---------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	582 @@ -82,7 +82,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	583 \| Return Values : Pointer to argument structure. Maybe NULL.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	584 \| In case of an error in *err an error counter is increased.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	585 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	586 -NCURSES_EXPORT(TypeArgument *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	587 +NCFORM_EXPORT(TypeArgument *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	588 _nc_Make_Argument(const FIELDTYPE typ, va_list ap, int *err)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	589 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	590 TypeArgument res = (TypeArgument )0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	591 @@ -130,7 +130,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	592 \| Return Values : Pointer to argument structure. Maybe NULL.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	593 \| In case of an error in *err an error counter is increased.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	594 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	595 -NCURSES_EXPORT(TypeArgument *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	596 +NCFORM_EXPORT(TypeArgument *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	597 _nc_Copy_Argument(const FIELDTYPE typ, const TypeArgument argp, int *err)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	598 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	599 TypeArgument res = (TypeArgument )0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	600 @@ -179,7 +179,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	601 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	602 \| Return Values : -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	603 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	604 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	605 +NCFORM_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	606 _nc_Free_Argument(const FIELDTYPE typ, TypeArgument argp)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	607 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	608 if (typ != 0 && (typ->status & _HAS_ARGS) != 0)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	609 @@ -210,7 +210,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	610 \| Return Values : TRUE - copy worked
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	611 \| FALSE - error occurred
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	612 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	613 -NCURSES_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	614 +NCFORM_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	615 _nc_Copy_Type(FIELD dst, FIELD const src)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	616 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	617 int err = 0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	618 @@ -245,7 +245,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	619 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	620 \| Return Values : -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	621 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	622 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	623 +NCFORM_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	624 _nc_Free_Type(FIELD *field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	625 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	626 assert(field != 0);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	627 @@ -272,7 +272,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	628 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	629 \| Return Values : Pointer to the new field or NULL if failure.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	630 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	631 -NCURSES_EXPORT(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	632 +NCFORM_EXPORT(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	633 new_field(int rows, int cols, int frow, int fcol, int nrow, int nbuf)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	634 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	635 static const FIELD_CELL blank = BLANK;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	636 @@ -352,7 +352,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	637 \| E_BAD_ARGUMENT - invalid field pointer
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	638 \| E_CONNECTED - field is connected
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	639 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	640 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	641 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	642 free_field(FIELD *field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	643 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	644 T((T_CALLED("free_field(%p)"), (void *)field));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	645 diff -ur ncurses-5.9-orig/form/fld_dup.c ncurses-5.9/form/fld_dup.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	646 --- ncurses-5.9-orig/form/fld_dup.c 2010-01-23 16:14:35 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	647 +++ ncurses-5.9/form/fld_dup.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	648 @@ -47,7 +47,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	649 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	650 \| Return Values : Pointer to the new field or NULL if failure
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	651 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	652 -NCURSES_EXPORT(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	653 +NCFORM_EXPORT(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	654 dup_field(FIELD *field, int frow, int fcol)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	655 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	656 FIELD New_Field = (FIELD )0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	657 diff -ur ncurses-5.9-orig/form/fld_ftchoice.c ncurses-5.9/form/fld_ftchoice.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	658 --- ncurses-5.9-orig/form/fld_ftchoice.c 2010-01-23 16:14:35 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	659 +++ ncurses-5.9/form/fld_ftchoice.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	660 @@ -46,7 +46,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	661 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	662 \| E_BAD_ARGUMENT - invalid arguments
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	663 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	664 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	665 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	666 set_fieldtype_choice(FIELDTYPE *typ,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	667 bool (const next_choice) (FIELD , const void *),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	668 bool (const prev_choice) (FIELD , const void *))
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	669 diff -ur ncurses-5.9-orig/form/fld_ftlink.c ncurses-5.9/form/fld_ftlink.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	670 --- ncurses-5.9-orig/form/fld_ftlink.c 2010-01-23 16:14:35 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	671 +++ ncurses-5.9/form/fld_ftlink.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	672 @@ -48,7 +48,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	673 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	674 \| Return Values : Fieldtype pointer or NULL if error occurred.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	675 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	676 -NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	677 +NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	678 link_fieldtype(FIELDTYPE type1, FIELDTYPE type2)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	679 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	680 FIELDTYPE nftyp = (FIELDTYPE )0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	681 diff -ur ncurses-5.9-orig/form/fld_info.c ncurses-5.9/form/fld_info.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	682 --- ncurses-5.9-orig/form/fld_info.c 2010-01-23 16:14:35 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	683 +++ ncurses-5.9/form/fld_info.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	684 @@ -46,7 +46,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	685 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	686 \| E_BAD_ARGUMENT - invalid field pointer
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	687 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	688 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	689 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	690 field_info(const FIELD *field,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	691 int rows, int cols,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	692 int frow, int fcol,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	693 @@ -88,7 +88,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	694 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	695 \| E_BAD_ARGUMENT - invalid argument
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	696 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	697 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	698 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	699 dynamic_field_info(const FIELD field, int drows, int dcols, int maxgrow)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	700 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	701 T((T_CALLED("dynamic_field_info(%p,%p,%p,%p)"),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	702 diff -ur ncurses-5.9-orig/form/fld_just.c ncurses-5.9/form/fld_just.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	703 --- ncurses-5.9-orig/form/fld_just.c 2010-01-23 16:14:35 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	704 +++ ncurses-5.9/form/fld_just.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	705 @@ -44,7 +44,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	706 \| E_BAD_ARGUMENT - one of the arguments was incorrect
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	707 \| E_SYSTEM_ERROR - system error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	708 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	709 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	710 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	711 set_field_just(FIELD *field, int just)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	712 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	713 int res = E_BAD_ARGUMENT;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	714 @@ -76,7 +76,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	715 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	716 \| Return Values : The justification type.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	717 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	718 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	719 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	720 field_just(const FIELD *field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	721 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	722 T((T_CALLED("field_just(%p)"), (const void *)field));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	723 diff -ur ncurses-5.9-orig/form/fld_link.c ncurses-5.9/form/fld_link.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	724 --- ncurses-5.9-orig/form/fld_link.c 2010-01-23 16:14:35 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	725 +++ ncurses-5.9/form/fld_link.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	726 @@ -48,7 +48,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	727 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	728 \| Return Values : Pointer to the new field or NULL if failure
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	729 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	730 -NCURSES_EXPORT(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	731 +NCFORM_EXPORT(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	732 link_field(FIELD *field, int frow, int fcol)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	733 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	734 FIELD New_Field = (FIELD )0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	735 diff -ur ncurses-5.9-orig/form/fld_max.c ncurses-5.9/form/fld_max.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	736 --- ncurses-5.9-orig/form/fld_max.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	737 +++ ncurses-5.9/form/fld_max.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	738 @@ -44,7 +44,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	739 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	740 \| E_BAD_ARGUMENT - invalid argument
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	741 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	742 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	743 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	744 set_max_field(FIELD *field, int maxgrow)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	745 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	746 T((T_CALLED("set_max_field(%p,%d)"), (void *)field, maxgrow));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	747 diff -ur ncurses-5.9-orig/form/fld_move.c ncurses-5.9/form/fld_move.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	748 --- ncurses-5.9-orig/form/fld_move.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	749 +++ ncurses-5.9/form/fld_move.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	750 @@ -45,7 +45,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	751 \| E_BAD_ARGUMENT - invalid argument passed
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	752 \| E_CONNECTED - field is connected
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	753 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	754 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	755 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	756 move_field(FIELD *field, int frow, int fcol)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	757 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	758 T((T_CALLED("move_field(%p,%d,%d)"), (void *)field, frow, fcol));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	759 diff -ur ncurses-5.9-orig/form/fld_newftyp.c ncurses-5.9/form/fld_newftyp.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	760 --- ncurses-5.9-orig/form/fld_newftyp.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	761 +++ ncurses-5.9/form/fld_newftyp.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	762 @@ -52,7 +52,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	763 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	764 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	765
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	766 -NCURSES_EXPORT_VAR(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	767 +NCFORM_EXPORT_VAR(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	768 _nc_Default_FieldType = &default_fieldtype;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	769
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	770 /*---------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	771 @@ -70,7 +70,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	772 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	773 \| Return Values : Fieldtype pointer or NULL if error occurred
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	774 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	775 -NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	776 +NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	777 new_fieldtype(bool (const field_check) (FIELD , const void *),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	778 bool (const char_check) (int, const void ))
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	779 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	780 @@ -115,7 +115,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	781 \| E_CONNECTED - there are fields referencing the type
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	782 \| E_BAD_ARGUMENT - invalid fieldtype pointer
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	783 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	784 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	785 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	786 free_fieldtype(FIELDTYPE *typ)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	787 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	788 T((T_CALLED("free_fieldtype(%p)"), (void *)typ));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	789 diff -ur ncurses-5.9-orig/form/fld_opts.c ncurses-5.9/form/fld_opts.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	790 --- ncurses-5.9-orig/form/fld_opts.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	791 +++ ncurses-5.9/form/fld_opts.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	792 @@ -50,7 +50,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	793 \| E_BAD_ARGUMENT - invalid options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	794 \| E_SYSTEM_ERROR - system error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	795 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	796 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	797 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	798 set_field_opts(FIELD *field, Field_Options opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	799 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	800 int res = E_BAD_ARGUMENT;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	801 @@ -71,7 +71,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	802 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	803 \| Return Values : The options.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	804 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	805 -NCURSES_EXPORT(Field_Options)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	806 +NCFORM_EXPORT(Field_Options)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	807 field_opts(const FIELD *field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	808 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	809 T((T_CALLED("field_opts(%p)"), (const void *)field));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	810 @@ -91,7 +91,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	811 \| E_BAD_ARGUMENT - invalid options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	812 \| E_SYSTEM_ERROR - system error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	813 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	814 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	815 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	816 field_opts_on(FIELD *field, Field_Options opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	817 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	818 int res = E_BAD_ARGUMENT;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	819 @@ -119,7 +119,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	820 \| E_BAD_ARGUMENT - invalid options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	821 \| E_SYSTEM_ERROR - system error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	822 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	823 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	824 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	825 field_opts_off(FIELD *field, Field_Options opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	826 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	827 int res = E_BAD_ARGUMENT;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	828 diff -ur ncurses-5.9-orig/form/fld_pad.c ncurses-5.9/form/fld_pad.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	829 --- ncurses-5.9-orig/form/fld_pad.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	830 +++ ncurses-5.9/form/fld_pad.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	831 @@ -45,7 +45,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	832 \| E_BAD_ARGUMENT - invalid field pointer or pad character
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	833 \| E_SYSTEM_ERROR - system error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	834 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	835 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	836 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	837 set_field_pad(FIELD *field, int ch)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	838 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	839 int res = E_BAD_ARGUMENT;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	840 @@ -74,7 +74,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	841 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	842 \| Return Values : The pad character.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	843 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	844 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	845 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	846 field_pad(const FIELD *field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	847 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	848 T((T_CALLED("field_pad(%p)"), (const void *)field));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	849 diff -ur ncurses-5.9-orig/form/fld_page.c ncurses-5.9/form/fld_page.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	850 --- ncurses-5.9-orig/form/fld_page.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	851 +++ ncurses-5.9/form/fld_page.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	852 @@ -44,7 +44,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	853 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	854 \| E_CONNECTED - field is connected
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	855 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	856 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	857 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	858 set_new_page(FIELD *field, bool new_page_flag)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	859 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	860 T((T_CALLED("set_new_page(%p,%d)"), (void *)field, new_page_flag));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	861 @@ -71,7 +71,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	862 \| Return Values : TRUE - field starts a new page
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	863 \| FALSE - field doesn't start a new page
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	864 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	865 -NCURSES_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	866 +NCFORM_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	867 new_page(const FIELD *field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	868 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	869 T((T_CALLED("new_page(%p)"), (const void *)field));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	870 diff -ur ncurses-5.9-orig/form/fld_stat.c ncurses-5.9/form/fld_stat.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	871 --- ncurses-5.9-orig/form/fld_stat.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	872 +++ ncurses-5.9/form/fld_stat.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	873 @@ -43,7 +43,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	874 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	875 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	876 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	877 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	878 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	879 set_field_status(FIELD *field, bool status)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	880 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	881 T((T_CALLED("set_field_status(%p,%d)"), (void *)field, status));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	882 @@ -68,7 +68,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	883 \| Return Values : TRUE - buffer has been changed
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	884 \| FALSE - buffer has not been changed
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	885 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	886 -NCURSES_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	887 +NCFORM_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	888 field_status(const FIELD *field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	889 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	890 T((T_CALLED("field_status(%p)"), (const void *)field));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	891 diff -ur ncurses-5.9-orig/form/fld_type.c ncurses-5.9/form/fld_type.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	892 --- ncurses-5.9-orig/form/fld_type.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	893 +++ ncurses-5.9/form/fld_type.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	894 @@ -45,7 +45,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	895 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	896 \| E_SYSTEM_ERROR - system error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	897 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	898 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	899 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	900 set_field_type(FIELD field, FIELDTYPE type,...)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	901 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	902 va_list ap;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	903 @@ -87,7 +87,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	904 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	905 \| Return Values : Pointer to fieldtype of NULL if none is defined.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	906 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	907 -NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	908 +NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	909 field_type(const FIELD *field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	910 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	911 T((T_CALLED("field_type(%p)"), (const void *)field));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	912 diff -ur ncurses-5.9-orig/form/fld_user.c ncurses-5.9/form/fld_user.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	913 --- ncurses-5.9-orig/form/fld_user.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	914 +++ ncurses-5.9/form/fld_user.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	915 @@ -43,7 +43,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	916 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	917 \| Return Values : E_OK - on success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	918 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	919 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	920 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	921 set_field_userptr(FIELD field, void usrptr)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	922 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	923 T((T_CALLED("set_field_userptr(%p,%p)"), (void )field, (void )usrptr));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	924 @@ -62,7 +62,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	925 \| Return Values : Value of pointer. If no such pointer has been set,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	926 \| NULL is returned
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	927 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	928 -NCURSES_EXPORT(void *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	929 +NCFORM_EXPORT(void *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	930 field_userptr(const FIELD *field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	931 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	932 T((T_CALLED("field_userptr(%p)"), (const void *)field));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	933 diff -ur ncurses-5.9-orig/form/form.h ncurses-5.9/form/form.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	934 --- ncurses-5.9-orig/form/form.h 2009-11-07 14:31:11 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	935 +++ ncurses-5.9/form/form.h 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	936 @@ -287,132 +287,132 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	937 /*************************
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	938 * standard field types *
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	939 *************************/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	940 -extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ALPHA;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	941 -extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ALNUM;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	942 -extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ENUM;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	943 -extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_INTEGER;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	944 -extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_NUMERIC;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	945 -extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_REGEXP;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	946 +extern NCFORM_EXPORT_VAR(FIELDTYPE *) TYPE_ALPHA;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	947 +extern NCFORM_EXPORT_VAR(FIELDTYPE *) TYPE_ALNUM;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	948 +extern NCFORM_EXPORT_VAR(FIELDTYPE *) TYPE_ENUM;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	949 +extern NCFORM_EXPORT_VAR(FIELDTYPE *) TYPE_INTEGER;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	950 +extern NCFORM_EXPORT_VAR(FIELDTYPE *) TYPE_NUMERIC;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	951 +extern NCFORM_EXPORT_VAR(FIELDTYPE *) TYPE_REGEXP;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	952
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	953 /************************************
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	954 * built-in additional field types *
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	955 * They are not defined in SVr4 *
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	956 ************************************/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	957 -extern NCURSES_EXPORT_VAR(FIELDTYPE ) TYPE_IPV4; / Internet IP Version 4 address */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	958 +extern NCFORM_EXPORT_VAR(FIELDTYPE ) TYPE_IPV4; / Internet IP Version 4 address */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	959
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	960 /***********************
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	961 * FIELDTYPE routines *
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	962 ***********************/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	963 -extern NCURSES_EXPORT(FIELDTYPE *) new_fieldtype (
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	964 +extern NCFORM_EXPORT(FIELDTYPE *) new_fieldtype (
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	965 bool (* const field_check)(FIELD ,const void ),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	966 bool (* const char_check)(int,const void *));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	967 -extern NCURSES_EXPORT(FIELDTYPE *) link_fieldtype(
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	968 +extern NCFORM_EXPORT(FIELDTYPE *) link_fieldtype(
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	969 FIELDTYPE , FIELDTYPE );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	970
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	971 -extern NCURSES_EXPORT(int) free_fieldtype (FIELDTYPE *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	972 -extern NCURSES_EXPORT(int) set_fieldtype_arg (FIELDTYPE *,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	973 +extern NCFORM_EXPORT(int) free_fieldtype (FIELDTYPE *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	974 +extern NCFORM_EXPORT(int) set_fieldtype_arg (FIELDTYPE *,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	975 void * (* const make_arg)(va_list *),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	976 void * (* const copy_arg)(const void *),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	977 void (* const free_arg)(void *));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	978 -extern NCURSES_EXPORT(int) set_fieldtype_choice (FIELDTYPE *,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	979 +extern NCFORM_EXPORT(int) set_fieldtype_choice (FIELDTYPE *,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	980 bool (* const next_choice)(FIELD ,const void ),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	981 bool (* const prev_choice)(FIELD ,const void ));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	982
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	983 /*******************
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	984 * FIELD routines *
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	985 *******************/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	986 -extern NCURSES_EXPORT(FIELD *) new_field (int,int,int,int,int,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	987 -extern NCURSES_EXPORT(FIELD ) dup_field (FIELD ,int,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	988 -extern NCURSES_EXPORT(FIELD ) link_field (FIELD ,int,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	989 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	990 -extern NCURSES_EXPORT(int) free_field (FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	991 -extern NCURSES_EXPORT(int) field_info (const FIELD ,int ,int ,int ,int ,int ,int *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	992 -extern NCURSES_EXPORT(int) dynamic_field_info (const FIELD ,int ,int ,int );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	993 -extern NCURSES_EXPORT(int) set_max_field ( FIELD *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	994 -extern NCURSES_EXPORT(int) move_field (FIELD *,int,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	995 -extern NCURSES_EXPORT(int) set_field_type (FIELD ,FIELDTYPE ,...);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	996 -extern NCURSES_EXPORT(int) set_new_page (FIELD *,bool);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	997 -extern NCURSES_EXPORT(int) set_field_just (FIELD *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	998 -extern NCURSES_EXPORT(int) field_just (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	999 -extern NCURSES_EXPORT(int) set_field_fore (FIELD *,chtype);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1000 -extern NCURSES_EXPORT(int) set_field_back (FIELD *,chtype);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1001 -extern NCURSES_EXPORT(int) set_field_pad (FIELD *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1002 -extern NCURSES_EXPORT(int) field_pad (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1003 -extern NCURSES_EXPORT(int) set_field_buffer (FIELD ,int,const char );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1004 -extern NCURSES_EXPORT(int) set_field_status (FIELD *,bool);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1005 -extern NCURSES_EXPORT(int) set_field_userptr (FIELD , void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1006 -extern NCURSES_EXPORT(int) set_field_opts (FIELD *,Field_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1007 -extern NCURSES_EXPORT(int) field_opts_on (FIELD *,Field_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1008 -extern NCURSES_EXPORT(int) field_opts_off (FIELD *,Field_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1009 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1010 -extern NCURSES_EXPORT(chtype) field_fore (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1011 -extern NCURSES_EXPORT(chtype) field_back (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1012 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1013 -extern NCURSES_EXPORT(bool) new_page (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1014 -extern NCURSES_EXPORT(bool) field_status (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1015 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1016 -extern NCURSES_EXPORT(void ) field_arg (const FIELD );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1017 +extern NCFORM_EXPORT(FIELD *) new_field (int,int,int,int,int,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1018 +extern NCFORM_EXPORT(FIELD ) dup_field (FIELD ,int,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1019 +extern NCFORM_EXPORT(FIELD ) link_field (FIELD ,int,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1020 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1021 +extern NCFORM_EXPORT(int) free_field (FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1022 +extern NCFORM_EXPORT(int) field_info (const FIELD ,int ,int ,int ,int ,int ,int *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1023 +extern NCFORM_EXPORT(int) dynamic_field_info (const FIELD ,int ,int ,int );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1024 +extern NCFORM_EXPORT(int) set_max_field ( FIELD *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1025 +extern NCFORM_EXPORT(int) move_field (FIELD *,int,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1026 +extern NCFORM_EXPORT(int) set_field_type (FIELD ,FIELDTYPE ,...);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1027 +extern NCFORM_EXPORT(int) set_new_page (FIELD *,bool);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1028 +extern NCFORM_EXPORT(int) set_field_just (FIELD *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1029 +extern NCFORM_EXPORT(int) field_just (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1030 +extern NCFORM_EXPORT(int) set_field_fore (FIELD *,chtype);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1031 +extern NCFORM_EXPORT(int) set_field_back (FIELD *,chtype);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1032 +extern NCFORM_EXPORT(int) set_field_pad (FIELD *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1033 +extern NCFORM_EXPORT(int) field_pad (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1034 +extern NCFORM_EXPORT(int) set_field_buffer (FIELD ,int,const char );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1035 +extern NCFORM_EXPORT(int) set_field_status (FIELD *,bool);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1036 +extern NCFORM_EXPORT(int) set_field_userptr (FIELD , void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1037 +extern NCFORM_EXPORT(int) set_field_opts (FIELD *,Field_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1038 +extern NCFORM_EXPORT(int) field_opts_on (FIELD *,Field_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1039 +extern NCFORM_EXPORT(int) field_opts_off (FIELD *,Field_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1040 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1041 +extern NCFORM_EXPORT(chtype) field_fore (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1042 +extern NCFORM_EXPORT(chtype) field_back (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1043 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1044 +extern NCFORM_EXPORT(bool) new_page (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1045 +extern NCFORM_EXPORT(bool) field_status (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1046 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1047 +extern NCFORM_EXPORT(void ) field_arg (const FIELD );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1048
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1049 -extern NCURSES_EXPORT(void ) field_userptr (const FIELD );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1050 +extern NCFORM_EXPORT(void ) field_userptr (const FIELD );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1051
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1052 -extern NCURSES_EXPORT(FIELDTYPE ) field_type (const FIELD );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1053 +extern NCFORM_EXPORT(FIELDTYPE ) field_type (const FIELD );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1054
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1055 -extern NCURSES_EXPORT(char ) field_buffer (const FIELD ,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1056 +extern NCFORM_EXPORT(char ) field_buffer (const FIELD ,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1057
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1058 -extern NCURSES_EXPORT(Field_Options) field_opts (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1059 +extern NCFORM_EXPORT(Field_Options) field_opts (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1060
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1061 /******************
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1062 * FORM routines *
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1063 ******************/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1064
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1065 -extern NCURSES_EXPORT(FORM ) new_form (FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1066 +extern NCFORM_EXPORT(FORM ) new_form (FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1067
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1068 -extern NCURSES_EXPORT(FIELD *) form_fields (const FORM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1069 -extern NCURSES_EXPORT(FIELD ) current_field (const FORM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1070 +extern NCFORM_EXPORT(FIELD *) form_fields (const FORM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1071 +extern NCFORM_EXPORT(FIELD ) current_field (const FORM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1072
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1073 -extern NCURSES_EXPORT(WINDOW ) form_win (const FORM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1074 -extern NCURSES_EXPORT(WINDOW ) form_sub (const FORM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1075 +extern NCFORM_EXPORT(WINDOW ) form_win (const FORM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1076 +extern NCFORM_EXPORT(WINDOW ) form_sub (const FORM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1077
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1078 -extern NCURSES_EXPORT(Form_Hook) form_init (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1079 -extern NCURSES_EXPORT(Form_Hook) form_term (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1080 -extern NCURSES_EXPORT(Form_Hook) field_init (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1081 -extern NCURSES_EXPORT(Form_Hook) field_term (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1082 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1083 -extern NCURSES_EXPORT(int) free_form (FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1084 -extern NCURSES_EXPORT(int) set_form_fields (FORM ,FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1085 -extern NCURSES_EXPORT(int) field_count (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1086 -extern NCURSES_EXPORT(int) set_form_win (FORM ,WINDOW );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1087 -extern NCURSES_EXPORT(int) set_form_sub (FORM ,WINDOW );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1088 -extern NCURSES_EXPORT(int) set_current_field (FORM ,FIELD );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1089 -extern NCURSES_EXPORT(int) field_index (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1090 -extern NCURSES_EXPORT(int) set_form_page (FORM *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1091 -extern NCURSES_EXPORT(int) form_page (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1092 -extern NCURSES_EXPORT(int) scale_form (const FORM ,int ,int *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1093 -extern NCURSES_EXPORT(int) set_form_init (FORM *,Form_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1094 -extern NCURSES_EXPORT(int) set_form_term (FORM *,Form_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1095 -extern NCURSES_EXPORT(int) set_field_init (FORM *,Form_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1096 -extern NCURSES_EXPORT(int) set_field_term (FORM *,Form_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1097 -extern NCURSES_EXPORT(int) post_form (FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1098 -extern NCURSES_EXPORT(int) unpost_form (FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1099 -extern NCURSES_EXPORT(int) pos_form_cursor (FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1100 -extern NCURSES_EXPORT(int) form_driver (FORM *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1101 -extern NCURSES_EXPORT(int) set_form_userptr (FORM ,void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1102 -extern NCURSES_EXPORT(int) set_form_opts (FORM *,Form_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1103 -extern NCURSES_EXPORT(int) form_opts_on (FORM *,Form_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1104 -extern NCURSES_EXPORT(int) form_opts_off (FORM *,Form_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1105 -extern NCURSES_EXPORT(int) form_request_by_name (const char *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1106 +extern NCFORM_EXPORT(Form_Hook) form_init (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1107 +extern NCFORM_EXPORT(Form_Hook) form_term (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1108 +extern NCFORM_EXPORT(Form_Hook) field_init (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1109 +extern NCFORM_EXPORT(Form_Hook) field_term (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1110 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1111 +extern NCFORM_EXPORT(int) free_form (FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1112 +extern NCFORM_EXPORT(int) set_form_fields (FORM ,FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1113 +extern NCFORM_EXPORT(int) field_count (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1114 +extern NCFORM_EXPORT(int) set_form_win (FORM ,WINDOW );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1115 +extern NCFORM_EXPORT(int) set_form_sub (FORM ,WINDOW );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1116 +extern NCFORM_EXPORT(int) set_current_field (FORM ,FIELD );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1117 +extern NCFORM_EXPORT(int) field_index (const FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1118 +extern NCFORM_EXPORT(int) set_form_page (FORM *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1119 +extern NCFORM_EXPORT(int) form_page (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1120 +extern NCFORM_EXPORT(int) scale_form (const FORM ,int ,int *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1121 +extern NCFORM_EXPORT(int) set_form_init (FORM *,Form_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1122 +extern NCFORM_EXPORT(int) set_form_term (FORM *,Form_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1123 +extern NCFORM_EXPORT(int) set_field_init (FORM *,Form_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1124 +extern NCFORM_EXPORT(int) set_field_term (FORM *,Form_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1125 +extern NCFORM_EXPORT(int) post_form (FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1126 +extern NCFORM_EXPORT(int) unpost_form (FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1127 +extern NCFORM_EXPORT(int) pos_form_cursor (FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1128 +extern NCFORM_EXPORT(int) form_driver (FORM *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1129 +extern NCFORM_EXPORT(int) set_form_userptr (FORM ,void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1130 +extern NCFORM_EXPORT(int) set_form_opts (FORM *,Form_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1131 +extern NCFORM_EXPORT(int) form_opts_on (FORM *,Form_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1132 +extern NCFORM_EXPORT(int) form_opts_off (FORM *,Form_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1133 +extern NCFORM_EXPORT(int) form_request_by_name (const char *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1134
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1135 -extern NCURSES_EXPORT(const char *) form_request_name (int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1136 +extern NCFORM_EXPORT(const char *) form_request_name (int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1137
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1138 -extern NCURSES_EXPORT(void ) form_userptr (const FORM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1139 +extern NCFORM_EXPORT(void ) form_userptr (const FORM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1140
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1141 -extern NCURSES_EXPORT(Form_Options) form_opts (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1142 +extern NCFORM_EXPORT(Form_Options) form_opts (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1143
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1144 -extern NCURSES_EXPORT(bool) data_ahead (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1145 -extern NCURSES_EXPORT(bool) data_behind (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1146 +extern NCFORM_EXPORT(bool) data_ahead (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1147 +extern NCFORM_EXPORT(bool) data_behind (const FORM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1148
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1149 #if NCURSES_SP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1150 -extern NCURSES_EXPORT(FORM ) NCURSES_SP_NAME(new_form) (SCREEN, FIELD **);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1151 +extern NCFORM_EXPORT(FORM ) NCURSES_SP_NAME(new_form) (SCREEN, FIELD **);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1152 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1153
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1154 #ifdef __cplusplus
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1155 diff -ur ncurses-5.9-orig/form/form.priv.h ncurses-5.9/form/form.priv.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1156 --- ncurses-5.9-orig/form/form.priv.h 2009-11-07 16:26:43 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1157 +++ ncurses-5.9/form/form.priv.h 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1158 @@ -65,9 +65,9 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1159 /***********************
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1160 * Default objects *
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1161 ***********************/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1162 -extern NCURSES_EXPORT_VAR(FORM *) _nc_Default_Form;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1163 -extern NCURSES_EXPORT_VAR(FIELD *) _nc_Default_Field;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1164 -extern NCURSES_EXPORT_VAR(FIELDTYPE *) _nc_Default_FieldType;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1165 +extern NCFORM_EXPORT_VAR(FORM *) _nc_Default_Form;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1166 +extern NCFORM_EXPORT_VAR(FIELD *) _nc_Default_Field;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1167 +extern NCFORM_EXPORT_VAR(FIELDTYPE *) _nc_Default_FieldType;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1168
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1169 /* form status values */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1170 #define _OVLMODE (0x04U) /* Form is in overlay mode */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1171 @@ -163,31 +163,31 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1172
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1173 #define C_ZEROS '\0'
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1174
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1175 -extern NCURSES_EXPORT(TypeArgument ) _nc_Make_Argument (const FIELDTYPE, va_list, int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1176 -extern NCURSES_EXPORT(TypeArgument ) _nc_Copy_Argument (const FIELDTYPE, const TypeArgument, int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1177 -extern NCURSES_EXPORT(void) _nc_Free_Argument (const FIELDTYPE, TypeArgument);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1178 -extern NCURSES_EXPORT(bool) _nc_Copy_Type (FIELD, FIELD const );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1179 -extern NCURSES_EXPORT(void) _nc_Free_Type (FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1180 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1181 -extern NCURSES_EXPORT(int) _nc_Synchronize_Attributes (FIELD*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1182 -extern NCURSES_EXPORT(int) _nc_Synchronize_Options (FIELD*, Field_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1183 -extern NCURSES_EXPORT(int) _nc_Set_Form_Page (FORM, int, FIELD);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1184 -extern NCURSES_EXPORT(int) _nc_Refresh_Current_Field (FORM*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1185 -extern NCURSES_EXPORT(FIELD ) _nc_First_Active_Field (FORM);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1186 -extern NCURSES_EXPORT(bool) _nc_Internal_Validation (FORM*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1187 -extern NCURSES_EXPORT(int) _nc_Set_Current_Field (FORM, FIELD);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1188 -extern NCURSES_EXPORT(int) _nc_Position_Form_Cursor (FORM*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1189 +extern NCFORM_EXPORT(TypeArgument ) _nc_Make_Argument (const FIELDTYPE, va_list, int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1190 +extern NCFORM_EXPORT(TypeArgument ) _nc_Copy_Argument (const FIELDTYPE, const TypeArgument, int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1191 +extern NCFORM_EXPORT(void) _nc_Free_Argument (const FIELDTYPE, TypeArgument);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1192 +extern NCFORM_EXPORT(bool) _nc_Copy_Type (FIELD, FIELD const );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1193 +extern NCFORM_EXPORT(void) _nc_Free_Type (FIELD *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1194 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1195 +extern NCFORM_EXPORT(int) _nc_Synchronize_Attributes (FIELD*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1196 +extern NCFORM_EXPORT(int) _nc_Synchronize_Options (FIELD*, Field_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1197 +extern NCFORM_EXPORT(int) _nc_Set_Form_Page (FORM, int, FIELD);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1198 +extern NCFORM_EXPORT(int) _nc_Refresh_Current_Field (FORM*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1199 +extern NCFORM_EXPORT(FIELD ) _nc_First_Active_Field (FORM);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1200 +extern NCFORM_EXPORT(bool) _nc_Internal_Validation (FORM*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1201 +extern NCFORM_EXPORT(int) _nc_Set_Current_Field (FORM, FIELD);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1202 +extern NCFORM_EXPORT(int) _nc_Position_Form_Cursor (FORM*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1203
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1204 #if NCURSES_INTEROP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1205 -extern NCURSES_EXPORT(FIELDTYPE *) _nc_TYPE_INTEGER(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1206 -extern NCURSES_EXPORT(FIELDTYPE *) _nc_TYPE_ALNUM(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1207 -extern NCURSES_EXPORT(FIELDTYPE *) _nc_TYPE_ALPHA(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1208 -extern NCURSES_EXPORT(FIELDTYPE *) _nc_TYPE_ENUM(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1209 -extern NCURSES_EXPORT(FIELDTYPE *) _nc_TYPE_NUMERIC(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1210 -extern NCURSES_EXPORT(FIELDTYPE *) _nc_TYPE_REGEXP(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1211 -extern NCURSES_EXPORT(FIELDTYPE *) _nc_TYPE_IPV4(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1212 +extern NCFORM_EXPORT(FIELDTYPE *) _nc_TYPE_INTEGER(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1213 +extern NCFORM_EXPORT(FIELDTYPE *) _nc_TYPE_ALNUM(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1214 +extern NCFORM_EXPORT(FIELDTYPE *) _nc_TYPE_ALPHA(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1215 +extern NCFORM_EXPORT(FIELDTYPE *) _nc_TYPE_ENUM(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1216 +extern NCFORM_EXPORT(FIELDTYPE *) _nc_TYPE_NUMERIC(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1217 +extern NCFORM_EXPORT(FIELDTYPE *) _nc_TYPE_REGEXP(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1218 +extern NCFORM_EXPORT(FIELDTYPE *) _nc_TYPE_IPV4(void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1219
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1220 -extern NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1221 +extern NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1222 _nc_generic_fieldtype(bool (const field_check) (FORM,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1223 FIELD *,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1224 const void *),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1225 @@ -198,18 +198,18 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1226 bool (const next)(FORM,FIELD,const void),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1227 bool (const prev)(FORM,FIELD,const void),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1228 void (freecallback)(void));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1229 -extern NCURSES_EXPORT(int) _nc_set_generic_fieldtype(FIELD, FIELDTYPE, int ()(void*));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1230 -extern NCURSES_EXPORT(WINDOW) _nc_form_cursor(const FORM , int* , int* );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1231 +extern NCFORM_EXPORT(int) _nc_set_generic_fieldtype(FIELD, FIELDTYPE, int ()(void*));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1232 +extern NCFORM_EXPORT(WINDOW) _nc_form_cursor(const FORM , int* , int* );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1233
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1234 #define INIT_FT_FUNC(func) {func}
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1235 #else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1236 #define INIT_FT_FUNC(func) func
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1237 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1238
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1239 -extern NCURSES_EXPORT(void) _nc_get_fieldbuffer(FORM, FIELD, FIELD_CELL*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1240 +extern NCFORM_EXPORT(void) _nc_get_fieldbuffer(FORM, FIELD, FIELD_CELL*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1241
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1242 #if USE_WIDEC_SUPPORT
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1243 -extern NCURSES_EXPORT(wchar_t ) _nc_Widen_String(char , int *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1244 +extern NCFORM_EXPORT(wchar_t ) _nc_Widen_String(char , int *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1245 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1246
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1247 #ifdef TRACE
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1248 @@ -220,11 +220,11 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1249 #define returnFieldType(code) TRACE_RETURN(code,field_type)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1250 #define returnFormHook(code) TRACE_RETURN(code,form_hook)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1251
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1252 -extern NCURSES_EXPORT(FIELD ) _nc_retrace_field_ptr (FIELD );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1253 -extern NCURSES_EXPORT(FIELD ) _nc_retrace_field (FIELD );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1254 -extern NCURSES_EXPORT(FIELDTYPE ) _nc_retrace_field_type (FIELDTYPE );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1255 -extern NCURSES_EXPORT(FORM ) _nc_retrace_form (FORM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1256 -extern NCURSES_EXPORT(Form_Hook) _nc_retrace_form_hook (Form_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1257 +extern NCFORM_EXPORT(FIELD ) _nc_retrace_field_ptr (FIELD );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1258 +extern NCFORM_EXPORT(FIELD ) _nc_retrace_field (FIELD );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1259 +extern NCFORM_EXPORT(FIELDTYPE ) _nc_retrace_field_type (FIELDTYPE );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1260 +extern NCFORM_EXPORT(FORM ) _nc_retrace_form (FORM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1261 +extern NCFORM_EXPORT(Form_Hook) _nc_retrace_form_hook (Form_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1262
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1263 #else /* !TRACE */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1264
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1265 diff -ur ncurses-5.9-orig/form/frm_cursor.c ncurses-5.9/form/frm_cursor.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1266 --- ncurses-5.9-orig/form/frm_cursor.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1267 +++ ncurses-5.9/form/frm_cursor.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1268 @@ -48,7 +48,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1269 \| E_BAD_ARGUMENT - Invalid form pointer
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1270 \| E_NOT_POSTED - Form is not posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1271 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1272 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1273 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1274 pos_form_cursor(FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1275 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1276 int res;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1277 diff -ur ncurses-5.9-orig/form/frm_data.c ncurses-5.9/form/frm_data.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1278 --- ncurses-5.9-orig/form/frm_data.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1279 +++ ncurses-5.9/form/frm_data.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1280 @@ -44,7 +44,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1281 \| Return Values : TRUE - there are off-screen data behind
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1282 \| FALSE - there are no off-screen data behind
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1283 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1284 -NCURSES_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1285 +NCFORM_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1286 data_behind(const FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1287 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1288 bool result = FALSE;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1289 @@ -131,7 +131,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1290 \| Return Values : TRUE - there are off-screen data ahead
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1291 \| FALSE - there are no off-screen data ahead
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1292 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1293 -NCURSES_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1294 +NCFORM_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1295 data_ahead(const FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1296 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1297 bool result = FALSE;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1298 diff -ur ncurses-5.9-orig/form/frm_def.c ncurses-5.9/form/frm_def.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1299 --- ncurses-5.9-orig/form/frm_def.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1300 +++ ncurses-5.9/form/frm_def.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1301 @@ -61,7 +61,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1302 NULL /* fieldterm */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1303 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1304
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1305 -NCURSES_EXPORT_VAR(FORM *) _nc_Default_Form = &default_form;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1306 +NCFORM_EXPORT_VAR(FORM *) _nc_Default_Form = &default_form;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1307
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1308 /*---------------------------------------------------------------------------
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1309 \| Facility : libnform
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1310 @@ -294,7 +294,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1311 \| E_CONNECTED - a field is already connected
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1312 \| E_SYSTEM_ERROR - not enough memory
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1313 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1314 -NCURSES_EXPORT(FORM *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1315 +NCFORM_EXPORT(FORM *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1316 NCURSES_SP_NAME(new_form) (NCURSES_SP_DCLx FIELD **fields)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1317 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1318 int err = E_SYSTEM_ERROR;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1319 @@ -343,7 +343,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1320 \| E_SYSTEM_ERROR - not enough memory
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1321 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1322 #if NCURSES_SP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1323 -NCURSES_EXPORT(FORM *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1324 +NCFORM_EXPORT(FORM *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1325 new_form(FIELD **fields)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1326 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1327 return NCURSES_SP_NAME(new_form) (CURRENT_SCREEN, fields);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1328 @@ -360,7 +360,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1329 \| E_BAD_ARGUMENT - invalid form pointer
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1330 \| E_POSTED - form is posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1331 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1332 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1333 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1334 free_form(FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1335 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1336 T((T_CALLED("free_form(%p)"), (void *)form));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1337 @@ -391,7 +391,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1338 \| E_POSTED - form is posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1339 \| E_SYSTEM_ERROR - not enough memory
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1340 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1341 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1342 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1343 set_form_fields(FORM form, FIELD *fields)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1344 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1345 FIELD **old;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1346 @@ -422,7 +422,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1347 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1348 \| Return Values : Pointer to field array
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1349 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1350 -NCURSES_EXPORT(FIELD **)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1351 +NCFORM_EXPORT(FIELD **)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1352 form_fields(const FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1353 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1354 T((T_CALLED("form_field(%p)"), (const void *)form));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1355 @@ -437,7 +437,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1356 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1357 \| Return Values : Number of fields, -1 if none are defined
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1358 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1359 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1360 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1361 field_count(const FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1362 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1363 T((T_CALLED("field_count(%p)"), (const void *)form));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1364 diff -ur ncurses-5.9-orig/form/frm_driver.c ncurses-5.9/form/frm_driver.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1365 --- ncurses-5.9-orig/form/frm_driver.c 2010-05-01 17:11:43 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1366 +++ ncurses-5.9/form/frm_driver.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1367 @@ -524,7 +524,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1368 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1369 \| Return Values : -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1370 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1371 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1372 +NCFORM_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1373 _nc_get_fieldbuffer(FORM form, FIELD field, FIELD_CELL *buf)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1374 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1375 int pad;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1376 @@ -802,7 +802,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1377 \| E_SYSTEM_ERROR - form has no current field or
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1378 \| field-window
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1379 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1380 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1381 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1382 _nc_Position_Form_Cursor(FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1383 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1384 FIELD *field;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1385 @@ -843,7 +843,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1386 \| E_BAD_ARGUMENT - invalid form pointer
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1387 \| E_SYSTEM_ERROR - general error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1388 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1389 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1390 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1391 _nc_Refresh_Current_Field(FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1392 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1393 WINDOW *formwin;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1394 @@ -1233,7 +1233,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1395 \| E_BAD_ARGUMENT - invalid field pointer
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1396 \| E_SYSTEM_ERROR - some severe basic error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1397 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1398 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1399 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1400 _nc_Synchronize_Attributes(FIELD *field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1401 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1402 FORM *form;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1403 @@ -1299,7 +1299,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1404 \| E_CURRENT - field is the current one
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1405 \| E_SYSTEM_ERROR - some severe basic error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1406 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1407 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1408 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1409 _nc_Synchronize_Options(FIELD *field, Field_Options newopts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1410 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1411 Field_Options oldopts;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1412 @@ -1401,7 +1401,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1413 \| E_SYSTEM_ERROR - some severe basic error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1414 \| E_NOT_CONNECTED - no fields are connected to the form
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1415 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1416 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1417 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1418 _nc_Set_Current_Field(FORM form, FIELD newfield)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1419 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1420 FIELD *field;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1421 @@ -3159,7 +3159,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1422 \| Return Values : TRUE - field is valid
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1423 \| FALSE - field is invalid
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1424 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1425 -NCURSES_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1426 +NCFORM_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1427 _nc_Internal_Validation(FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1428 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1429 FIELD *field;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1430 @@ -3253,7 +3253,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1431 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1432 \| Return Values : Pointer to calculated field.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1433 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1434 -NCURSES_EXPORT(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1435 +NCFORM_EXPORT(FIELD *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1436 _nc_First_Active_Field(FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1437 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1438 FIELD **last_on_page = &form->field[form->page[form->curpage].pmax];
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1439 @@ -3806,7 +3806,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1440 \| E_BAD_ARGUMENT - invalid field pointer
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1441 \| E_SYSTEM_ERROR - some severe basic error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1442 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1443 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1444 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1445 _nc_Set_Form_Page(FORM form, int page, FIELD field)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1446 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1447 int res = E_OK;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1448 @@ -4193,7 +4193,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1449 \| E_NOT_CONNECTED - no fields are connected to the form
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1450 \| E_UNKNOWN_COMMAND - command not known
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1451 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1452 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1453 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1454 form_driver(FORM *form, int c)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1455 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1456 const Binding_Info BI = (Binding_Info ) 0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1457 @@ -4384,7 +4384,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1458 \| E_BAD_ARGUMENT - invalid argument
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1459 \| E_SYSTEM_ERROR - system error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1460 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1461 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1462 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1463 set_field_buffer(FIELD field, int buffer, const char value)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1464 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1465 FIELD_CELL *p;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1466 @@ -4501,7 +4501,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1467 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1468 \| Return Values : Pointer to buffer or NULL if arguments were invalid.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1469 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1470 -NCURSES_EXPORT(char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1471 +NCFORM_EXPORT(char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1472 field_buffer(const FIELD *field, int buffer)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1473 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1474 char *result = 0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1475 @@ -4569,7 +4569,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1476 \| Convert a multibyte string to a wide-character string. The result must be
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1477 \| freed by the caller.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1478 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1479 -NCURSES_EXPORT(wchar_t *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1480 +NCFORM_EXPORT(wchar_t *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1481 _nc_Widen_String(char source, int lengthp)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1482 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1483 wchar_t *result = 0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1484 diff -ur ncurses-5.9-orig/form/frm_hook.c ncurses-5.9/form/frm_hook.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1485 --- ncurses-5.9-orig/form/frm_hook.c 2010-01-23 16:12:08 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1486 +++ ncurses-5.9/form/frm_hook.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1487 @@ -36,7 +36,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1488
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1489 /* "Template" macro to generate function to set application specific hook */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1490 #define GEN_HOOK_SET_FUNCTION( typ, name ) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1491 -NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (FORM *form, Form_Hook func)\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1492 +NCFORM_IMPEXP int NCFORM_API set_ ## typ ## _ ## name (FORM *form, Form_Hook func)\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1493 {\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1494 T((T_CALLED("set_" #typ"_"#name"(%p,%p)"), form, func));\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1495 (Normalize_Form( form ) -> typ ## name) = func ;\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1496 @@ -45,7 +45,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1497
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1498 /* "Template" macro to generate function to get application specific hook */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1499 #define GEN_HOOK_GET_FUNCTION( typ, name ) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1500 -NCURSES_IMPEXP Form_Hook NCURSES_API typ ## _ ## name ( const FORM *form )\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1501 +NCFORM_IMPEXP Form_Hook NCFORM_API typ ## _ ## name ( const FORM *form )\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1502 {\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1503 T((T_CALLED(#typ "_" #name "(%p)"), (const void *) form));\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1504 returnFormHook( Normalize_Form( form ) -> typ ## name );\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1505 diff -ur ncurses-5.9-orig/form/frm_opts.c ncurses-5.9/form/frm_opts.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1506 --- ncurses-5.9-orig/form/frm_opts.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1507 +++ ncurses-5.9/form/frm_opts.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1508 @@ -44,7 +44,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1509 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1510 \| E_BAD_ARGUMENT - invalid options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1511 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1512 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1513 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1514 set_form_opts(FORM *form, Form_Options opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1515 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1516 T((T_CALLED("set_form_opts(%p,%d)"), (void *)form, opts));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1517 @@ -67,7 +67,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1518 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1519 \| Return Values : The option flags.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1520 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1521 -NCURSES_EXPORT(Form_Options)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1522 +NCFORM_EXPORT(Form_Options)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1523 form_opts(const FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1524 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1525 T((T_CALLED("form_opts(%p)"), (const void *)form));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1526 @@ -84,7 +84,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1527 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1528 \| E_BAD_ARGUMENT - invalid options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1529 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1530 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1531 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1532 form_opts_on(FORM *form, Form_Options opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1533 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1534 T((T_CALLED("form_opts_on(%p,%d)"), (void *)form, opts));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1535 @@ -109,7 +109,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1536 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1537 \| E_BAD_ARGUMENT - invalid options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1538 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1539 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1540 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1541 form_opts_off(FORM *form, Form_Options opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1542 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1543 T((T_CALLED("form_opts_off(%p,%d)"), (void *)form, opts));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1544 diff -ur ncurses-5.9-orig/form/frm_page.c ncurses-5.9/form/frm_page.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1545 --- ncurses-5.9-orig/form/frm_page.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1546 +++ ncurses-5.9/form/frm_page.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1547 @@ -46,7 +46,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1548 \| E_INVALID_FIELD - current field can't be left
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1549 \| E_SYSTEM_ERROR - system error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1550 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1551 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1552 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1553 set_form_page(FORM *form, int page)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1554 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1555 int err = E_OK;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1556 @@ -95,7 +95,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1557 \| Return Values : >= 0 : current page number
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1558 \| -1 : invalid form pointer
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1559 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1560 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1561 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1562 form_page(const FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1563 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1564 T((T_CALLED("form_page(%p)"), (const void *)form));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1565 diff -ur ncurses-5.9-orig/form/frm_post.c ncurses-5.9/form/frm_post.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1566 --- ncurses-5.9-orig/form/frm_post.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1567 +++ ncurses-5.9/form/frm_post.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1568 @@ -47,7 +47,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1569 \| E_NO_ROOM - form doesn't fit into subwindow
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1570 \| E_SYSTEM_ERROR - system error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1571 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1572 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1573 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1574 post_form(FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1575 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1576 WINDOW *formwin;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1577 @@ -97,7 +97,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1578 \| E_NOT_POSTED - form isn't posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1579 \| E_BAD_STATE - called from a hook routine
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1580 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1581 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1582 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1583 unpost_form(FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1584 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1585 T((T_CALLED("unpost_form(%p)"), (void *)form));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1586 diff -ur ncurses-5.9-orig/form/frm_req_name.c ncurses-5.9/form/frm_req_name.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1587 --- ncurses-5.9-orig/form/frm_req_name.c 2009-10-10 12:17:01 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1588 +++ ncurses-5.9/form/frm_req_name.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1589 @@ -115,7 +115,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1590 \| Return Values : Pointer to name - on success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1591 \| NULL - on invalid request code
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1592 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1593 -NCURSES_EXPORT(const char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1594 +NCFORM_EXPORT(const char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1595 form_request_name(int request)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1596 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1597 T((T_CALLED("form_request_name(%d)"), request));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1598 @@ -138,7 +138,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1599 \| Return Values : Request Id - on success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1600 \| E_NO_MATCH - request not found
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1601 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1602 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1603 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1604 form_request_by_name(const char *str)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1605 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1606 /* because the table is so small, it doesn't really hurt
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1607 diff -ur ncurses-5.9-orig/form/frm_scale.c ncurses-5.9/form/frm_scale.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1608 --- ncurses-5.9-orig/form/frm_scale.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1609 +++ ncurses-5.9/form/frm_scale.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1610 @@ -44,7 +44,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1611 \| E_BAD_ARGUMENT - invalid form pointer
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1612 \| E_NOT_CONNECTED - no fields connected to form
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1613 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1614 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1615 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1616 scale_form(const FORM form, int rows, int *cols)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1617 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1618 T((T_CALLED("scale_form(%p,%p,%p)"),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1619 diff -ur ncurses-5.9-orig/form/frm_sub.c ncurses-5.9/form/frm_sub.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1620 --- ncurses-5.9-orig/form/frm_sub.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1621 +++ ncurses-5.9/form/frm_sub.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1622 @@ -43,7 +43,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1623 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1624 \| E_POSTED - form is posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1625 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1626 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1627 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1628 set_form_sub(FORM form, WINDOW win)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1629 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1630 T((T_CALLED("set_form_sub(%p,%p)"), (void )form, (void )win));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1631 @@ -72,7 +72,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1632 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1633 \| Return Values : The pointer to the Subwindow.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1634 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1635 -NCURSES_EXPORT(WINDOW *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1636 +NCFORM_EXPORT(WINDOW *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1637 form_sub(const FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1638 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1639 const FORM *f;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1640 diff -ur ncurses-5.9-orig/form/frm_user.c ncurses-5.9/form/frm_user.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1641 --- ncurses-5.9-orig/form/frm_user.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1642 +++ ncurses-5.9/form/frm_user.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1643 @@ -43,7 +43,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1644 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1645 \| Return Values : E_OK - on success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1646 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1647 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1648 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1649 set_form_userptr(FORM form, void usrptr)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1650 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1651 T((T_CALLED("set_form_userptr(%p,%p)"), (void )form, (void )usrptr));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1652 @@ -62,7 +62,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1653 \| Return Values : Value of pointer. If no such pointer has been set,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1654 \| NULL is returned
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1655 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1656 -NCURSES_EXPORT(void *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1657 +NCFORM_EXPORT(void *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1658 form_userptr(const FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1659 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1660 T((T_CALLED("form_userptr(%p)"), (const void *)form));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1661 diff -ur ncurses-5.9-orig/form/frm_win.c ncurses-5.9/form/frm_win.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1662 --- ncurses-5.9-orig/form/frm_win.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1663 +++ ncurses-5.9/form/frm_win.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1664 @@ -43,7 +43,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1665 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1666 \| E_POSTED - form is posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1667 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1668 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1669 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1670 set_form_win(FORM form, WINDOW win)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1671 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1672 T((T_CALLED("set_form_win(%p,%p)"), (void )form, (void )win));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1673 @@ -72,7 +72,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1674 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1675 \| Return Values : The pointer to the Window or stdscr if there is none.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1676 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1677 -NCURSES_EXPORT(WINDOW *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1678 +NCFORM_EXPORT(WINDOW *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1679 form_win(const FORM *form)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1680 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1681 WINDOW *result;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1682 diff -ur ncurses-5.9-orig/form/fty_alnum.c ncurses-5.9/form/fty_alnum.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1683 --- ncurses-5.9-orig/form/fty_alnum.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1684 +++ ncurses-5.9/form/fty_alnum.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1685 @@ -185,14 +185,14 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1686 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1687 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1688
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1689 -NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_ALNUM = &typeTHIS;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1690 +NCFORM_EXPORT_VAR(FIELDTYPE*) TYPE_ALNUM = &typeTHIS;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1691
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1692 #if NCURSES_INTEROP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1693 /* The next routines are to simplify the use of ncurses from
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1694 programming languages with restictions on interop with C level
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1695 constructs (e.g. variable access or va_list + ellipsis constructs)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1696 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1697 -NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1698 +NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1699 _nc_TYPE_ALNUM(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1700 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1701 return TYPE_ALNUM;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1702 diff -ur ncurses-5.9-orig/form/fty_alpha.c ncurses-5.9/form/fty_alpha.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1703 --- ncurses-5.9-orig/form/fty_alpha.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1704 +++ ncurses-5.9/form/fty_alpha.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1705 @@ -185,14 +185,14 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1706 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1707 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1708
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1709 -NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_ALPHA = &typeTHIS;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1710 +NCFORM_EXPORT_VAR(FIELDTYPE*) TYPE_ALPHA = &typeTHIS;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1711
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1712 #if NCURSES_INTEROP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1713 /* The next routines are to simplify the use of ncurses from
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1714 programming languages with restictions on interop with C level
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1715 constructs (e.g. variable access or va_list + ellipsis constructs)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1716 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1717 -NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1718 +NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1719 _nc_TYPE_ALPHA(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1720 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1721 return TYPE_ALPHA;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1722 diff -ur ncurses-5.9-orig/form/fty_enum.c ncurses-5.9/form/fty_enum.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1723 --- ncurses-5.9-orig/form/fty_enum.c 2010-05-01 17:11:07 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1724 +++ ncurses-5.9/form/fty_enum.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1725 @@ -424,7 +424,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1726 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1727 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1728
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1729 -NCURSES_EXPORT_VAR(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1730 +NCFORM_EXPORT_VAR(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1731 TYPE_ENUM = &typeENUM;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1732
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1733 #if NCURSES_INTEROP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1734 @@ -432,7 +432,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1735 programming languages with restictions on interop with C level
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1736 constructs (e.g. variable access or va_list + ellipsis constructs)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1737 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1738 -NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1739 +NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1740 _nc_TYPE_ENUM(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1741 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1742 return TYPE_ENUM;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1743 diff -ur ncurses-5.9-orig/form/fty_generic.c ncurses-5.9/form/fty_generic.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1744 --- ncurses-5.9-orig/form/fty_generic.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1745 +++ ncurses-5.9/form/fty_generic.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1746 @@ -98,7 +98,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1747 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1748 \| Return Values : Fieldtype pointer or NULL if error occurred
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1749 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1750 -NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1751 +NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1752 _nc_generic_fieldtype(bool (const field_check) (FORM , FIELD , const void ),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1753 bool (const char_check) (int, FORM , FIELD *, const
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1754 void *),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1755 @@ -213,7 +213,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1756 \| Return Values : E_OK if all went well
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1757 \| E_SYSTEM_ERROR if an error occurred
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1758 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1759 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1760 +NCFORM_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1761 _nc_set_generic_fieldtype(FIELD *field,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1762 FIELDTYPE *ftyp,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1763 int (argiterator) (void *))
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1764 @@ -268,7 +268,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1765 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1766 \| Return Values : The fields Window or NULL on error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1767 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1768 -NCURSES_EXPORT(WINDOW *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1769 +NCFORM_EXPORT(WINDOW *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1770 _nc_form_cursor(const FORM form, int pRow, int *pCol)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1771 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1772 int code = E_SYSTEM_ERROR;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1773 diff -ur ncurses-5.9-orig/form/fty_int.c ncurses-5.9/form/fty_int.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1774 --- ncurses-5.9-orig/form/fty_int.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1775 +++ ncurses-5.9/form/fty_int.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1776 @@ -276,14 +276,14 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1777 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1778 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1779
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1780 -NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_INTEGER = &typeTHIS;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1781 +NCFORM_EXPORT_VAR(FIELDTYPE*) TYPE_INTEGER = &typeTHIS;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1782
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1783 #if NCURSES_INTEROP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1784 /* The next routines are to simplify the use of ncurses from
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1785 programming languages with restictions on interop with C level
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1786 constructs (e.g. variable access or va_list + ellipsis constructs)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1787 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1788 -NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1789 +NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1790 _nc_TYPE_INTEGER(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1791 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1792 return TYPE_INTEGER;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1793 diff -ur ncurses-5.9-orig/form/fty_ipv4.c ncurses-5.9/form/fty_ipv4.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1794 --- ncurses-5.9-orig/form/fty_ipv4.c 2009-11-07 15:17:58 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1795 +++ ncurses-5.9/form/fty_ipv4.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1796 @@ -103,14 +103,14 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1797 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1798 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1799
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1800 -NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_IPV4 = &typeIPV4;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1801 +NCFORM_EXPORT_VAR(FIELDTYPE*) TYPE_IPV4 = &typeIPV4;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1802
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1803 #if NCURSES_INTEROP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1804 /* The next routines are to simplify the use of ncurses from
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1805 programming languages with restictions on interop with C level
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1806 constructs (e.g. variable access or va_list + ellipsis constructs)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1807 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1808 -NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1809 +NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1810 _nc_TYPE_IPV4(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1811 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1812 return TYPE_IPV4;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1813 diff -ur ncurses-5.9-orig/form/fty_num.c ncurses-5.9/form/fty_num.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1814 --- ncurses-5.9-orig/form/fty_num.c 2010-01-23 16:14:36 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1815 +++ ncurses-5.9/form/fty_num.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1816 @@ -322,14 +322,14 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1817 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1818 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1819
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1820 -NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_NUMERIC = &typeTHIS;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1821 +NCFORM_EXPORT_VAR(FIELDTYPE*) TYPE_NUMERIC = &typeTHIS;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1822
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1823 #if NCURSES_INTEROP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1824 /* The next routines are to simplify the use of ncurses from
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1825 programming languages with restictions on interop with C level
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1826 constructs (e.g. variable access or va_list + ellipsis constructs)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1827 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1828 -NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1829 +NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1830 _nc_TYPE_NUMERIC(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1831 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1832 return TYPE_NUMERIC;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1833 diff -ur ncurses-5.9-orig/form/fty_regex.c ncurses-5.9/form/fty_regex.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1834 --- ncurses-5.9-orig/form/fty_regex.c 2010-01-23 16:14:37 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1835 +++ ncurses-5.9/form/fty_regex.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1836 @@ -333,14 +333,14 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1837 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1838 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1839
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1840 -NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_REGEXP = &typeREGEXP;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1841 +NCFORM_EXPORT_VAR(FIELDTYPE*) TYPE_REGEXP = &typeREGEXP;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1842
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1843 #if NCURSES_INTEROP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1844 /* The next routines are to simplify the use of ncurses from
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1845 programming languages with restictions on interop with C level
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1846 constructs (e.g. variable access or va_list + ellipsis constructs)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1847 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1848 -NCURSES_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1849 +NCFORM_EXPORT(FIELDTYPE *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1850 _nc_TYPE_REGEXP(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1851 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1852 return TYPE_REGEXP;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1853 diff -ur ncurses-5.9-orig/include/MKkey_defs.sh ncurses-5.9/include/MKkey_defs.sh
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1854 --- ncurses-5.9-orig/include/MKkey_defs.sh 2003-12-06 12:10:09 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1855 +++ ncurses-5.9/include/MKkey_defs.sh 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1856 @@ -62,7 +62,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1857 # add keys that we generate automatically:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1858 cat >>$data <<EOF
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1859 key_resize kr1 str R1 KEY_RESIZE + ----- Terminal resize event
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1860 -key_event kv1 str V1 KEY_EVENT + ----- We were interrupted by an event
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1861 +key_event kv1 str V1 KEY_EVENT_ + ----- We were interrupted by an event
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1862 EOF
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1863
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1864 cat <<EOF
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1865 diff -ur ncurses-5.9-orig/include/MKterm.h.awk.in ncurses-5.9/include/MKterm.h.awk.in
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1866 --- ncurses-5.9-orig/include/MKterm.h.awk.in 2010-01-09 14:53:26 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1867 +++ ncurses-5.9/include/MKterm.h.awk.in 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1868 @@ -130,7 +130,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1869 print ""
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1870 print "#else /* !HAVE_TERMIO_H */"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1871 print ""
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1872 - print "#if __MINGW32__"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1873 + print "#if __MINGW32__ \|\| defined(_MSC_VER)"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1874 print "# include <ncurses_mingw.h>"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1875 print "# define TTY struct termios"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1876 print "#else"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1877 diff -ur ncurses-5.9-orig/include/nc_mingw.h ncurses-5.9/include/nc_mingw.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1878 --- ncurses-5.9-orig/include/nc_mingw.h 2010-09-25 18:16:12 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1879 +++ ncurses-5.9/include/nc_mingw.h 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1880 @@ -43,6 +43,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1881 #else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1882 # define WINVER 0x0501
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1883 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1884 +#include <winsock2.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1885 #include <windows.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1886
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1887 #undef sleep
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1888 @@ -51,7 +52,9 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1889 #undef gettimeofday
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1890 #define gettimeofday(tv,tz) _nc_gettimeofday(tv,tz)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1891
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1892 +#ifndef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1893 #include <sys/time.h> /* for struct timeval */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1894 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1895
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1896 extern int _nc_gettimeofday(struct timeval , void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1897
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1898 diff -ur ncurses-5.9-orig/include/ncurses_dll.h.in ncurses-5.9/include/ncurses_dll.h.in
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1899 --- ncurses-5.9-orig/include/ncurses_dll.h.in 2009-04-04 18:26:27 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1900 +++ ncurses-5.9/include/ncurses_dll.h.in 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1901 @@ -41,10 +41,9 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1902 /* but this structure may be useful at some point for an MSVC build */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1903 /* so, for now unconditionally define the important flags */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1904 /* "the right way" for proper static and dll+auto-import behavior */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1905 -#undef NCURSES_DLL
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1906 -#define NCURSES_STATIC
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1907 +#undef NCURSES_STATIC
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1908
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1909 -#if defined(__CYGWIN__) \|\| defined(__MINGW32__)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1910 +#if defined(__CYGWIN__) \|\| defined(__MINGW32__) \|\| defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1911 # if defined(NCURSES_DLL)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1912 # if defined(NCURSES_STATIC)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1913 # undef NCURSES_STATIC
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1914 @@ -67,6 +66,98 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1915 # define NCURSES_API __cdecl
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1916 # define NCURSES_EXPORT(type) NCURSES_IMPEXP type NCURSES_API
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1917 # define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1918 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1919 +# if defined(NCURSESXX_DLL)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1920 +# if defined(NCURSES_STATIC)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1921 +# undef NCURSES_STATIC
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1922 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1923 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1924 +# undef NCURSESXX_IMPEXP
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1925 +# undef NCURSESXX_API
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1926 +# undef NCURSESXX_EXPORT
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1927 +# undef NCURSESXX_EXPORT_VAR
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1928 +# if defined(NCURSESXX_DLL)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1929 +/* building a DLL */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1930 +# define NCURSESXX_IMPEXP __declspec(dllexport)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1931 +# elif defined(NCURSES_STATIC)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1932 +/* building or linking to a static library */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1933 +# define NCURSESXX_IMPEXP /* nothing */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1934 +# else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1935 +/* linking to the DLL */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1936 +# define NCURSESXX_IMPEXP __declspec(dllimport)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1937 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1938 +# define NCURSESXX_API __cdecl
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1939 +# define NCURSESXX_EXPORT(type) NCURSESXX_IMPEXP type NCURSESXX_API
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1940 +# define NCURSESXX_EXPORT_VAR(type) NCURSESXX_IMPEXP type
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1941 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1942 +# if defined(NCMENU_DLL)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1943 +# if defined(NCURSES_STATIC)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1944 +# undef NCURSES_STATIC
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1945 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1946 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1947 +# undef NCMENU_IMPEXP
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1948 +# undef NCMENU_API
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1949 +# undef NCMENU_EXPORT
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1950 +# undef NCMENU_EXPORT_VAR
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1951 +# if defined(NCMENU_DLL)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1952 +/* building a DLL */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1953 +# define NCMENU_IMPEXP __declspec(dllexport)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1954 +# elif defined(NCURSES_STATIC)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1955 +/* building or linking to a static library */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1956 +# define NCMENU_IMPEXP /* nothing */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1957 +# else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1958 +/* linking to the DLL */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1959 +# define NCMENU_IMPEXP __declspec(dllimport)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1960 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1961 +# define NCMENU_API __cdecl
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1962 +# define NCMENU_EXPORT(type) NCMENU_IMPEXP type NCMENU_API
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1963 +# define NCMENU_EXPORT_VAR(type) NCMENU_IMPEXP type
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1964 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1965 +# if defined(NCPANEL_DLL)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1966 +# if defined(NCURSES_STATIC)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1967 +# undef NCURSES_STATIC
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1968 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1969 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1970 +# undef NCPANEL_IMPEXP
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1971 +# undef NCPANEL_API
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1972 +# undef NCPANEL_EXPORT
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1973 +# undef NCPANEL_EXPORT_VAR
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1974 +# if defined(NCPANEL_DLL)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1975 +/* building a DLL */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1976 +# define NCPANEL_IMPEXP __declspec(dllexport)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1977 +# elif defined(NCURSES_STATIC)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1978 +/* building or linking to a static library */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1979 +# define NCPANEL_IMPEXP /* nothing */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1980 +# else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1981 +/* linking to the DLL */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1982 +# define NCPANEL_IMPEXP __declspec(dllimport)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1983 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1984 +# define NCPANEL_API __cdecl
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1985 +# define NCPANEL_EXPORT(type) NCPANEL_IMPEXP type NCPANEL_API
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1986 +# define NCPANEL_EXPORT_VAR(type) NCPANEL_IMPEXP type
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1987 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1988 +# if defined(NCFORM_DLL)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1989 +# if defined(NCURSES_STATIC)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1990 +# undef NCURSES_STATIC
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1991 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1992 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1993 +# undef NCFORM_IMPEXP
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1994 +# undef NCFORM_API
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1995 +# undef NCFORM_EXPORT
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1996 +# undef NCFORM_EXPORT_VAR
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1997 +# if defined(NCFORM_DLL)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1998 +/* building a DLL */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1999 +# define NCFORM_IMPEXP __declspec(dllexport)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2000 +# elif defined(NCURSES_STATIC)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2001 +/* building or linking to a static library */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2002 +# define NCFORM_IMPEXP /* nothing */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2003 +# else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2004 +/* linking to the DLL */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2005 +# define NCFORM_IMPEXP __declspec(dllimport)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2006 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2007 +# define NCFORM_API __cdecl
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2008 +# define NCFORM_EXPORT(type) NCFORM_IMPEXP type NCFORM_API
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2009 +# define NCFORM_EXPORT_VAR(type) NCFORM_IMPEXP type
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2010 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2011
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2012 /* Take care of non-cygwin platforms */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2013 @@ -83,4 +174,43 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2014 # define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2015 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2016
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2017 +#if !defined(NCMENU_IMPEXP)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2018 +# define NCMENU_IMPEXP /* nothing */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2019 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2020 +#if !defined(NCMENU_API)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2021 +# define NCMENU_API /* nothing */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2022 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2023 +#if !defined(NCMENU_EXPORT)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2024 +# define NCMENU_EXPORT(type) NCMENU_IMPEXP type NCMENU_API
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2025 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2026 +#if !defined(NCMENU_EXPORT_VAR)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2027 +# define NCMENU_EXPORT_VAR(type) NCMENU_IMPEXP type
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2028 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2029 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2030 +#if !defined(NCPANEL_IMPEXP)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2031 +# define NCPANEL_IMPEXP /* nothing */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2032 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2033 +#if !defined(NCPANEL_API)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2034 +# define NCPANEL_API /* nothing */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2035 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2036 +#if !defined(NCPANEL_EXPORT)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2037 +# define NCPANEL_EXPORT(type) NCPANEL_IMPEXP type NCPANEL_API
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2038 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2039 +#if !defined(NCPANEL_EXPORT_VAR)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2040 +# define NCPANEL_EXPORT_VAR(type) NCPANEL_IMPEXP type
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2041 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2042 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2043 +#if !defined(NCFORM_IMPEXP)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2044 +# define NCFORM_IMPEXP /* nothing */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2045 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2046 +#if !defined(NCFORM_API)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2047 +# define NCFORM_API /* nothing */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2048 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2049 +#if !defined(NCFORM_EXPORT)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2050 +# define NCFORM_EXPORT(type) NCFORM_IMPEXP type NCFORM_API
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2051 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2052 +#if !defined(NCFORM_EXPORT_VAR)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2053 +# define NCFORM_EXPORT_VAR(type) NCFORM_IMPEXP type
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2054 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2055 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2056 #endif /* NCURSES_DLL_H_incl */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2057 diff -ur ncurses-5.9-orig/include/ncurses_mingw.h ncurses-5.9/include/ncurses_mingw.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2058 --- ncurses-5.9-orig/include/ncurses_mingw.h 2008-12-14 14:22:16 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2059 +++ ncurses-5.9/include/ncurses_mingw.h 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2060 @@ -38,7 +38,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2061 * to support I/O to external terminals with ncurses on the Windows OS.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2062 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2063
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2064 -#if __MINGW32__
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2065 +#if __MINGW32__ \|\| defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2066 #ifndef _NC_MINGWH
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2067 #define _NC_MINGWH
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2068
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2069 diff -ur ncurses-5.9-orig/include/term_entry.h ncurses-5.9/include/term_entry.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2070 --- ncurses-5.9-orig/include/term_entry.h 2009-07-11 12:52:29 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2071 +++ ncurses-5.9/include/term_entry.h 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2072 @@ -161,8 +161,8 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2073 extern NCURSES_EXPORT(int) _nc_resolve_uses (bool); /* obs 20040705 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2074 extern NCURSES_EXPORT(int) _nc_resolve_uses2 (bool, bool);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2075 extern NCURSES_EXPORT(void) _nc_free_entries (ENTRY *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2076 -extern NCURSES_IMPEXP void NCURSES_API (_nc_check_termtype)(TERMTYPE ); /* obs 20040705 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2077 -extern NCURSES_IMPEXP void NCURSES_API (_nc_check_termtype2)(TERMTYPE , bool);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2078 +extern NCURSES_IMPEXP void (NCURSES_API _nc_check_termtype)(TERMTYPE ); /* obs 20040705 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2079 +extern NCURSES_IMPEXP void (NCURSES_API _nc_check_termtype2)(TERMTYPE , bool);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2080
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2081 /* trace_xnames.c */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2082 extern NCURSES_EXPORT(void) _nc_trace_xnames (TERMTYPE *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2083 diff -ur ncurses-5.9-orig/include/tic.h ncurses-5.9/include/tic.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2084 --- ncurses-5.9-orig/include/tic.h 2009-08-08 13:52:46 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2085 +++ ncurses-5.9/include/tic.h 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2086 @@ -299,6 +299,9 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2087
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2088 /* home_terminfo.c */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2089 extern NCURSES_EXPORT(char *) _nc_home_terminfo (void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2090 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2091 +extern NCURSES_EXPORT(char *) _nc_win32_terminfo (void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2092 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2093
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2094 /* lib_tparm.c */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2095 #define NUM_PARM 9
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2096 @@ -318,6 +321,9 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2097 dbdTIC = 0,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2098 #if USE_DATABASE
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2099 dbdEnvOnce,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2100 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2101 + dbdWin32,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2102 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2103 dbdHome,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2104 dbdEnvList,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2105 dbdCfgList,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2106 diff -ur ncurses-5.9-orig/menu/Makefile.in ncurses-5.9/menu/Makefile.in
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2107 --- ncurses-5.9-orig/menu/Makefile.in 2010-11-27 16:45:27 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2108 +++ ncurses-5.9/menu/Makefile.in 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2109 @@ -84,7 +84,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2110 CPP = @CPP@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2111 CFLAGS = @CFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2112
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2113 -CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H @CPPFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2114 +CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H -DNCMENU_DLL @CPPFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2115
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2116 CCFLAGS = $(CPPFLAGS) $(CFLAGS)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2117
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2118 diff -ur ncurses-5.9-orig/menu/m_attribs.c ncurses-5.9/menu/m_attribs.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2119 --- ncurses-5.9-orig/menu/m_attribs.c 2010-01-23 16:16:54 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2120 +++ ncurses-5.9/menu/m_attribs.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2121 @@ -49,7 +49,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2122
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2123 /* "Template" macro to generate a function to set a menus attribute */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2124 #define GEN_MENU_ATTR_SET_FCT( name ) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2125 -NCURSES_IMPEXP int NCURSES_API set_menu_ ## name (MENU* menu, chtype attr) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2126 +NCMENU_IMPEXP int NCMENU_API set_menu_ ## name (MENU* menu, chtype attr) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2127 {\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2128 T((T_CALLED("set_menu_" #name "(%p,%s)"), menu, _traceattr(attr))); \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2129 if (!(attr==A_NORMAL \|\| (attr & A_ATTRIBUTES)==attr))\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2130 @@ -65,7 +65,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2131
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2132 /* "Template" macro to generate a function to get a menu's attribute */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2133 #define GEN_MENU_ATTR_GET_FCT( name ) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2134 -NCURSES_IMPEXP chtype NCURSES_API menu_ ## name (const MENU * menu)\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2135 +NCMENU_IMPEXP chtype NCMENU_API menu_ ## name (const MENU * menu)\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2136 {\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2137 T((T_CALLED("menu_" #name "(%p)"), (const void *) menu));\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2138 returnAttr(Normalize_Menu( menu ) -> name);\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2139 diff -ur ncurses-5.9-orig/menu/m_cursor.c ncurses-5.9/menu/m_cursor.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2140 --- ncurses-5.9-orig/menu/m_cursor.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2141 +++ ncurses-5.9/menu/m_cursor.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2142 @@ -49,7 +49,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2143 \| E_BAD_ARGUMENT - invalid menu
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2144 \| E_NOT_POSTED - Menu is not posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2145 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2146 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2147 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2148 _nc_menu_cursor_pos(const MENU * menu, const ITEM * item, int pY, int pX)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2149 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2150 if (!menu \|\| !pX \|\| !pY)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2151 @@ -79,7 +79,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2152 \| E_BAD_ARGUMENT - invalid menu
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2153 \| E_NOT_POSTED - Menu is not posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2154 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2155 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2156 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2157 pos_menu_cursor(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2158 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2159 WINDOW win, sub;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2160 diff -ur ncurses-5.9-orig/menu/m_driver.c ncurses-5.9/menu/m_driver.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2161 --- ncurses-5.9-orig/menu/m_driver.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2162 +++ ncurses-5.9/menu/m_driver.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2163 @@ -114,7 +114,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2164 \| Return Values : E_OK - an item matching the pattern was found
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2165 \| E_NO_MATCH - nothing found
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2166 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2167 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2168 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2169 _nc_Match_Next_Character_In_Item_Name
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2170 (MENU * menu, int ch, ITEM ** item)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2171 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2172 @@ -208,7 +208,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2173 \| E_BAD_STATE - menu is in user hook routine
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2174 \| E_NOT_POSTED - menu is not posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2175 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2176 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2177 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2178 menu_driver(MENU * menu, int c)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2179 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2180 #define NAVIGATE(dir) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2181 diff -ur ncurses-5.9-orig/menu/m_format.c ncurses-5.9/menu/m_format.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2182 --- ncurses-5.9-orig/menu/m_format.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2183 +++ ncurses-5.9/menu/m_format.c 2013-07-04 18:38:37 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2184 @@ -55,7 +55,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2185 \| E_NOT_CONNECTED - there are no items connected
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2186 \| E_POSTED - the menu is already posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2187 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2188 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2189 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2190 set_menu_format(MENU * menu, int rows, int cols)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2191 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2192 int total_rows, total_cols;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2193 @@ -119,7 +119,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2194 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2195 \| Return Values : -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2196 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2197 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2198 +NCMENU_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2199 menu_format(const MENU * menu, int rows, int cols)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2200 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2201 if (rows)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2202 diff -ur ncurses-5.9-orig/menu/m_global.c ncurses-5.9/menu/m_global.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2203 --- ncurses-5.9-orig/menu/m_global.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2204 +++ ncurses-5.9/menu/m_global.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2205 @@ -41,7 +41,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2206
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2207 static char mark[] = "-";
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2208 /* INDENT-OFF */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2209 -NCURSES_EXPORT_VAR(MENU) _nc_Default_Menu = {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2210 +NCMENU_EXPORT_VAR(MENU) _nc_Default_Menu = {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2211 16, /* Nr. of chars high */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2212 1, /* Nr. of chars wide */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2213 16, /* Nr. of items high */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2214 @@ -80,7 +80,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2215 0 /* status */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2216 };
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2217
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2218 -NCURSES_EXPORT_VAR(ITEM) _nc_Default_Item = {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2219 +NCMENU_EXPORT_VAR(ITEM) _nc_Default_Item = {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2220 { (char )0, 0 }, / name */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2221 { (char )0, 0 }, / description */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2222 (MENU )0, / Pointer to parent menu */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2223 @@ -170,7 +170,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2224 \| Return Values : TRUE - successful connection
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2225 \| FALSE - connection failed
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2226 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2227 -NCURSES_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2228 +NCMENU_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2229 _nc_Connect_Items(MENU * menu, ITEM ** items)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2230 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2231 ITEM **item;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2232 @@ -232,7 +232,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2233 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2234 \| Return Values : -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2235 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2236 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2237 +NCMENU_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2238 _nc_Disconnect_Items(MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2239 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2240 if (menu && menu->items)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2241 @@ -247,7 +247,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2242 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2243 \| Return Values : the width
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2244 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2245 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2246 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2247 _nc_Calculate_Text_Width(const TEXT * item /FIXME: limit length / )
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2248 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2249 #if USE_WIDEC_SUPPORT
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2250 @@ -336,7 +336,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2251 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2252 \| Return Values : -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2253 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2254 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2255 +NCMENU_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2256 _nc_Calculate_Item_Length_and_Width(MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2257 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2258 int l;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2259 @@ -375,7 +375,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2260 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2261 \| Return Values : -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2262 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2263 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2264 +NCMENU_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2265 _nc_Link_Items(MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2266 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2267 if (menu && menu->items && *(menu->items))
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2268 @@ -502,7 +502,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2269 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2270 \| Return Values : -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2271 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2272 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2273 +NCMENU_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2274 _nc_Show_Menu(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2275 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2276 WINDOW *win;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2277 @@ -542,7 +542,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2278 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2279 \| Return Values : -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2280 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2281 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2282 +NCMENU_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2283 _nc_New_TopRow_and_CurrentItem(
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2284 MENU * menu,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2285 int new_toprow,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2286 diff -ur ncurses-5.9-orig/menu/m_hook.c ncurses-5.9/menu/m_hook.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2287 --- ncurses-5.9-orig/menu/m_hook.c 2010-01-23 16:16:54 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2288 +++ ncurses-5.9/menu/m_hook.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2289 @@ -41,7 +41,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2290
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2291 /* "Template" macro to generate function to set application specific hook */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2292 #define GEN_HOOK_SET_FUNCTION( typ, name ) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2293 -NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (MENU *menu, Menu_Hook func )\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2294 +NCMENU_IMPEXP int NCMENU_API set_ ## typ ## _ ## name (MENU *menu, Menu_Hook func )\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2295 {\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2296 T((T_CALLED("set_" #typ "_" #name "(%p,%p)"), menu, func));\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2297 (Normalize_Menu(menu) -> typ ## name = func );\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2298 @@ -50,7 +50,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2299
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2300 /* "Template" macro to generate function to get application specific hook */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2301 #define GEN_HOOK_GET_FUNCTION( typ, name ) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2302 -NCURSES_IMPEXP Menu_Hook NCURSES_API typ ## _ ## name ( const MENU *menu )\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2303 +NCMENU_IMPEXP Menu_Hook NCMENU_API typ ## _ ## name ( const MENU *menu )\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2304 {\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2305 T((T_CALLED(#typ "_" #name "(%p)"), (const void *) menu));\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2306 returnMenuHook(Normalize_Menu(menu) -> typ ## name);\
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2307 diff -ur ncurses-5.9-orig/menu/m_item_cur.c ncurses-5.9/menu/m_item_cur.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2308 --- ncurses-5.9-orig/menu/m_item_cur.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2309 +++ ncurses-5.9/menu/m_item_cur.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2310 @@ -47,7 +47,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2311 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2312 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2313 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2314 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2315 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2316 set_current_item(MENU * menu, ITEM * item)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2317 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2318 T((T_CALLED("set_current_item(%p,%p)"), (void )menu, (void )item));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2319 @@ -88,7 +88,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2320 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2321 \| Return Values : Item pointer or NULL if failure
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2322 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2323 -NCURSES_EXPORT(ITEM *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2324 +NCMENU_EXPORT(ITEM *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2325 current_item(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2326 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2327 T((T_CALLED("current_item(%p)"), (const void *)menu));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2328 @@ -103,7 +103,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2329 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2330 \| Return Values : The index or ERR if this is an invalid item pointer
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2331 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2332 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2333 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2334 item_index(const ITEM * item)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2335 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2336 T((T_CALLED("item_index(%p)"), (const void *)item));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2337 diff -ur ncurses-5.9-orig/menu/m_item_nam.c ncurses-5.9/menu/m_item_nam.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2338 --- ncurses-5.9-orig/menu/m_item_nam.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2339 +++ ncurses-5.9/menu/m_item_nam.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2340 @@ -47,7 +47,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2341 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2342 \| Return Values : See above; returns NULL if item is invalid
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2343 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2344 -NCURSES_EXPORT(const char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2345 +NCMENU_EXPORT(const char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2346 item_name(const ITEM * item)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2347 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2348 T((T_CALLED("item_name(%p)"), (const void *)item));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2349 @@ -62,7 +62,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2350 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2351 \| Return Values : See above; Returns NULL if item is invalid
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2352 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2353 -NCURSES_EXPORT(const char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2354 +NCMENU_EXPORT(const char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2355 item_description(const ITEM * item)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2356 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2357 T((T_CALLED("item_description(%p)"), (const void *)item));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2358 diff -ur ncurses-5.9-orig/menu/m_item_new.c ncurses-5.9/menu/m_item_new.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2359 --- ncurses-5.9-orig/menu/m_item_new.c 2010-01-23 16:20:11 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2360 +++ ncurses-5.9/menu/m_item_new.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2361 @@ -106,7 +106,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2362 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2363 \| Return Values : The item pointer or NULL if creation failed.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2364 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2365 -NCURSES_EXPORT(ITEM *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2366 +NCMENU_EXPORT(ITEM *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2367 new_item(const char name, const char description)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2368 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2369 ITEM *item;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2370 @@ -159,7 +159,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2371 \| E_BAD_ARGUMENT - invalid value has been passed
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2372 \| E_CONNECTED - item is still connected to a menu
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2373 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2374 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2375 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2376 free_item(ITEM * item)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2377 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2378 T((T_CALLED("free_item(%p)"), (void *)item));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2379 @@ -192,7 +192,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2380 \| E_BAD_ARGUMENT - an invalid value has been passed
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2381 \| E_SYSTEM_ERROR - no memory to store mark
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2382 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2383 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2384 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2385 set_menu_mark(MENU * menu, const char *mark)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2386 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2387 unsigned l;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2388 @@ -265,7 +265,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2389 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2390 \| Return Values : The marker string pointer or NULL if no marker defined
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2391 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2392 -NCURSES_EXPORT(const char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2393 +NCMENU_EXPORT(const char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2394 menu_mark(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2395 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2396 T((T_CALLED("menu_mark(%p)"), (const void *)menu));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2397 diff -ur ncurses-5.9-orig/menu/m_item_opt.c ncurses-5.9/menu/m_item_opt.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2398 --- ncurses-5.9-orig/menu/m_item_opt.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2399 +++ ncurses-5.9/menu/m_item_opt.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2400 @@ -50,7 +50,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2401 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2402 \| E_BAD_ARGUMENT - invalid item options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2403 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2404 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2405 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2406 set_item_opts(ITEM * item, Item_Options opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2407 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2408 T((T_CALLED("set_menu_opts(%p,%d)"), (void *)item, opts));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2409 @@ -93,7 +93,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2410 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2411 \| E_BAD_ARGUMENT - invalid options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2412 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2413 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2414 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2415 item_opts_off(ITEM * item, Item_Options opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2416 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2417 ITEM citem = item; / use a copy because set_item_opts must detect
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2418 @@ -121,7 +121,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2419 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2420 \| E_BAD_ARGUMENT - invalid options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2421 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2422 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2423 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2424 item_opts_on(ITEM * item, Item_Options opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2425 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2426 ITEM citem = item; / use a copy because set_item_opts must detect
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2427 @@ -149,7 +149,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2428 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2429 \| Return Values : Items options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2430 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2431 -NCURSES_EXPORT(Item_Options)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2432 +NCMENU_EXPORT(Item_Options)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2433 item_opts(const ITEM * item)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2434 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2435 T((T_CALLED("item_opts(%p)"), (const void *)item));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2436 diff -ur ncurses-5.9-orig/menu/m_item_top.c ncurses-5.9/menu/m_item_top.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2437 --- ncurses-5.9-orig/menu/m_item_top.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2438 +++ ncurses-5.9/menu/m_item_top.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2439 @@ -49,7 +49,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2440 \| E_BAD_ARGUMENT - not a menu pointer or invalid row
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2441 \| E_NOT_CONNECTED - there are no items for the menu
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2442 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2443 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2444 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2445 set_top_row(MENU * menu, int row)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2446 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2447 ITEM *item;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2448 @@ -91,7 +91,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2449 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2450 \| Return Values : The row number or ERR if there is no row
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2451 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2452 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2453 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2454 top_row(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2455 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2456 T((T_CALLED("top_row(%p)"), (const void *)menu));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2457 diff -ur ncurses-5.9-orig/menu/m_item_use.c ncurses-5.9/menu/m_item_use.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2458 --- ncurses-5.9-orig/menu/m_item_use.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2459 +++ ncurses-5.9/menu/m_item_use.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2460 @@ -48,7 +48,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2461 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2462 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2463 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2464 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2465 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2466 set_item_userptr(ITEM * item, void *userptr)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2467 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2468 T((T_CALLED("set_item_userptr(%p,%p)"), (void )item, (void )userptr));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2469 @@ -66,7 +66,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2470 \| Return Values : Value of the pointer. If no such pointer has been set,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2471 \| NULL is returned.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2472 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2473 -NCURSES_EXPORT(void *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2474 +NCMENU_EXPORT(void *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2475 item_userptr(const ITEM * item)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2476 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2477 T((T_CALLED("item_userptr(%p)"), (const void *)item));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2478 diff -ur ncurses-5.9-orig/menu/m_item_val.c ncurses-5.9/menu/m_item_val.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2479 --- ncurses-5.9-orig/menu/m_item_val.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2480 +++ ncurses-5.9/menu/m_item_val.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2481 @@ -52,7 +52,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2482 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2483 \| E_REQUEST_DENIED - not selectable or single valued menu
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2484 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2485 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2486 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2487 set_item_value(ITEM * item, bool value)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2488 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2489 MENU *menu;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2490 @@ -94,7 +94,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2491 \| Return Values : TRUE - if item is selected
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2492 \| FALSE - if item is not selected
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2493 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2494 -NCURSES_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2495 +NCMENU_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2496 item_value(const ITEM * item)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2497 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2498 T((T_CALLED("item_value(%p)"), (const void *)item));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2499 diff -ur ncurses-5.9-orig/menu/m_item_vis.c ncurses-5.9/menu/m_item_vis.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2500 --- ncurses-5.9-orig/menu/m_item_vis.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2501 +++ ncurses-5.9/menu/m_item_vis.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2502 @@ -49,7 +49,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2503 \| Return Values : TRUE if visible
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2504 \| FALSE if invisible
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2505 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2506 -NCURSES_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2507 +NCMENU_EXPORT(bool)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2508 item_visible(const ITEM * item)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2509 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2510 MENU *menu;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2511 diff -ur ncurses-5.9-orig/menu/m_items.c ncurses-5.9/menu/m_items.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2512 --- ncurses-5.9-orig/menu/m_items.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2513 +++ ncurses-5.9/menu/m_items.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2514 @@ -52,7 +52,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2515 \| E_BAD_ARGUMENT - An incorrect menu or item array was
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2516 \| passed to the function
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2517 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2518 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2519 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2520 set_menu_items(MENU * menu, ITEM ** items)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2521 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2522 T((T_CALLED("set_menu_items(%p,%p)"), (void )menu, (void )items));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2523 @@ -84,7 +84,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2524 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2525 \| Return Values : NULL on error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2526 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2527 -NCURSES_EXPORT(ITEM **)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2528 +NCMENU_EXPORT(ITEM **)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2529 menu_items(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2530 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2531 T((T_CALLED("menu_items(%p)"), (const void *)menu));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2532 @@ -100,7 +100,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2533 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2534 \| Return Values : Number of items or -1 to indicate error.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2535 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2536 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2537 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2538 item_count(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2539 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2540 T((T_CALLED("item_count(%p)"), (const void *)menu));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2541 diff -ur ncurses-5.9-orig/menu/m_new.c ncurses-5.9/menu/m_new.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2542 --- ncurses-5.9-orig/menu/m_new.c 2010-01-23 16:20:11 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2543 +++ ncurses-5.9/menu/m_new.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2544 @@ -50,7 +50,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2545 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2546 \| Return Values : NULL on error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2547 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2548 -NCURSES_EXPORT(MENU *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2549 +NCMENU_EXPORT(MENU *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2550 NCURSES_SP_NAME(new_menu) (NCURSES_SP_DCLx ITEM ** items)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2551 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2552 int err = E_SYSTEM_ERROR;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2553 @@ -101,7 +101,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2554 \| Return Values : NULL on error
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2555 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2556 #if NCURSES_SP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2557 -NCURSES_EXPORT(MENU *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2558 +NCMENU_EXPORT(MENU *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2559 new_menu(ITEM ** items)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2560 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2561 return NCURSES_SP_NAME(new_menu) (CURRENT_SCREEN, items);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2562 @@ -119,7 +119,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2563 \| E_BAD_ARGUMENT - Invalid menu pointer passed
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2564 \| E_POSTED - Menu is already posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2565 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2566 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2567 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2568 free_menu(MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2569 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2570 T((T_CALLED("free_menu(%p)"), (void *)menu));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2571 diff -ur ncurses-5.9-orig/menu/m_opts.c ncurses-5.9/menu/m_opts.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2572 --- ncurses-5.9-orig/menu/m_opts.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2573 +++ ncurses-5.9/menu/m_opts.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2574 @@ -52,7 +52,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2575 \| E_BAD_ARGUMENT - invalid menu options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2576 \| E_POSTED - menu is already posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2577 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2578 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2579 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2580 set_menu_opts(MENU * menu, Menu_Options opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2581 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2582 T((T_CALLED("set_menu_opts(%p,%d)"), (void *)menu, opts));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2583 @@ -112,7 +112,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2584 \| E_BAD_ARGUMENT - invalid options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2585 \| E_POSTED - menu is already posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2586 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2587 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2588 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2589 menu_opts_off(MENU * menu, Menu_Options opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2590 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2591 MENU cmenu = menu; / use a copy because set_menu_opts must detect
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2592 @@ -145,7 +145,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2593 \| E_BAD_ARGUMENT - invalid menu options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2594 \| E_POSTED - menu is already posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2595 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2596 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2597 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2598 menu_opts_on(MENU * menu, Menu_Options opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2599 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2600 MENU cmenu = menu; / use a copy because set_menu_opts must detect
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2601 @@ -173,7 +173,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2602 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2603 \| Return Values : Menu options
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2604 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2605 -NCURSES_EXPORT(Menu_Options)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2606 +NCMENU_EXPORT(Menu_Options)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2607 menu_opts(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2608 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2609 T((T_CALLED("menu_opts(%p)"), (const void *)menu));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2610 diff -ur ncurses-5.9-orig/menu/m_pad.c ncurses-5.9/menu/m_pad.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2611 --- ncurses-5.9-orig/menu/m_pad.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2612 +++ ncurses-5.9/menu/m_pad.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2613 @@ -58,7 +58,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2614 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2615 \| E_BAD_ARGUMENT - an invalid value has been passed
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2616 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2617 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2618 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2619 set_menu_pad(MENU * menu, int pad)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2620 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2621 bool do_refresh = (menu != (MENU *) 0);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2622 @@ -85,7 +85,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2623 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2624 \| Return Values : The pad character
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2625 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2626 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2627 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2628 menu_pad(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2629 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2630 T((T_CALLED("menu_pad(%p)"), (const void *)menu));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2631 diff -ur ncurses-5.9-orig/menu/m_pattern.c ncurses-5.9/menu/m_pattern.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2632 --- ncurses-5.9-orig/menu/m_pattern.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2633 +++ ncurses-5.9/menu/m_pattern.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2634 @@ -50,7 +50,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2635 \| pattern is stored
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2636 \| PatternString - as expected
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2637 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2638 -NCURSES_EXPORT(char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2639 +NCMENU_EXPORT(char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2640 menu_pattern(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2641 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2642 static char empty[] = "";
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2643 @@ -72,7 +72,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2644 \| E_NOT_CONNECTED - no items connected to menu
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2645 \| E_NO_MATCH - no item matches pattern
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2646 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2647 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2648 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2649 set_menu_pattern(MENU * menu, const char *p)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2650 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2651 ITEM *matchitem;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2652 diff -ur ncurses-5.9-orig/menu/m_post.c ncurses-5.9/menu/m_post.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2653 --- ncurses-5.9-orig/menu/m_post.c 2010-05-01 15:18:27 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2654 +++ ncurses-5.9/menu/m_post.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2655 @@ -48,7 +48,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2656 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2657 \| Return Values : -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2658 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2659 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2660 +NCMENU_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2661 _nc_Post_Item(const MENU * menu, const ITEM * item)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2662 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2663 int i;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2664 @@ -196,7 +196,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2665 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2666 \| Return Values : -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2667 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2668 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2669 +NCMENU_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2670 _nc_Draw_Menu(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2671 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2672 ITEM *item = menu->items[0];
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2673 @@ -266,7 +266,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2674 \| E_BAD_STATE - Menu in userexit routine
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2675 \| E_POSTED - Menu already posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2676 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2677 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2678 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2679 post_menu(MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2680 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2681 T((T_CALLED("post_menu(%p)"), (void *)menu));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2682 @@ -338,7 +338,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2683 \| E_BAD_STATE - menu in userexit routine
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2684 \| E_NOT_POSTED - menu is not posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2685 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2686 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2687 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2688 unpost_menu(MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2689 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2690 WINDOW *win;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2691 diff -ur ncurses-5.9-orig/menu/m_req_name.c ncurses-5.9/menu/m_req_name.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2692 --- ncurses-5.9-orig/menu/m_req_name.c 2009-10-10 12:17:23 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2693 +++ ncurses-5.9/menu/m_req_name.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2694 @@ -71,7 +71,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2695 \| Return Values : Pointer to name - on success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2696 \| NULL - on invalid request code
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2697 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2698 -NCURSES_EXPORT(const char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2699 +NCMENU_EXPORT(const char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2700 menu_request_name(int request)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2701 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2702 T((T_CALLED("menu_request_name(%d)"), request));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2703 @@ -93,7 +93,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2704 \| Return Values : Request Id - on success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2705 \| E_NO_MATCH - request not found
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2706 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2707 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2708 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2709 menu_request_by_name(const char *str)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2710 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2711 /* because the table is so small, it doesn't really hurt
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2712 diff -ur ncurses-5.9-orig/menu/m_scale.c ncurses-5.9/menu/m_scale.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2713 --- ncurses-5.9-orig/menu/m_scale.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2714 +++ ncurses-5.9/menu/m_scale.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2715 @@ -50,7 +50,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2716 \| E_BAD_ARGUMENT - invalid menu pointer
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2717 \| E_NOT_CONNECTED - no items are connected to menu
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2718 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2719 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2720 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2721 scale_menu(const MENU * menu, int rows, int cols)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2722 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2723 T((T_CALLED("scale_menu(%p,%p,%p)"),
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2724 diff -ur ncurses-5.9-orig/menu/m_spacing.c ncurses-5.9/menu/m_spacing.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2725 --- ncurses-5.9-orig/menu/m_spacing.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2726 +++ ncurses-5.9/menu/m_spacing.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2727 @@ -51,7 +51,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2728 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2729 \| Return Values : E_OK - on success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2730 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2731 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2732 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2733 set_menu_spacing(MENU * menu, int s_desc, int s_row, int s_col)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2734 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2735 MENU m; / split for ATAC workaround */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2736 @@ -86,7 +86,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2737 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2738 \| Return Values : E_OK - on success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2739 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2740 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2741 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2742 menu_spacing(const MENU * menu, int s_desc, int s_row, int *s_col)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2743 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2744 const MENU m; / split for ATAC workaround */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2745 diff -ur ncurses-5.9-orig/menu/m_sub.c ncurses-5.9/menu/m_sub.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2746 --- ncurses-5.9-orig/menu/m_sub.c 2010-01-23 16:20:11 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2747 +++ ncurses-5.9/menu/m_sub.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2748 @@ -48,7 +48,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2749 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2750 \| E_POSTED - menu is already posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2751 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2752 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2753 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2754 set_menu_sub(MENU * menu, WINDOW *win)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2755 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2756 T((T_CALLED("set_menu_sub(%p,%p)"), (void )menu, (void )win));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2757 @@ -88,7 +88,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2758 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2759 \| Return Values : NULL on error, otherwise a pointer to the window
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2760 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2761 -NCURSES_EXPORT(WINDOW *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2762 +NCMENU_EXPORT(WINDOW *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2763 menu_sub(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2764 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2765 const MENU *m = Normalize_Menu(menu);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2766 diff -ur ncurses-5.9-orig/menu/m_trace.c ncurses-5.9/menu/m_trace.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2767 --- ncurses-5.9-orig/menu/m_trace.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2768 +++ ncurses-5.9/menu/m_trace.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2769 @@ -34,42 +34,42 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2770
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2771 MODULE_ID("$Id: m_trace.c,v 1.4 2010/01/23 21:20:10 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2772
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2773 -NCURSES_EXPORT(ITEM *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2774 +NCMENU_EXPORT(ITEM *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2775 _nc_retrace_item(ITEM * code)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2776 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2777 T((T_RETURN("%p"), (void *)code));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2778 return code;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2779 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2780
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2781 -NCURSES_EXPORT(ITEM **)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2782 +NCMENU_EXPORT(ITEM **)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2783 _nc_retrace_item_ptr(ITEM ** code)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2784 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2785 T((T_RETURN("%p"), (void *)code));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2786 return code;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2787 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2788
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2789 -NCURSES_EXPORT(Item_Options)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2790 +NCMENU_EXPORT(Item_Options)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2791 _nc_retrace_item_opts(Item_Options code)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2792 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2793 T((T_RETURN("%d"), code));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2794 return code;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2795 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2796
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2797 -NCURSES_EXPORT(MENU *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2798 +NCMENU_EXPORT(MENU *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2799 _nc_retrace_menu(MENU * code)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2800 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2801 T((T_RETURN("%p"), (void *)code));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2802 return code;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2803 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2804
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2805 -NCURSES_EXPORT(Menu_Hook)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2806 +NCMENU_EXPORT(Menu_Hook)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2807 _nc_retrace_menu_hook(Menu_Hook code)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2808 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2809 T((T_RETURN("%p"), code));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2810 return code;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2811 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2812
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2813 -NCURSES_EXPORT(Menu_Options)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2814 +NCMENU_EXPORT(Menu_Options)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2815 _nc_retrace_menu_opts(Menu_Options code)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2816 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2817 T((T_RETURN("%d"), code));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2818 diff -ur ncurses-5.9-orig/menu/m_userptr.c ncurses-5.9/menu/m_userptr.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2819 --- ncurses-5.9-orig/menu/m_userptr.c 2010-01-23 16:20:10 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2820 +++ ncurses-5.9/menu/m_userptr.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2821 @@ -48,7 +48,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2822 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2823 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2824 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2825 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2826 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2827 set_menu_userptr(MENU * menu, void *userptr)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2828 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2829 T((T_CALLED("set_menu_userptr(%p,%p)"), (void )menu, (void )userptr));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2830 @@ -66,7 +66,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2831 \| Return Values : Value of the pointer. If no such pointer has been set,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2832 \| NULL is returned
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2833 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2834 -NCURSES_EXPORT(void *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2835 +NCMENU_EXPORT(void *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2836 menu_userptr(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2837 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2838 T((T_CALLED("menu_userptr(%p)"), (const void *)menu));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2839 diff -ur ncurses-5.9-orig/menu/m_win.c ncurses-5.9/menu/m_win.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2840 --- ncurses-5.9-orig/menu/m_win.c 2010-01-23 16:20:11 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2841 +++ ncurses-5.9/menu/m_win.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2842 @@ -48,7 +48,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2843 \| Return Values : E_OK - success
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2844 \| E_POSTED - menu is already posted
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2845 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2846 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2847 +NCMENU_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2848 set_menu_win(MENU * menu, WINDOW *win)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2849 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2850 T((T_CALLED("set_menu_win(%p,%p)"), (void )menu, (void )win));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2851 @@ -88,7 +88,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2852 \|
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2853 \| Return Values : NULL on error, otherwise pointer to window
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2854 +--------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2855 -NCURSES_EXPORT(WINDOW *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2856 +NCMENU_EXPORT(WINDOW *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2857 menu_win(const MENU * menu)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2858 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2859 const MENU *m = Normalize_Menu(menu);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2860 diff -ur ncurses-5.9-orig/menu/menu.h ncurses-5.9/menu/menu.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2861 --- ncurses-5.9-orig/menu/menu.h 2009-04-04 20:28:07 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2862 +++ ncurses-5.9/menu/menu.h 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2863 @@ -172,85 +172,85 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2864
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2865 /* --------- prototypes for libmenu functions ----------------------------- */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2866
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2867 -extern NCURSES_EXPORT(ITEM *) menu_items (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2868 -extern NCURSES_EXPORT(ITEM ) current_item (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2869 -extern NCURSES_EXPORT(ITEM ) new_item (const char ,const char *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2870 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2871 -extern NCURSES_EXPORT(MENU ) new_menu (ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2872 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2873 -extern NCURSES_EXPORT(Item_Options) item_opts (const ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2874 -extern NCURSES_EXPORT(Menu_Options) menu_opts (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2875 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2876 -extern NCURSES_EXPORT(Menu_Hook) item_init (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2877 -extern NCURSES_EXPORT(Menu_Hook) item_term (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2878 -extern NCURSES_EXPORT(Menu_Hook) menu_init (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2879 -extern NCURSES_EXPORT(Menu_Hook) menu_term (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2880 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2881 -extern NCURSES_EXPORT(WINDOW ) menu_sub (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2882 -extern NCURSES_EXPORT(WINDOW ) menu_win (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2883 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2884 -extern NCURSES_EXPORT(const char ) item_description (const ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2885 -extern NCURSES_EXPORT(const char ) item_name (const ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2886 -extern NCURSES_EXPORT(const char ) menu_mark (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2887 -extern NCURSES_EXPORT(const char *) menu_request_name (int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2888 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2889 -extern NCURSES_EXPORT(char ) menu_pattern (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2890 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2891 -extern NCURSES_EXPORT(void ) menu_userptr (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2892 -extern NCURSES_EXPORT(void ) item_userptr (const ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2893 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2894 -extern NCURSES_EXPORT(chtype) menu_back (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2895 -extern NCURSES_EXPORT(chtype) menu_fore (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2896 -extern NCURSES_EXPORT(chtype) menu_grey (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2897 -
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2898 -extern NCURSES_EXPORT(int) free_item (ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2899 -extern NCURSES_EXPORT(int) free_menu (MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2900 -extern NCURSES_EXPORT(int) item_count (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2901 -extern NCURSES_EXPORT(int) item_index (const ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2902 -extern NCURSES_EXPORT(int) item_opts_off (ITEM *,Item_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2903 -extern NCURSES_EXPORT(int) item_opts_on (ITEM *,Item_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2904 -extern NCURSES_EXPORT(int) menu_driver (MENU *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2905 -extern NCURSES_EXPORT(int) menu_opts_off (MENU *,Menu_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2906 -extern NCURSES_EXPORT(int) menu_opts_on (MENU *,Menu_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2907 -extern NCURSES_EXPORT(int) menu_pad (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2908 -extern NCURSES_EXPORT(int) pos_menu_cursor (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2909 -extern NCURSES_EXPORT(int) post_menu (MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2910 -extern NCURSES_EXPORT(int) scale_menu (const MENU ,int ,int *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2911 -extern NCURSES_EXPORT(int) set_current_item (MENU menu,ITEM item);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2912 -extern NCURSES_EXPORT(int) set_item_init (MENU *, Menu_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2913 -extern NCURSES_EXPORT(int) set_item_opts (ITEM *,Item_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2914 -extern NCURSES_EXPORT(int) set_item_term (MENU *, Menu_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2915 -extern NCURSES_EXPORT(int) set_item_userptr (ITEM , void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2916 -extern NCURSES_EXPORT(int) set_item_value (ITEM *,bool);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2917 -extern NCURSES_EXPORT(int) set_menu_back (MENU *,chtype);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2918 -extern NCURSES_EXPORT(int) set_menu_fore (MENU *,chtype);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2919 -extern NCURSES_EXPORT(int) set_menu_format (MENU *,int,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2920 -extern NCURSES_EXPORT(int) set_menu_grey (MENU *,chtype);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2921 -extern NCURSES_EXPORT(int) set_menu_init (MENU *, Menu_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2922 -extern NCURSES_EXPORT(int) set_menu_items (MENU ,ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2923 -extern NCURSES_EXPORT(int) set_menu_mark (MENU , const char );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2924 -extern NCURSES_EXPORT(int) set_menu_opts (MENU *,Menu_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2925 -extern NCURSES_EXPORT(int) set_menu_pad (MENU *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2926 -extern NCURSES_EXPORT(int) set_menu_pattern (MENU ,const char );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2927 -extern NCURSES_EXPORT(int) set_menu_sub (MENU ,WINDOW );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2928 -extern NCURSES_EXPORT(int) set_menu_term (MENU *, Menu_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2929 -extern NCURSES_EXPORT(int) set_menu_userptr (MENU ,void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2930 -extern NCURSES_EXPORT(int) set_menu_win (MENU ,WINDOW );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2931 -extern NCURSES_EXPORT(int) set_top_row (MENU *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2932 -extern NCURSES_EXPORT(int) top_row (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2933 -extern NCURSES_EXPORT(int) unpost_menu (MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2934 -extern NCURSES_EXPORT(int) menu_request_by_name (const char *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2935 -extern NCURSES_EXPORT(int) set_menu_spacing (MENU *,int,int,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2936 -extern NCURSES_EXPORT(int) menu_spacing (const MENU ,int ,int ,int );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2937 +extern NCMENU_EXPORT(ITEM *) menu_items (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2938 +extern NCMENU_EXPORT(ITEM ) current_item (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2939 +extern NCMENU_EXPORT(ITEM ) new_item (const char ,const char *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2940 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2941 +extern NCMENU_EXPORT(MENU ) new_menu (ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2942 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2943 +extern NCMENU_EXPORT(Item_Options) item_opts (const ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2944 +extern NCMENU_EXPORT(Menu_Options) menu_opts (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2945 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2946 +extern NCMENU_EXPORT(Menu_Hook) item_init (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2947 +extern NCMENU_EXPORT(Menu_Hook) item_term (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2948 +extern NCMENU_EXPORT(Menu_Hook) menu_init (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2949 +extern NCMENU_EXPORT(Menu_Hook) menu_term (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2950 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2951 +extern NCMENU_EXPORT(WINDOW ) menu_sub (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2952 +extern NCMENU_EXPORT(WINDOW ) menu_win (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2953 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2954 +extern NCMENU_EXPORT(const char ) item_description (const ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2955 +extern NCMENU_EXPORT(const char ) item_name (const ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2956 +extern NCMENU_EXPORT(const char ) menu_mark (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2957 +extern NCMENU_EXPORT(const char *) menu_request_name (int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2958 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2959 +extern NCMENU_EXPORT(char ) menu_pattern (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2960 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2961 +extern NCMENU_EXPORT(void ) menu_userptr (const MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2962 +extern NCMENU_EXPORT(void ) item_userptr (const ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2963 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2964 +extern NCMENU_EXPORT(chtype) menu_back (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2965 +extern NCMENU_EXPORT(chtype) menu_fore (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2966 +extern NCMENU_EXPORT(chtype) menu_grey (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2967 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2968 +extern NCMENU_EXPORT(int) free_item (ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2969 +extern NCMENU_EXPORT(int) free_menu (MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2970 +extern NCMENU_EXPORT(int) item_count (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2971 +extern NCMENU_EXPORT(int) item_index (const ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2972 +extern NCMENU_EXPORT(int) item_opts_off (ITEM *,Item_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2973 +extern NCMENU_EXPORT(int) item_opts_on (ITEM *,Item_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2974 +extern NCMENU_EXPORT(int) menu_driver (MENU *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2975 +extern NCMENU_EXPORT(int) menu_opts_off (MENU *,Menu_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2976 +extern NCMENU_EXPORT(int) menu_opts_on (MENU *,Menu_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2977 +extern NCMENU_EXPORT(int) menu_pad (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2978 +extern NCMENU_EXPORT(int) pos_menu_cursor (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2979 +extern NCMENU_EXPORT(int) post_menu (MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2980 +extern NCMENU_EXPORT(int) scale_menu (const MENU ,int ,int *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2981 +extern NCMENU_EXPORT(int) set_current_item (MENU menu,ITEM item);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2982 +extern NCMENU_EXPORT(int) set_item_init (MENU *, Menu_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2983 +extern NCMENU_EXPORT(int) set_item_opts (ITEM *,Item_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2984 +extern NCMENU_EXPORT(int) set_item_term (MENU *, Menu_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2985 +extern NCMENU_EXPORT(int) set_item_userptr (ITEM , void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2986 +extern NCMENU_EXPORT(int) set_item_value (ITEM *,bool);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2987 +extern NCMENU_EXPORT(int) set_menu_back (MENU *,chtype);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2988 +extern NCMENU_EXPORT(int) set_menu_fore (MENU *,chtype);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2989 +extern NCMENU_EXPORT(int) set_menu_format (MENU *,int,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2990 +extern NCMENU_EXPORT(int) set_menu_grey (MENU *,chtype);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2991 +extern NCMENU_EXPORT(int) set_menu_init (MENU *, Menu_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2992 +extern NCMENU_EXPORT(int) set_menu_items (MENU ,ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2993 +extern NCMENU_EXPORT(int) set_menu_mark (MENU , const char );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2994 +extern NCMENU_EXPORT(int) set_menu_opts (MENU *,Menu_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2995 +extern NCMENU_EXPORT(int) set_menu_pad (MENU *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2996 +extern NCMENU_EXPORT(int) set_menu_pattern (MENU ,const char );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2997 +extern NCMENU_EXPORT(int) set_menu_sub (MENU ,WINDOW );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2998 +extern NCMENU_EXPORT(int) set_menu_term (MENU *, Menu_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2999 +extern NCMENU_EXPORT(int) set_menu_userptr (MENU ,void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3000 +extern NCMENU_EXPORT(int) set_menu_win (MENU ,WINDOW );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3001 +extern NCMENU_EXPORT(int) set_top_row (MENU *,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3002 +extern NCMENU_EXPORT(int) top_row (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3003 +extern NCMENU_EXPORT(int) unpost_menu (MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3004 +extern NCMENU_EXPORT(int) menu_request_by_name (const char *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3005 +extern NCMENU_EXPORT(int) set_menu_spacing (MENU *,int,int,int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3006 +extern NCMENU_EXPORT(int) menu_spacing (const MENU ,int ,int ,int );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3007
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3008
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3009 -extern NCURSES_EXPORT(bool) item_value (const ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3010 -extern NCURSES_EXPORT(bool) item_visible (const ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3011 +extern NCMENU_EXPORT(bool) item_value (const ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3012 +extern NCMENU_EXPORT(bool) item_visible (const ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3013
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3014 -extern NCURSES_EXPORT(void) menu_format (const MENU ,int ,int *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3015 +extern NCMENU_EXPORT(void) menu_format (const MENU ,int ,int *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3016
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3017 #if NCURSES_SP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3018 -extern NCURSES_EXPORT(MENU ) NCURSES_SP_NAME(new_menu) (SCREEN, ITEM **);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3019 +extern NCMENU_EXPORT(MENU ) NCURSES_SP_NAME(new_menu) (SCREEN, ITEM **);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3020 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3021
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3022 #ifdef __cplusplus
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3023 diff -ur ncurses-5.9-orig/menu/menu.priv.h ncurses-5.9/menu/menu.priv.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3024 --- ncurses-5.9-orig/menu/menu.priv.h 2009-02-28 16:02:57 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3025 +++ ncurses-5.9/menu/menu.priv.h 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3026 @@ -47,8 +47,8 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3027 /* Backspace code */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3028 #define BS (8)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3029
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3030 -extern NCURSES_EXPORT_VAR(ITEM) _nc_Default_Item;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3031 -extern NCURSES_EXPORT_VAR(MENU) _nc_Default_Menu;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3032 +extern NCMENU_EXPORT_VAR(ITEM) _nc_Default_Item;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3033 +extern NCMENU_EXPORT_VAR(MENU) _nc_Default_Menu;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3034
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3035 /* Normalize item to default if none was given */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3036 #define Normalize_Item( item ) ((item)=(item)?(item):&_nc_Default_Item)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3037 @@ -113,17 +113,17 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3038 #define UChar(c) ((unsigned char)(c))
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3039
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3040 /* Internal functions. */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3041 -extern NCURSES_EXPORT(void) _nc_Draw_Menu (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3042 -extern NCURSES_EXPORT(void) _nc_Show_Menu (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3043 -extern NCURSES_EXPORT(void) _nc_Calculate_Item_Length_and_Width (MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3044 -extern NCURSES_EXPORT(int) _nc_Calculate_Text_Width(const TEXT *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3045 -extern NCURSES_EXPORT(void) _nc_Post_Item (const MENU , const ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3046 -extern NCURSES_EXPORT(bool) _nc_Connect_Items (MENU , ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3047 -extern NCURSES_EXPORT(void) _nc_Disconnect_Items (MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3048 -extern NCURSES_EXPORT(void) _nc_New_TopRow_and_CurrentItem (MENU ,int, ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3049 -extern NCURSES_EXPORT(void) _nc_Link_Items (MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3050 -extern NCURSES_EXPORT(int) _nc_Match_Next_Character_In_Item_Name (MENU,int,ITEM*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3051 -extern NCURSES_EXPORT(int) _nc_menu_cursor_pos (const MENU* menu, const ITEM* item,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3052 +extern NCMENU_EXPORT(void) _nc_Draw_Menu (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3053 +extern NCMENU_EXPORT(void) _nc_Show_Menu (const MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3054 +extern NCMENU_EXPORT(void) _nc_Calculate_Item_Length_and_Width (MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3055 +extern NCMENU_EXPORT(int) _nc_Calculate_Text_Width(const TEXT *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3056 +extern NCMENU_EXPORT(void) _nc_Post_Item (const MENU , const ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3057 +extern NCMENU_EXPORT(bool) _nc_Connect_Items (MENU , ITEM *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3058 +extern NCMENU_EXPORT(void) _nc_Disconnect_Items (MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3059 +extern NCMENU_EXPORT(void) _nc_New_TopRow_and_CurrentItem (MENU ,int, ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3060 +extern NCMENU_EXPORT(void) _nc_Link_Items (MENU *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3061 +extern NCMENU_EXPORT(int) _nc_Match_Next_Character_In_Item_Name (MENU,int,ITEM*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3062 +extern NCMENU_EXPORT(int) _nc_menu_cursor_pos (const MENU* menu, const ITEM* item,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3063 int* pY, int* pX);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3064
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3065 #ifdef TRACE
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3066 @@ -135,12 +135,12 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3067 #define returnMenuHook(code) TRACE_RETURN(code,menu_hook)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3068 #define returnMenuOpts(code) TRACE_RETURN(code,menu_opts)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3069
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3070 -extern NCURSES_EXPORT(ITEM ) _nc_retrace_item (ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3071 -extern NCURSES_EXPORT(ITEM ) _nc_retrace_item_ptr (ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3072 -extern NCURSES_EXPORT(Item_Options) _nc_retrace_item_opts (Item_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3073 -extern NCURSES_EXPORT(MENU ) _nc_retrace_menu (MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3074 -extern NCURSES_EXPORT(Menu_Hook) _nc_retrace_menu_hook (Menu_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3075 -extern NCURSES_EXPORT(Menu_Options) _nc_retrace_menu_opts (Menu_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3076 +extern NCMENU_EXPORT(ITEM ) _nc_retrace_item (ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3077 +extern NCMENU_EXPORT(ITEM ) _nc_retrace_item_ptr (ITEM );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3078 +extern NCMENU_EXPORT(Item_Options) _nc_retrace_item_opts (Item_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3079 +extern NCMENU_EXPORT(MENU ) _nc_retrace_menu (MENU );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3080 +extern NCMENU_EXPORT(Menu_Hook) _nc_retrace_menu_hook (Menu_Hook);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3081 +extern NCMENU_EXPORT(Menu_Options) _nc_retrace_menu_opts (Menu_Options);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3082
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3083 #else /* !TRACE */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3084
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3085 diff -ur ncurses-5.9-orig/mk-1st.awk ncurses-5.9/mk-1st.awk
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3086 --- ncurses-5.9-orig/mk-1st.awk 2010-08-07 16:42:30 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3087 +++ ncurses-5.9/mk-1st.awk 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3088 @@ -396,11 +396,11 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3089 end_name = lib_name;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3090 printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3091 if ( is_ticlib() ) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3092 - printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS, libtool_version
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3093 + printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -shared -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS, libtool_version
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3094 } else if ( is_termlib() ) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3095 - printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS, libtool_version
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3096 + printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -shared -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS, libtool_version
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3097 } else {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3098 - printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS, libtool_version
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3099 + printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -shared -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS, libtool_version
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3100 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3101 print ""
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3102 print "install \\"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3103 diff -ur ncurses-5.9-orig/mk-2nd.awk ncurses-5.9/mk-2nd.awk
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3104 --- ncurses-5.9-orig/mk-2nd.awk 2005-01-22 11:30:04 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3105 +++ ncurses-5.9/mk-2nd.awk 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3106 @@ -122,7 +122,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3107 } else if ( subset ~ /termlib/ ) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3108 mycflags=" -DUSE_TERMLIB"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3109 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3110 - printf "$(LIBTOOL_COMPILE) $(%s) $(CFLAGS_%s)%s -c ", compile, MODEL, mycflags
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3111 + printf "$(LIBTOOL_COMPILE) $(%s) -shared $(CFLAGS_%s)%s -c ", compile, MODEL, mycflags
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3112 if ( $3 == "." \|\| srcdir == "." ) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3113 dir = $3 "/"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3114 sub("^\\$\$srcdir\$/","",dir);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3115 diff -ur ncurses-5.9-orig/ncurses/Makefile.in ncurses-5.9/ncurses/Makefile.in
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3116 --- ncurses-5.9-orig/ncurses/Makefile.in 2010-11-27 16:45:27 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3117 +++ ncurses-5.9/ncurses/Makefile.in 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3118 @@ -93,7 +93,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3119 CFLAGS = @CFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3120
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3121 INCDIR = $(srcdir)/../include
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3122 -CPPFLAGS = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) @CPPFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3123 +CPPFLAGS = -DHAVE_CONFIG_H -DNCURSES_DLL -I../ncurses -I$(srcdir) @CPPFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3124
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3125 CCFLAGS = $(CPPFLAGS) $(CFLAGS)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3126
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3127 diff -ur ncurses-5.9-orig/ncurses/base/MKlib_gen.sh ncurses-5.9/ncurses/base/MKlib_gen.sh
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3128 --- ncurses-5.9-orig/ncurses/base/MKlib_gen.sh 2011-01-22 14:47:29 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3129 +++ ncurses-5.9/ncurses/base/MKlib_gen.sh 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3130 @@ -159,7 +159,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3131
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3132 if test "$USE" = generated ; then
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3133 cat >$ED4 <<EOF
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3134 - s/^$.$ $.$ ($.*$)\$/NCURSES_EXPORT(\1) (\2) (\3)/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3135 + s/^$.$ $.$ ($.*$)\$/NCURSES_EXPORT(\1) \2 (\3)/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3136 EOF
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3137 else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3138 cat >$ED4 <<EOF
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3139 @@ -224,6 +224,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3140 break;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3141 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3142 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3143 + printf "UNDEF %s\n", $myfunc;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3144 print $0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3145 print "{";
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3146 argcount = 1;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3147 @@ -451,4 +452,5 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3148 -e 's/^[ ]*#/#/' \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3149 -e '/#ident/d' \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3150 -e '/#line/d' \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3151 + -e 's/UNDEF/#undef/' \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3152 \| sed -f $ED4
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3153 diff -ur ncurses-5.9-orig/ncurses/base/lib_driver.c ncurses-5.9/ncurses/base/lib_driver.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3154 --- ncurses-5.9-orig/ncurses/base/lib_driver.c 2010-12-19 19:29:17 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3155 +++ ncurses-5.9/ncurses/base/lib_driver.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3156 @@ -42,7 +42,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3157
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3158 static DRIVER_ENTRY DriverTable[] =
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3159 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3160 -#ifdef __MINGW32__
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3161 +#if defined(__MINGW32__) \|\| defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3162 {"win", &_nc_WIN_DRIVER},
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3163 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3164 {"tinfo", &_nc_TINFO_DRIVER}
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3165 diff -ur ncurses-5.9-orig/ncurses/curses.priv.h ncurses-5.9/ncurses/curses.priv.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3166 --- ncurses-5.9-orig/ncurses/curses.priv.h 2011-01-22 16:10:19 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3167 +++ ncurses-5.9/ncurses/curses.priv.h 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3168 @@ -1239,8 +1239,14 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3169 #define W_OK 2 /* Test for write permission. */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3170 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3171 #ifndef X_OK
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3172 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3173 +#define X_OK 0 /* MSVC does not support X_OK and generate invalid
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3174 + * parameter exception if used as argument to "access"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3175 + * function. */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3176 +#else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3177 #define X_OK 1 /* Test for execute permission. */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3178 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3179 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3180 #ifndef F_OK
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3181 #define F_OK 0 /* Test for existence. */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3182 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3183 @@ -1966,7 +1972,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3184 * Not everyone has vsscanf(), but we'd like to use it for scanw().
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3185 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3186 #if !HAVE_VSSCANF
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3187 -extern int vsscanf(const char str, const char format, va_list __arg);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3188 +extern NCURSES_EXPORT(int) vsscanf(const char str, const char format, va_list __arg);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3189 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3190
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3191 /* scroll indices */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3192 @@ -2192,7 +2198,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3193 #endif /* !USE_TERM_DRIVER */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3194
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3195 #ifdef USE_TERM_DRIVER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3196 -#ifdef __MINGW32__
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3197 +#if defined(__MINGW32__) \|\| defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3198 #include <nc_mingw.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3199 extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_WIN_DRIVER;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3200 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3201 diff -ur ncurses-5.9-orig/ncurses/tinfo/comp_parse.c ncurses-5.9/ncurses/tinfo/comp_parse.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3202 --- ncurses-5.9-orig/ncurses/tinfo/comp_parse.c 2010-12-25 18:06:37 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3203 +++ ncurses-5.9/ncurses/tinfo/comp_parse.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3204 @@ -55,11 +55,11 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3205 MODULE_ID("$Id: comp_parse.c,v 1.73 2010/12/25 23:06:37 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3206
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3207 static void sanity_check2(TERMTYPE *, bool);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3208 -NCURSES_IMPEXP void NCURSES_API(_nc_check_termtype2) (TERMTYPE , bool) = sanity_check2;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3209 +NCURSES_IMPEXP void (NCURSES_API _nc_check_termtype2) (TERMTYPE , bool) = sanity_check2;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3210
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3211 /* obsolete: 20040705 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3212 static void sanity_check(TERMTYPE *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3213 -NCURSES_IMPEXP void NCURSES_API(_nc_check_termtype) (TERMTYPE ) = sanity_check;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3214 +NCURSES_IMPEXP void (NCURSES_API _nc_check_termtype) (TERMTYPE ) = sanity_check;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3215
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3216 static void
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3217 enqueue(ENTRY * ep)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3218 diff -ur ncurses-5.9-orig/ncurses/tinfo/db_iterator.c ncurses-5.9/ncurses/tinfo/db_iterator.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3219 --- ncurses-5.9-orig/ncurses/tinfo/db_iterator.c 2010-12-25 18:00:25 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3220 +++ ncurses-5.9/ncurses/tinfo/db_iterator.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3221 @@ -160,6 +160,11 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3222 result = _nc_tic_dir(envp);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3223 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3224 break;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3225 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3226 + case dbdWin32:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3227 + result = _nc_win32_terminfo();
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3228 + break;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3229 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3230 case dbdHome:
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3231 if (use_terminfo_vars()) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3232 result = _nc_home_terminfo();
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3233 diff -ur ncurses-5.9-orig/ncurses/tinfo/home_terminfo.c ncurses-5.9/ncurses/tinfo/home_terminfo.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3234 --- ncurses-5.9-orig/ncurses/tinfo/home_terminfo.c 2010-12-25 18:43:58 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3235 +++ ncurses-5.9/ncurses/tinfo/home_terminfo.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3236 @@ -37,6 +37,12 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3237 #include <curses.priv.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3238 #include <tic.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3239
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3240 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3241 +# include <windows.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3242 +# include <sys/types.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3243 +# include <sys/stat.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3244 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3245 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3246 MODULE_ID("$Id: home_terminfo.c,v 1.12 2010/12/25 23:43:58 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3247
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3248 /* ncurses extension...fall back on user's private directory */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3249 @@ -65,3 +71,58 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3250 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3251 return result;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3252 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3253 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3254 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3255 +NCURSES_EXPORT(char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3256 +_nc_win32_terminfo(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3257 +{
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3258 + char *result = NULL;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3259 + static char *temp = NULL;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3260 + int n = 1024, nr;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3261 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3262 + if (temp == NULL) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3263 + HMODULE hmod;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3264 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3265 + if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3266 + (LPCTSTR)_nc_win32_terminfo,
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3267 + &hmod)) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3268 + do {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3269 + if (temp == NULL)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3270 + temp = typeMalloc(char, n);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3271 + else {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3272 + n *= 2;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3273 + temp = typeRealloc(char, n, temp);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3274 + }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3275 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3276 + if ((nr = GetModuleFileName(hmod, temp, n)) == 0)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3277 + break;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3278 + else if (nr < n) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3279 + char *p = strrchr(temp, '\\');
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3280 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3281 + if (p != 0) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3282 + *p = 0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3283 + nr = strlen(temp);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3284 + if (nr > 4 && strncmp(&temp[nr-4], "\\bin", 4) == 0) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3285 + struct stat st;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3286 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3287 + temp = typeRealloc(char, nr-4+64, temp);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3288 + strcpy(&temp[nr-4], "\\share\\terminfo");
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3289 + if (stat(temp, &st) == 0 && (st.st_mode & _S_IFDIR) != 0)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3290 + result = temp;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3291 + }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3292 + }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3293 + break;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3294 + }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3295 + } while (1);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3296 + }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3297 + } else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3298 + result = temp;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3299 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3300 + if (result == NULL && temp != NULL) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3301 + free(temp);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3302 + temp = NULL;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3303 + }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3304 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3305 + return result;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3306 +}
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3307 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3308 diff -ur ncurses-5.9-orig/ncurses/tinfo/lib_print.c ncurses-5.9/ncurses/tinfo/lib_print.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3309 --- ncurses-5.9-orig/ncurses/tinfo/lib_print.c 2010-06-05 18:18:35 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3310 +++ ncurses-5.9/ncurses/tinfo/lib_print.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3311 @@ -95,7 +95,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3312 * kernel will ship the contiguous clist items from the last write
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3313 * immediately.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3314 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3315 -#ifndef __MINGW32__
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3316 +#if !defined(__MINGW32__) && !defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3317 (void) sleep(0);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3318 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3319 free(mybuf);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3320 diff -ur ncurses-5.9-orig/ncurses/tinfo/setbuf.c ncurses-5.9/ncurses/tinfo/setbuf.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3321 --- ncurses-5.9-orig/ncurses/tinfo/setbuf.c 2010-08-28 17:08:31 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3322 +++ ncurses-5.9/ncurses/tinfo/setbuf.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3323 @@ -149,8 +149,13 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3324 #ifdef SETVBUF_REVERSED /* pre-svr3? */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3325 (void) setvbuf(ofp, buf_ptr, buf_len, buf_len ? _IOFBF : _IOLBF);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3326 #else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3327 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3328 + /* MSVC does not accept 0 as buffer size */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3329 + (void) setvbuf(ofp, buf_ptr, buf_len ? _IOFBF : _IOLBF, buf_len ? buf_len : BUFSIZ);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3330 +#else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3331 (void) setvbuf(ofp, buf_ptr, buf_len ? _IOFBF : _IOLBF, buf_len);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3332 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3333 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3334 #elif HAVE_SETBUFFER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3335 (void) setbuffer(ofp, buf_ptr, (int) buf_len);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3336 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3337 diff -ur ncurses-5.9-orig/ncurses/tinfo/write_entry.c ncurses-5.9/ncurses/tinfo/write_entry.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3338 --- ncurses-5.9-orig/ncurses/tinfo/write_entry.c 2010-12-25 18:23:08 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3339 +++ ncurses-5.9/ncurses/tinfo/write_entry.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3340 @@ -173,7 +173,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3341
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3342 if ((rc = stat(path, &statbuf)) < 0) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3343 rc = mkdir(path
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3344 -#if !defined(__MINGW32__)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3345 +#if !defined(__MINGW32__) && !defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3346 ,0777
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3347 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3348 );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3349 diff -ur ncurses-5.9-orig/ncurses/trace/lib_trace.c ncurses-5.9/ncurses/trace/lib_trace.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3350 --- ncurses-5.9-orig/ncurses/trace/lib_trace.c 2010-12-18 20:21:19 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3351 +++ ncurses-5.9/ncurses/trace/lib_trace.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3352 @@ -121,7 +121,11 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3353 * end of each line. This is useful in case the program dies.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3354 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3355 #if HAVE_SETVBUF /* ANSI */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3356 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3357 + (void) setvbuf(TraceFP, (char *) 0, _IOLBF, BUFSIZ);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3358 +#else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3359 (void) setvbuf(TraceFP, (char *) 0, _IOLBF, 0);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3360 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3361 #elif HAVE_SETBUF /* POSIX */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3362 (void) setbuffer(TraceFP, (char *) 0);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3363 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3364 @@ -184,7 +188,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3365 # if USE_WEAK_SYMBOLS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3366 if ((pthread_self))
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3367 # endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3368 -#ifdef __MINGW32__
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3369 +#if defined(__MINGW32__) \|\| defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3370 fprintf(TraceFP, "%#lx:", (long) (void *) pthread_self().p);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3371 #else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3372 fprintf(TraceFP, "%#lx:", (long) (void *) pthread_self());
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3373 diff -ur ncurses-5.9-orig/ncurses/tty/lib_twait.c ncurses-5.9/ncurses/tty/lib_twait.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3374 --- ncurses-5.9-orig/ncurses/tty/lib_twait.c 2010-12-25 18:43:58 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3375 +++ ncurses-5.9/ncurses/tty/lib_twait.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3376 @@ -65,8 +65,12 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3377 # include <sys/select.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3378 # endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3379 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3380 -#ifdef __MINGW32__
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3381 -# include <sys/time.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3382 +#if defined(__MINGW32__) \|\| defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3383 +# ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3384 +# include <winsock2.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3385 +# else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3386 +# include <sys/time.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3387 +# endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3388 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3389 #undef CUR
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3390
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3391 diff -ur ncurses-5.9-orig/ncurses/win32con/win_driver.c ncurses-5.9/ncurses/win32con/win_driver.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3392 --- ncurses-5.9-orig/ncurses/win32con/win_driver.c 2010-12-25 14:28:21 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3393 +++ ncurses-5.9/ncurses/win32con/win_driver.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3394 @@ -138,7 +138,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3395 static BOOL
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3396 con_write(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, chtype *str, int n)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3397 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3398 - CHAR_INFO ci[n];
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3399 + CHAR_INFO* ci = (CHAR_INFO)_alloca(n sizeof(CHAR_INFO*));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3400 COORD loc, siz;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3401 SMALL_RECT rec;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3402 int i;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3403 @@ -197,7 +197,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3404
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3405 if ((CurScreen(sp)->_clear \|\| NewScreen(sp)->_clear)) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3406 int x;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3407 - chtype empty[Width];
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3408 + chtype* empty = (chtype)_alloca(Width sizeof(chtype));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3409
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3410 for (x = 0; x < Width; x++)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3411 empty[x] = ' ';
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3412 diff -ur ncurses-5.9-orig/panel/Makefile.in ncurses-5.9/panel/Makefile.in
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3413 --- ncurses-5.9-orig/panel/Makefile.in 2010-11-27 16:45:27 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3414 +++ ncurses-5.9/panel/Makefile.in 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3415 @@ -85,7 +85,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3416 CPP = @CPP@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3417 CFLAGS = @CFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3418
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3419 -CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H @CPPFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3420 +CPPFLAGS = -I@top_srcdir@/ncurses -DHAVE_CONFIG_H -DNCPANEL_DLL @CPPFLAGS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3421
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3422 CCFLAGS = $(CPPFLAGS) $(CFLAGS)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3423
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3424 diff -ur ncurses-5.9-orig/panel/p_above.c ncurses-5.9/panel/p_above.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3425 --- ncurses-5.9-orig/panel/p_above.c 2010-01-23 16:22:15 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3426 +++ ncurses-5.9/panel/p_above.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3427 @@ -39,7 +39,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3428 MODULE_ID("$Id: p_above.c,v 1.8 2010/01/23 21:22:15 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3429
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3430 #if NCURSES_SP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3431 -NCURSES_EXPORT(PANEL *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3432 +NCPANEL_EXPORT(PANEL *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3433 ground_panel(SCREEN * sp)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3434 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3435 T((T_CALLED("ground_panel(%p)"), sp));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3436 @@ -62,7 +62,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3437 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3438 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3439
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3440 -NCURSES_EXPORT(PANEL *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3441 +NCPANEL_EXPORT(PANEL *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3442 panel_above(const PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3443 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3444 PANEL *result;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3445 diff -ur ncurses-5.9-orig/panel/p_below.c ncurses-5.9/panel/p_below.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3446 --- ncurses-5.9-orig/panel/p_below.c 2010-01-23 16:22:15 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3447 +++ ncurses-5.9/panel/p_below.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3448 @@ -39,7 +39,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3449 MODULE_ID("$Id: p_below.c,v 1.8 2010/01/23 21:22:15 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3450
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3451 #if NCURSES_SP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3452 -NCURSES_EXPORT(PANEL *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3453 +NCPANEL_EXPORT(PANEL *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3454 ceiling_panel(SCREEN * sp)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3455 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3456 T((T_CALLED("ceiling_panel(%p)"), sp));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3457 @@ -60,7 +60,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3458 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3459 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3460
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3461 -NCURSES_EXPORT(PANEL *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3462 +NCPANEL_EXPORT(PANEL *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3463 panel_below(const PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3464 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3465 PANEL *result;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3466 diff -ur ncurses-5.9-orig/panel/p_bottom.c ncurses-5.9/panel/p_bottom.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3467 --- ncurses-5.9-orig/panel/p_bottom.c 2010-01-23 16:22:16 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3468 +++ ncurses-5.9/panel/p_bottom.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3469 @@ -39,7 +39,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3470
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3471 MODULE_ID("$Id: p_bottom.c,v 1.13 2010/01/23 21:22:16 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3472
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3473 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3474 +NCPANEL_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3475 bottom_panel(PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3476 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3477 int err = OK;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3478 diff -ur ncurses-5.9-orig/panel/p_delete.c ncurses-5.9/panel/p_delete.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3479 --- ncurses-5.9-orig/panel/p_delete.c 2010-01-23 16:22:16 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3480 +++ ncurses-5.9/panel/p_delete.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3481 @@ -39,7 +39,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3482
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3483 MODULE_ID("$Id: p_delete.c,v 1.10 2010/01/23 21:22:16 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3484
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3485 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3486 +NCPANEL_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3487 del_panel(PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3488 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3489 int err = OK;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3490 diff -ur ncurses-5.9-orig/panel/p_hidden.c ncurses-5.9/panel/p_hidden.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3491 --- ncurses-5.9-orig/panel/p_hidden.c 2010-01-23 16:22:15 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3492 +++ ncurses-5.9/panel/p_hidden.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3493 @@ -39,7 +39,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3494
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3495 MODULE_ID("$Id: p_hidden.c,v 1.9 2010/01/23 21:22:15 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3496
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3497 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3498 +NCPANEL_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3499 panel_hidden(const PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3500 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3501 int rc = ERR;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3502 diff -ur ncurses-5.9-orig/panel/p_hide.c ncurses-5.9/panel/p_hide.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3503 --- ncurses-5.9-orig/panel/p_hide.c 2010-01-23 16:22:16 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3504 +++ ncurses-5.9/panel/p_hide.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3505 @@ -38,7 +38,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3506
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3507 MODULE_ID("$Id: p_hide.c,v 1.11 2010/01/23 21:22:16 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3508
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3509 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3510 +NCPANEL_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3511 hide_panel(register PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3512 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3513 int err = ERR;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3514 diff -ur ncurses-5.9-orig/panel/p_move.c ncurses-5.9/panel/p_move.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3515 --- ncurses-5.9-orig/panel/p_move.c 2010-01-23 16:22:15 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3516 +++ ncurses-5.9/panel/p_move.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3517 @@ -39,7 +39,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3518
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3519 MODULE_ID("$Id: p_move.c,v 1.11 2010/01/23 21:22:15 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3520
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3521 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3522 +NCPANEL_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3523 move_panel(PANEL * pan, int starty, int startx)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3524 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3525 int rc = ERR;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3526 diff -ur ncurses-5.9-orig/panel/p_new.c ncurses-5.9/panel/p_new.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3527 --- ncurses-5.9-orig/panel/p_new.c 2010-01-23 16:22:16 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3528 +++ ncurses-5.9/panel/p_new.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3529 @@ -88,7 +88,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3530 return _nc_stdscr_pseudo_panel;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3531 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3532
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3533 -NCURSES_EXPORT(PANEL *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3534 +NCPANEL_EXPORT(PANEL *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3535 new_panel(WINDOW *win)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3536 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3537 PANEL pan = (PANEL ) 0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3538 diff -ur ncurses-5.9-orig/panel/p_replace.c ncurses-5.9/panel/p_replace.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3539 --- ncurses-5.9-orig/panel/p_replace.c 2010-01-23 16:22:16 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3540 +++ ncurses-5.9/panel/p_replace.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3541 @@ -38,7 +38,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3542
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3543 MODULE_ID("$Id: p_replace.c,v 1.11 2010/01/23 21:22:16 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3544
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3545 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3546 +NCPANEL_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3547 replace_panel(PANEL * pan, WINDOW *win)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3548 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3549 int rc = ERR;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3550 diff -ur ncurses-5.9-orig/panel/p_show.c ncurses-5.9/panel/p_show.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3551 --- ncurses-5.9-orig/panel/p_show.c 2010-01-23 16:22:16 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3552 +++ ncurses-5.9/panel/p_show.c 2013-07-04 18:38:38 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3553 @@ -38,7 +38,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3554
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3555 MODULE_ID("$Id: p_show.c,v 1.13 2010/01/23 21:22:16 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3556
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3557 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3558 +NCPANEL_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3559 show_panel(PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3560 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3561 int err = ERR;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3562 diff -ur ncurses-5.9-orig/panel/p_top.c ncurses-5.9/panel/p_top.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3563 --- ncurses-5.9-orig/panel/p_top.c 2010-01-23 16:22:16 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3564 +++ ncurses-5.9/panel/p_top.c 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3565 @@ -38,7 +38,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3566
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3567 MODULE_ID("$Id: p_top.c,v 1.6 2010/01/23 21:22:16 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3568
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3569 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3570 +NCPANEL_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3571 top_panel(PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3572 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3573 T((T_CALLED("top_panel(%p)"), (void *)pan));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3574 diff -ur ncurses-5.9-orig/panel/p_update.c ncurses-5.9/panel/p_update.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3575 --- ncurses-5.9-orig/panel/p_update.c 2010-01-23 16:22:16 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3576 +++ ncurses-5.9/panel/p_update.c 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3577 @@ -39,7 +39,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3578
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3579 MODULE_ID("$Id: p_update.c,v 1.11 2010/01/23 21:22:16 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3580
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3581 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3582 +NCPANEL_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3583 NCURSES_SP_NAME(update_panels) (NCURSES_SP_DCL0)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3584 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3585 PANEL *pan;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3586 @@ -70,7 +70,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3587 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3588
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3589 #if NCURSES_SP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3590 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3591 +NCPANEL_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3592 update_panels(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3593 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3594 NCURSES_SP_NAME(update_panels) (CURRENT_SCREEN);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3595 diff -ur ncurses-5.9-orig/panel/p_user.c ncurses-5.9/panel/p_user.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3596 --- ncurses-5.9-orig/panel/p_user.c 2010-01-23 18:18:35 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3597 +++ ncurses-5.9/panel/p_user.c 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3598 @@ -38,7 +38,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3599
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3600 MODULE_ID("$Id: p_user.c,v 1.8 2010/01/23 23:18:35 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3601
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3602 -NCURSES_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3603 +NCPANEL_EXPORT(int)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3604 set_panel_userptr(PANEL * pan, NCURSES_CONST void *uptr)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3605 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3606 T((T_CALLED("set_panel_userptr(%p,%p)"), (void )pan, (NCURSES_CONST void )uptr));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3607 @@ -48,7 +48,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3608 returnCode(OK);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3609 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3610
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3611 -NCURSES_EXPORT(NCURSES_CONST void *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3612 +NCPANEL_EXPORT(NCURSES_CONST void *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3613 panel_userptr(const PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3614 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3615 T((T_CALLED("panel_userptr(%p)"), (const void *)pan));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3616 diff -ur ncurses-5.9-orig/panel/p_win.c ncurses-5.9/panel/p_win.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3617 --- ncurses-5.9-orig/panel/p_win.c 2010-01-23 16:22:15 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3618 +++ ncurses-5.9/panel/p_win.c 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3619 @@ -38,7 +38,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3620
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3621 MODULE_ID("$Id: p_win.c,v 1.6 2010/01/23 21:22:15 tom Exp $")
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3622
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3623 -NCURSES_EXPORT(WINDOW *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3624 +NCPANEL_EXPORT(WINDOW *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3625 panel_window(const PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3626 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3627 T((T_CALLED("panel_window(%p)"), (const void *)pan));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3628 diff -ur ncurses-5.9-orig/panel/panel.c ncurses-5.9/panel/panel.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3629 --- ncurses-5.9-orig/panel/panel.c 2010-01-23 16:22:16 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3630 +++ ncurses-5.9/panel/panel.c 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3631 @@ -42,7 +42,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3632 _nc_retrace_panel (pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3633 --------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3634 #ifdef TRACE
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3635 -NCURSES_EXPORT(PANEL *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3636 +NCPANEL_EXPORT(PANEL *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3637 _nc_retrace_panel(PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3638 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3639 T((T_RETURN("%p"), (void *)pan));
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3640 @@ -55,7 +55,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3641 --------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3642 #ifdef TRACE
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3643 #ifndef TRACE_TXT
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3644 -NCURSES_EXPORT(const char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3645 +NCPANEL_EXPORT(const char *)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3646 _nc_my_visbuf(const void *ptr)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3647 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3648 char temp[32];
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3649 @@ -73,7 +73,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3650 dPanel(text,pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3651 --------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3652 #ifdef TRACE
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3653 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3654 +NCPANEL_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3655 _nc_dPanel(const char text, const PANEL pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3656 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3657 _tracef("%s id=%s b=%s a=%s y=%d x=%d",
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3658 @@ -88,7 +88,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3659 dStack(fmt,num,pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3660 --------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3661 #ifdef TRACE
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3662 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3663 +NCPANEL_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3664 _nc_dStack(const char fmt, int num, const PANEL pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3665 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3666 char s80[80];
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3667 @@ -114,7 +114,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3668 Wnoutrefresh(pan) - debugging hook for wnoutrefresh
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3669 --------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3670 #ifdef TRACE
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3671 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3672 +NCPANEL_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3673 _nc_Wnoutrefresh(const PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3674 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3675 dPanel("wnoutrefresh", pan);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3676 @@ -126,7 +126,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3677 Touchpan(pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3678 --------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3679 #ifdef TRACE
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3680 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3681 +NCPANEL_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3682 _nc_Touchpan(const PANEL * pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3683 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3684 dPanel("Touchpan", pan);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3685 @@ -138,7 +138,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3686 Touchline(pan,start,count)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3687 --------------------------------------------------------------------------*/
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3688 #ifdef TRACE
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3689 -NCURSES_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3690 +NCPANEL_EXPORT(void)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3691 _nc_Touchline(const PANEL * pan, int start, int count)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3692 {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3693 char s80[80];
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3694 diff -ur ncurses-5.9-orig/panel/panel.h ncurses-5.9/panel/panel.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3695 --- ncurses-5.9-orig/panel/panel.h 2009-04-11 15:50:40 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3696 +++ ncurses-5.9/panel/panel.h 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3697 @@ -53,27 +53,27 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3698 extern "C" {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3699 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3700
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3701 -extern NCURSES_EXPORT(WINDOW) panel_window (const PANEL );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3702 -extern NCURSES_EXPORT(void) update_panels (void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3703 -extern NCURSES_EXPORT(int) hide_panel (PANEL *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3704 -extern NCURSES_EXPORT(int) show_panel (PANEL *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3705 -extern NCURSES_EXPORT(int) del_panel (PANEL *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3706 -extern NCURSES_EXPORT(int) top_panel (PANEL *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3707 -extern NCURSES_EXPORT(int) bottom_panel (PANEL *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3708 -extern NCURSES_EXPORT(PANEL) new_panel (WINDOW );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3709 -extern NCURSES_EXPORT(PANEL) panel_above (const PANEL );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3710 -extern NCURSES_EXPORT(PANEL) panel_below (const PANEL );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3711 -extern NCURSES_EXPORT(int) set_panel_userptr (PANEL , NCURSES_CONST void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3712 -extern NCURSES_EXPORT(NCURSES_CONST void) panel_userptr (const PANEL );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3713 -extern NCURSES_EXPORT(int) move_panel (PANEL *, int, int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3714 -extern NCURSES_EXPORT(int) replace_panel (PANEL ,WINDOW );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3715 -extern NCURSES_EXPORT(int) panel_hidden (const PANEL *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3716 +extern NCPANEL_EXPORT(WINDOW) panel_window (const PANEL );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3717 +extern NCPANEL_EXPORT(void) update_panels (void);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3718 +extern NCPANEL_EXPORT(int) hide_panel (PANEL *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3719 +extern NCPANEL_EXPORT(int) show_panel (PANEL *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3720 +extern NCPANEL_EXPORT(int) del_panel (PANEL *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3721 +extern NCPANEL_EXPORT(int) top_panel (PANEL *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3722 +extern NCPANEL_EXPORT(int) bottom_panel (PANEL *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3723 +extern NCPANEL_EXPORT(PANEL) new_panel (WINDOW );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3724 +extern NCPANEL_EXPORT(PANEL) panel_above (const PANEL );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3725 +extern NCPANEL_EXPORT(PANEL) panel_below (const PANEL );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3726 +extern NCPANEL_EXPORT(int) set_panel_userptr (PANEL , NCURSES_CONST void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3727 +extern NCPANEL_EXPORT(NCURSES_CONST void) panel_userptr (const PANEL );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3728 +extern NCPANEL_EXPORT(int) move_panel (PANEL *, int, int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3729 +extern NCPANEL_EXPORT(int) replace_panel (PANEL ,WINDOW );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3730 +extern NCPANEL_EXPORT(int) panel_hidden (const PANEL *);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3731
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3732 #if NCURSES_SP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3733 -extern NCURSES_EXPORT(PANEL ) ground_panel(SCREEN );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3734 -extern NCURSES_EXPORT(PANEL ) ceiling_panel(SCREEN );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3735 +extern NCPANEL_EXPORT(PANEL ) ground_panel(SCREEN );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3736 +extern NCPANEL_EXPORT(PANEL ) ceiling_panel(SCREEN );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3737
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3738 -extern NCURSES_EXPORT(void) NCURSES_SP_NAME(update_panels) (SCREEN*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3739 +extern NCPANEL_EXPORT(void) NCURSES_SP_NAME(update_panels) (SCREEN*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3740 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3741
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3742 #if defined(__cplusplus)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3743 diff -ur ncurses-5.9-orig/panel/panel.priv.h ncurses-5.9/panel/panel.priv.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3744 --- ncurses-5.9-orig/panel/panel.priv.h 2009-04-11 16:33:55 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3745 +++ ncurses-5.9/panel/panel.priv.h 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3746 @@ -53,7 +53,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3747
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3748
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3749 #ifdef TRACE
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3750 - extern NCURSES_EXPORT(const char ) _nc_my_visbuf (const void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3751 + extern NCPANEL_EXPORT(const char ) _nc_my_visbuf (const void );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3752 # ifdef TRACE_TXT
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3753 # define USER_PTR(ptr) _nc_visbuf((const char *)ptr)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3754 # else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3755 @@ -62,12 +62,12 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3756
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3757 # define returnPanel(code) TRACE_RETURN(code,panel)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3758
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3759 - extern NCURSES_EXPORT(PANEL ) _nc_retrace_panel (PANEL );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3760 - extern NCURSES_EXPORT(void) _nc_dPanel (const char, const PANEL);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3761 - extern NCURSES_EXPORT(void) _nc_dStack (const char, int, const PANEL);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3762 - extern NCURSES_EXPORT(void) _nc_Wnoutrefresh (const PANEL*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3763 - extern NCURSES_EXPORT(void) _nc_Touchpan (const PANEL*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3764 - extern NCURSES_EXPORT(void) _nc_Touchline (const PANEL*, int, int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3765 + extern NCPANEL_EXPORT(PANEL ) _nc_retrace_panel (PANEL );
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3766 + extern NCPANEL_EXPORT(void) _nc_dPanel (const char, const PANEL);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3767 + extern NCPANEL_EXPORT(void) _nc_dStack (const char, int, const PANEL);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3768 + extern NCPANEL_EXPORT(void) _nc_Wnoutrefresh (const PANEL*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3769 + extern NCPANEL_EXPORT(void) _nc_Touchpan (const PANEL*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3770 + extern NCPANEL_EXPORT(void) _nc_Touchline (const PANEL*, int, int);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3771
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3772 # define dBug(x) _tracef x
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3773 # define dPanel(text,pan) _nc_dPanel(text,pan)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3774 @@ -208,7 +208,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3775
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3776 #if NCURSES_SP_FUNCS
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3777 /* These may become later renamed and part of panel.h and the public API */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3778 -extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_update_panels)(SCREEN*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3779 +extern NCPANEL_EXPORT(void) NCURSES_SP_NAME(_nc_update_panels)(SCREEN*);
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3780 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3781
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3782 #endif /* NCURSES_PANEL_PRIV_H */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3783 diff -ur ncurses-5.9-orig/progs/Makefile.in ncurses-5.9/progs/Makefile.in
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3784 --- ncurses-5.9-orig/progs/Makefile.in 2010-11-27 16:45:27 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3785 +++ ncurses-5.9/progs/Makefile.in 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3786 @@ -113,10 +113,10 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3787
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3788 LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3789
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3790 -LIBS_TIC = @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3791 +LIBS_TIC = @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@ -lgetopt
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3792 LDFLAGS_TIC = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3793
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3794 -LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3795 +LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@ -lgetopt
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3796 LDFLAGS_TINFO = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3797
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3798 LINT = @LINT@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3799 diff -ur ncurses-5.9-orig/progs/progs.priv.h ncurses-5.9/progs/progs.priv.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3800 --- ncurses-5.9-orig/progs/progs.priv.h 2008-08-03 13:43:05 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3801 +++ ncurses-5.9/progs/progs.priv.h 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3802 @@ -148,8 +148,14 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3803 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3804
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3805 #ifndef X_OK
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3806 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3807 +#define X_OK 0 /* MSVC does not support X_OK and generate invalid
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3808 + * parameter exception if used as argument to "access"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3809 + * function. */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3810 +#else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3811 #define X_OK 1 /* Test for executable. */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3812 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3813 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3814
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3815 #ifndef F_OK
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3816 #define F_OK 0 /* Test for existence. */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3817 diff -ur ncurses-5.9-orig/test/Makefile.in ncurses-5.9/test/Makefile.in
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3818 --- ncurses-5.9-orig/test/Makefile.in 2010-11-28 11:39:40 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3819 +++ ncurses-5.9/test/Makefile.in 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3820 @@ -105,7 +105,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3821 TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3822
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3823 # use these for linking with all of the libraries
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3824 -LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3825 +LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB) -lgetopt
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3826 LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3827
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3828 # use these for linking with the (n)curses library and possibly pthreads
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3829 @@ -113,11 +113,11 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3830 LDFLAGS_THREADS = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_THREADS)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3831
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3832 # use these for linking with the (n)curses library
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3833 -LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" \| sed -e 's/-lform.-lpanel[^ ]//'` $(TEST_LIBS) $(MATH_LIB)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3834 +LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" \| sed -e 's/-lform.-lpanel[^ ]//'` $(TEST_LIBS) $(MATH_LIB) -lgetopt
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3835 LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3836
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3837 # use these for linking with the tinfo library if we have it, or curses library if not
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3838 -LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3839 +LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB) -lgetopt
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3840 LDFLAGS_TINFO = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3841
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3842 LINT = @LINT@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3843 diff -ur ncurses-5.9-orig/test/dots.c ncurses-5.9/test/dots.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3844 --- ncurses-5.9-orig/test/dots.c 2010-11-13 20:00:02 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3845 +++ ncurses-5.9/test/dots.c 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3846 @@ -42,6 +42,10 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3847
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3848 #define valid(s) ((s != 0) && s != (char *)-1)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3849
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3850 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3851 +# define STDOUT_FILENO 1
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3852 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3853 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3854 static bool interrupted = FALSE;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3855 static long total_chars = 0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3856 static time_t started;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3857 diff -ur ncurses-5.9-orig/test/dots_mvcur.c ncurses-5.9/test/dots_mvcur.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3858 --- ncurses-5.9-orig/test/dots_mvcur.c 2010-11-13 20:00:44 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3859 +++ ncurses-5.9/test/dots_mvcur.c 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3860 @@ -42,6 +42,10 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3861
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3862 #define valid(s) ((s != 0) && s != (char *)-1)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3863
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3864 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3865 +# define STDOUT_FILENO 1
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3866 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3867 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3868 static bool interrupted = FALSE;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3869 static long total_chars = 0;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3870 static time_t started;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3871 diff -ur ncurses-5.9-orig/test/ncurses.c ncurses-5.9/test/ncurses.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3872 --- ncurses-5.9-orig/test/ncurses.c 2011-01-22 14:48:33 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3873 +++ ncurses-5.9/test/ncurses.c 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3874 @@ -487,7 +487,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3875 addstr("Shelling out...");
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3876 def_prog_mode();
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3877 endwin();
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3878 -#ifdef __MINGW32__
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3879 +#if defined(__MINGW32__) \|\| defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3880 system("cmd.exe");
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3881 #else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3882 system("sh");
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3883 diff -ur ncurses-5.9-orig/test/railroad.c ncurses-5.9/test/railroad.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3884 --- ncurses-5.9-orig/test/railroad.c 2009-10-24 17:37:56 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3885 +++ ncurses-5.9/test/railroad.c 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3886 @@ -36,6 +36,10 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3887 #define USE_TINFO
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3888 #include <test.priv.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3889
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3890 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3891 +# define STDOUT_FILENO 1
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3892 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3893 +
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3894 #if HAVE_TGETENT
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3895
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3896 static char *wipeit;
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3897 diff -ur ncurses-5.9-orig/test/rain.c ncurses-5.9/test/rain.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3898 --- ncurses-5.9-orig/test/rain.c 2010-11-13 15:11:46 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3899 +++ ncurses-5.9/test/rain.c 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3900 @@ -222,7 +222,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3901 * Find myself in the list of threads so we can count the number of loops.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3902 */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3903 for (mystats = 0; mystats < MAX_THREADS; ++mystats) {
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3904 -#ifdef __MINGW32__
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3905 +#if defined(__MINGW32__) \|\| defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3906 if (drop_threads[mystats].myself.p == pthread_self().p)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3907 #else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3908 if (drop_threads[mystats].myself == pthread_self())
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3909 diff -ur ncurses-5.9-orig/test/test.priv.h ncurses-5.9/test/test.priv.h
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3910 --- ncurses-5.9-orig/test/test.priv.h 2011-03-22 05:15:45 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3911 +++ ncurses-5.9/test/test.priv.h 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3912 @@ -609,7 +609,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3913 #define EXIT_FAILURE 1
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3914 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3915
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3916 -#ifdef __MINGW32__
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3917 +#if defined(__MINGW32__) \|\| defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3918 #include <nc_mingw.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3919 /* conflicts in test/firstlast.c */
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3920 #undef large
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3921 @@ -641,12 +641,24 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3922
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3923 #define VT_ACSC "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{\|\|}}~~"
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3924
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3925 +#ifdef _MSC_VER
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3926 +#define CATCHALL(handler) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3927 + do { \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3928 + /* These are the only signal allowed by MSVC. */ \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3929 + signal(SIGINT, handler); \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3930 + signal(SIGILL, handler); \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3931 + signal(SIGFPE, handler); \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3932 + signal(SIGSEGV, handler); \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3933 + signal(SIGABRT, handler); \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3934 + } while (0)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3935 +#else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3936 #define CATCHALL(handler) { \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3937 int nsig; \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3938 for (nsig = SIGHUP; nsig < SIGTERM; ++nsig) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3939 if (nsig != SIGKILL) \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3940 signal(nsig, handler); \
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3941 }
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3942 +#endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3943
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3944 /*
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3945 * Workaround for clean(er) compile with Solaris's legacy curses.
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3946 diff -ur ncurses-5.9-orig/test/view.c ncurses-5.9/test/view.c
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3947 --- ncurses-5.9-orig/test/view.c 2010-11-13 20:06:02 -0500
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3948 +++ ncurses-5.9/test/view.c 2013-07-04 18:38:39 -0400
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3949 @@ -62,7 +62,7 @@
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3950 #if HAVE_TERMIOS_H
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3951 # include <termios.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3952 #else
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3953 -#if !defined(__MINGW32__)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3954 +#if !defined(__MINGW32__) && !defined(_MSC_VER)
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3955 # include <sgtty.h>
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3956 #endif
21f598a028ec [MSVC] enable ncurses compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3957 #endif

Mercurial > mxe-octave

annotate src/msvc-ncurses-1.patch @ 3725:2acaa9943159