diff --git a/latest/pw3270.cbp b/latest/pw3270.cbp
index f4cae08..14dea41 100644
--- a/latest/pw3270.cbp
+++ b/latest/pw3270.cbp
@@ -489,7 +489,6 @@
-
@@ -618,6 +617,7 @@
+
diff --git a/latest/src/include/lib3270/api.h b/latest/src/include/lib3270/api.h
index 1394f2b..ae09d12 100644
--- a/latest/src/include/lib3270/api.h
+++ b/latest/src/include/lib3270/api.h
@@ -547,6 +547,8 @@
LIB3270_EXPORT const char * get_connected_lu(H3270 *h);
LIB3270_EXPORT const char * get_current_host(H3270 *h);
+ LIB3270_EXPORT SCRIPT_STATE status_script(SCRIPT_STATE state);
+
LIB3270_EXPORT int Toggled(int ix);
LIB3270_EXPORT int CallAndWait(int(*callback)(void *), void *parm);
diff --git a/latest/src/include/lib3270/statusc.h b/latest/src/include/lib3270/statusc.h
deleted file mode 100644
index 79bea10..0000000
--- a/latest/src/include/lib3270/statusc.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 1999, 2000, 2002 by Paul Mattes.
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation.
- *
- * c3270 is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the file LICENSE for more details.
- */
-
-/* c3270 verson of statusc.h */
-
-#include
-
-LIB3270_EXPORT void status_compose(int on, unsigned char c, enum keytype keytype);
-LIB3270_EXPORT void status_ctlr_done(void);
-LIB3270_EXPORT SCRIPT_STATE status_script(SCRIPT_STATE state);
-
-LIB3270_EXPORT void status_timing(struct timeval *t0, struct timeval *t1);
-LIB3270_EXPORT void status_untiming(void);
-
-LIB3270_EXPORT void status_lu(const char *);
-LIB3270_EXPORT void status_oerr(int error_type);
-LIB3270_EXPORT void status_reset(void);
-LIB3270_EXPORT void status_reverse_mode(int on);
-LIB3270_EXPORT void status_twait(void);
-LIB3270_EXPORT void status_typeahead(int on);
-
-LIB3270_EXPORT void status_changed(STATUS_CODE id);
-
-#define status_kybdlock() status_changed(STATUS_CODE_KYBDLOCK)
-#define status_syswait() status_changed(STATUS_CODE_SYSWAIT)
-#define status_minus() status_changed(STATUS_CODE_MINUS)
-
-
-extern int lib3270_event_counter[COUNTER_ID_USER];
diff --git a/latest/src/lib/screen.c b/latest/src/lib/screen.c
index 102fc75..7c4b307 100644
--- a/latest/src/lib/screen.c
+++ b/latest/src/lib/screen.c
@@ -168,29 +168,6 @@ int screen_init(H3270 *session)
return 0;
}
-/*
- * Parse a tri-state resource value.
- * Returns True for success, False for failure.
- */ /*
-static Boolean
-ts_value(const char *s, enum ts *tsp)
-{
- *tsp = TS_AUTO;
-
- if (s != CN && s[0]) {
- int sl = strlen(s);
-
- if (!strncasecmp(s, "true", sl))
- *tsp = TS_ON;
- else if (!strncasecmp(s, "false", sl))
- *tsp = TS_OFF;
- else if (strncasecmp(s, "auto", sl))
- return False;
- }
- return True;
-}
-*/
-
/* Map a field attribute to its default colors. */
static int
color_from_fa(unsigned char fa)
@@ -574,7 +551,7 @@ status_reset(void)
}
-LIB3270_EXPORT void status_reverse_mode(int on)
+void status_reverse_mode(int on)
{
set(OIA_FLAG_REVERSE,on);
}
@@ -593,7 +570,7 @@ LIB3270_EXPORT STATUS_CODE query_3270_terminal_status(void)
return current_status_code;
}
-LIB3270_EXPORT void status_changed(STATUS_CODE id)
+void status_changed(STATUS_CODE id)
{
if(id == current_status_code)
return;
@@ -604,13 +581,13 @@ LIB3270_EXPORT void status_changed(STATUS_CODE id)
callbacks->status(id);
}
-LIB3270_EXPORT void status_twait(void)
+void status_twait(void)
{
set(OIA_FLAG_UNDERA,False);
status_changed(STATUS_CODE_TWAIT);
}
-LIB3270_EXPORT void status_typeahead(int on)
+void status_typeahead(int on)
{
set(OIA_FLAG_TYPEAHEAD,on);
}
@@ -648,7 +625,7 @@ static void status_connect(H3270 *session, int connected, void *dunno)
id = STATUS_CODE_CONNECTED;
#if defined(HAVE_LIBSSL) /*[*/
- set(OIA_FLAG_SECURE,h3270.secure_connection);
+ set(OIA_FLAG_SECURE,session->secure_connection);
#endif /*]*/
} else {
@@ -697,6 +674,7 @@ void status_untiming(void)
callbacks->show_timer(-1);
}
+/*
void Redraw_action(Widget w unused, XEvent *event unused, String *params unused, Cardinal *num_params unused)
{
if(callbacks && callbacks->redraw)
@@ -704,6 +682,7 @@ void Redraw_action(Widget w unused, XEvent *event unused, String *params unused,
else
screen_disp(&h3270);
}
+*/
void ring_bell(void)
{
diff --git a/latest/src/lib/statusc.h b/latest/src/lib/statusc.h
new file mode 100644
index 0000000..3b2e01d
--- /dev/null
+++ b/latest/src/lib/statusc.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 1999, 2000, 2002 by Paul Mattes.
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright notice appear in all copies and that
+ * both that copyright notice and this permission notice appear in
+ * supporting documentation.
+ *
+ * c3270 is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the file LICENSE for more details.
+ */
+
+/* c3270 verson of statusc.h */
+
+#include
+
+LIB3270_INTERNAL void status_compose(int on, unsigned char c, enum keytype keytype);
+LIB3270_INTERNAL void status_ctlr_done(void);
+
+LIB3270_INTERNAL void status_timing(struct timeval *t0, struct timeval *t1);
+LIB3270_INTERNAL void status_untiming(void);
+
+LIB3270_INTERNAL void status_lu(const char *);
+LIB3270_INTERNAL void status_oerr(int error_type);
+LIB3270_INTERNAL void status_reset(void);
+LIB3270_INTERNAL void status_reverse_mode(int on);
+LIB3270_INTERNAL void status_twait(void);
+LIB3270_INTERNAL void status_typeahead(int on);
+
+LIB3270_INTERNAL void status_changed(STATUS_CODE id);
+
+#define status_kybdlock() status_changed(STATUS_CODE_KYBDLOCK)
+#define status_syswait() status_changed(STATUS_CODE_SYSWAIT)
+#define status_minus() status_changed(STATUS_CODE_MINUS)
+
+
+extern int lib3270_event_counter[COUNTER_ID_USER];
diff --git a/latest/src/plugins/rexx/rx3270.h b/latest/src/plugins/rexx/rx3270.h
index 8b80b2a..090e144 100644
--- a/latest/src/plugins/rexx/rx3270.h
+++ b/latest/src/plugins/rexx/rx3270.h
@@ -106,7 +106,7 @@
#define LIB3270_MODULE_NAME "rexx"
#include
#include
- #include
+// #include
#include
#define CONFIG_GROUP "Rexx"
--
libgit2 0.21.2