Reduzindo warnings, reativando programa de teste da biblioteca

perry.werneck@gmail.com
1 parent a19fcdae
Showing 17 changed files with 134 additions and 93 deletions Show diff stats
src/lib3270/charset.c
src/lib3270/ft.c
src/lib3270/globals.h
src/lib3270/glue.c
src/lib3270/html.c
src/lib3270/iocalls.c
src/lib3270/kybd.c
src/lib3270/lib3270.cbp
src/lib3270/macros.c
src/lib3270/resolver.c
src/lib3270/rpq.c
src/lib3270/selection.c
src/lib3270/session.c
src/lib3270/telnet.c
src/lib3270/testprogram.c
src/lib3270/utf8.c
src/lib3270/util.c
@@ -45,6 +45,10 @@
 #include "kybdc.h"
 #include "popupsc.h"
+#ifndef ANDROID
+	#include <stdlib.h>
+#endif // !ANDROID
+
 /*
 #if defined(X3270_DISPLAY) || (defined(C3270) && !defined(_WIN32))
 #include "screenc.h"
@@ -199,8 +203,8 @@ wide_resource_init(char *csname)
  */
 enum cs_result charset_init(H3270 *session, const char *csname)
 {
-	char *cs;
-	const char *ftcs;
+//	char *cs;
+//	const char *ftcs;
 	enum cs_result rc;
 	char *ccs, *cftcs;
 	const char *ak;
@@ -56,6 +56,7 @@
 #include "tablesc.h"
 #include "telnetc.h"
 #include "utilc.h"
+#include "trace_dsc.h"
 static void ft_connected(H3270 *session, int ignored, void *unused);
 static void ft_in3270(H3270 *session, int ignored unused, void *unused);
@@ -352,3 +352,5 @@ LIB3270_INTERNAL int  cursor_move(H3270 *session, int baddr);
 LIB3270_INTERNAL void add_input_calls(H3270 *, void (*)(H3270 *), void (*)(H3270 *));
 LIB3270_INTERNAL void toggle_rectselect(H3270 *session, struct lib3270_toggle *t, LIB3270_TOGGLE_TYPE tt);
+
+LIB3270_INTERNAL void remove_input_calls(H3270 *session);
@@ -96,7 +96,7 @@
 	static int init_calls = 0;
 #endif
- static void lib3270_session_init(H3270 *hSession, const char *model);
+// static void lib3270_session_init(H3270 *hSession, const char *model);
  #define LAST_ARG	"--"
@@ -161,7 +161,7 @@
  LIB3270_EXPORT char * lib3270_get_as_html(H3270 *session, LIB3270_HTML_OPTION option)
  {
-	int	row, col, baddr;
+	int	row, baddr;
 	struct html_info info;
  	memset(&info,0,sizeof(info));
@@ -180,16 +180,24 @@
 	baddr = 0;
 	for(row=0;row < session->rows;row++)
 	{
-		int cr = 0;
+		int cr  = 0;
+		int len = 0;
+		int col;
 		for(col = 0; col < session->cols;col++)
 		{
-			if((option && LIB3270_HTML_OPTION_ALL) || (session->text[baddr].attr & LIB3270_ATTR_SELECTED))
+			if( session->text[baddr+col].chr != ' ' || (session->text[baddr+col].attr & LIB3270_ATTR_CG))
+				len = col;
+		}
+
+		for(col = 0; col <= len;col++)
+		{
+			if((option && LIB3270_HTML_OPTION_ALL) || (session->text[baddr+col].attr & LIB3270_ATTR_SELECTED))
 			{
 				cr++;
-				update_colors(&info,session->text[baddr].attr);
+				update_colors(&info,session->text[baddr+col].attr);
-				if(session->text[baddr].attr & LIB3270_ATTR_CG)
+				if(session->text[baddr+col].attr & LIB3270_ATTR_CG)
 				{
 					static const struct chr_xlat xlat[] =
 					{
@@ -213,7 +221,7 @@
 						{ 0x00, NULL	}
 					};
-					append_char(&info, xlat, session->text[baddr].chr);
+					append_char(&info, xlat, session->text[baddr+col].chr);
 				}
 				else
@@ -224,19 +232,21 @@
 						{ '&',	"&amp;"		},
 						{ '<',	"&lt;"		},
 						{ '>',	"&gt;"		},
+						{ ' ',	"&nbsp;"	},
 						{ 0x00, NULL		}
 					};
-					append_char(&info, xlat, session->text[baddr].chr);
+					append_char(&info, xlat, session->text[baddr+col].chr);
 				}
 			}
-			baddr++;
 		}
-		if(cr)
+		baddr += session->cols;
+
+		if(cr || (option && LIB3270_HTML_OPTION_ALL))
 			append_element(&info,HTML_ELEMENT_LINE_BREAK);
 	}
@@ -34,6 +34,7 @@
 #include <sys/types.h>
 #include "xioc.h"
 #include "telnetc.h"
+#include "utilc.h"
 #define MILLION			1000000L
 #define InputReadMask	0x1
@@ -54,7 +55,7 @@ static void * internal_add_except(int source, H3270 *session, void (*fn)(H3270 *
 static void   internal_remove_input(void *id);
-static int	  internal_process_events(int block);
+// static int	  internal_process_events(int block);
 static int 	  internal_callthread(int(*callback)(H3270 *, void *), H3270 *session, void *parm);
 static int	  internal_wait(int seconds);
@@ -505,6 +506,7 @@ static int internal_event_dispatcher(int block)
 static int internal_callthread(int(*callback)(H3270 *, void *), H3270 *session, void *parm)
 {
 	callback(session,parm);
+	return 0;
 }
 static int internal_wait(int seconds)
@@ -651,7 +653,7 @@ LIB3270_EXPORT int lib3270_register_handlers(const struct lib3270_callbacks *cbk
 LIB3270_EXPORT int lib3270_call_thread(int(*callback)(H3270 *h, void *), H3270 *h, void *parm)
 {
-	int rc;
+//	int rc;
 	CHECK_SESSION_HANDLE(h);
 	if(h->set_timer)
@@ -664,7 +666,7 @@ LIB3270_EXPORT int lib3270_call_thread(int(*callback)(H3270 *h, void *), H3270 *
 	if(h->set_timer)
 		h->set_timer(h,0);
-	return rc;
+	return 0;
 }
 LIB3270_EXPORT void lib3270_main_iterate(H3270 *session, int block)
@@ -676,6 +678,7 @@ LIB3270_EXPORT void lib3270_main_iterate(H3270 *session, int block)
 LIB3270_EXPORT int lib3270_wait(seconds)
 {
 	wait(seconds);
+	return 0;
 }
 LIB3270_EXPORT void lib3270_ring_bell(H3270 *session)
@@ -37,6 +37,10 @@
 #include "globals.h"
+#ifndef ANDROID
+	#include <stdlib.h>
+#endif // !ANDROID
+
 #if defined(X3270_DISPLAY) /*[*/
 #include <X11/Xatom.h>
 #endif
@@ -2264,6 +2268,8 @@ LIB3270_ACTION( dup )
 		hSession->display(hSession);
 		cursor_move(hSession,next_unprotected(hSession,hSession->cursor_addr));
 	}
+
+	return 0;
 }
 /*
@@ -2274,13 +2280,15 @@ LIB3270_ACTION( fieldmark )
 	if (kybdlock)
 	{
 		ENQUEUE_ACTION(lib3270_fieldmark);
-		return;
+		return 0;
 	}
 #if defined(X3270_ANSI)
 	if (IN_ANSI)
-		return;
+		return 0 ;
 #endif
 	(void) key_Character(EBC_fm, False, False, NULL);
+
+	return 0;
 }
 /**
@@ -9,9 +9,8 @@
 			<Target title="Debug">
 				<Option output=".bin/Debug/lib3270" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj/Debug/" />
-				<Option type="1" />
+				<Option type="3" />
 				<Option compiler="gcc" />
-				<Option use_console_runner="0" />
 				<Compiler>
 					<Add option="-g" />
 					<Add option="-DDEBUG=1" />
@@ -52,10 +51,14 @@
 			<Add option="-Wunreachable-code" />
 			<Add option="-Wmissing-declarations" />
 			<Add option="-Wall" />
+			<Add option="-pthread" />
 			<Add option="-DLIB3270=1" />
 			<Add directory="../include" />
 			<Add directory="../include/lib3270" />
 		</Compiler>
+		<Linker>
+			<Add option="-pthread" />
+		</Linker>
 		<Unit filename="../include/lib3270.h" />
 		<Unit filename="../include/lib3270/action_table.h" />
 		<Unit filename="../include/lib3270/actions.h" />
@@ -68,24 +71,18 @@
 		<Unit filename="3270ds.h" />
 		<Unit filename="Makefile.in" />
 		<Unit filename="X11keysym.h" />
-		<Unit filename="XtGlue.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="actions.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="actionsc.h" />
 		<Unit filename="ansi.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="ansic.h" />
 		<Unit filename="api.h" />
-		<Unit filename="apl.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="aplc.h" />
 		<Unit filename="appres.h" />
 		<Unit filename="arpa_telnet.h" />
+		<Unit filename="bounds.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="cg.h" />
 		<Unit filename="charset.c">
 			<Option compilerVar="CC" />
@@ -125,7 +122,7 @@
 		</Unit>
 		<Unit filename="hostc.h" />
 		<Unit filename="icmdc.h" />
-		<Unit filename="init.c">
+		<Unit filename="iocalls.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="keypadc.h" />
@@ -183,11 +180,17 @@
 		<Unit filename="selection.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="session.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="sf.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="sfc.h" />
 		<Unit filename="shlobj_missing.h" />
+		<Unit filename="state.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="statusc.h" />
 		<Unit filename="tables.c">
 			<Option compilerVar="CC" />
@@ -221,18 +224,9 @@
 		<Unit filename="version.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="w3misc.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="w3miscc.h" />
 		<Unit filename="widec.h" />
-		<Unit filename="winvers.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="winversc.h" />
-		<Unit filename="xio.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="xioc.h" />
 		<Unit filename="xl.h" />
 		<Extensions>
@@ -104,30 +104,15 @@
  LIB3270_MACRO( get )
  {
-	char *buffer = NULL;
-/*
-	int start, qtd, rows, cols, row, col;
+ 	char *buffer = NULL;
 	switch(argc)
 	{
 	case 1:	// Get entire screen
-		lib3270_get_screen_size(hSession,&rows,&cols);
-		qtd = (rows*(cols+1)+1);
-		buffer = lib3270_malloc(qtd+2);
-
-		memset(buffer,0,qtd+1);
-		start = qtd = 0;
-		for(row = 0; row < rows;row++)
-		{
-			screen_read(buffer+qtd,start,cols);
-			qtd += cols;
-			start += cols;
-			buffer[qtd++] = '\n';
-		}
-		buffer[qtd] = 0;
-
-		return buffer;
+		buffer = lib3270_get_text(hSession,0,-1);
+		break;
+/*
 	case 2:	// Just size, get current cursor position
 		start	= 0;
 		qtd 	= atoi(argv[1]);
@@ -153,22 +138,11 @@
 		start 	= (row * cols) + col;
 		qtd 	= atoi(argv[3]);
 		break;
-
+*/
 	default:
 		errno = EINVAL;
-		return NULL;
 	}
-	if(qtd < 1)
-	{
-		errno = EINVAL;
-		return NULL;
-	}
-
-	buffer = lib3270_malloc(qtd+1);
-	screen_read(buffer, start, qtd);
-
-*/
 	return buffer;
  }
@@ -62,6 +62,7 @@
 #include "api.h"
 #include "resolverc.h"
+#include "statusc.h"
 #include "w3miscc.h"
 #pragma pack(1)
@@ -76,6 +76,7 @@ static int get_rpq_address(unsigned char buf[], const int buflen);
 static void rpq_warning(const char *fmt, ...);
 static void rpq_dump_warnings(void);
 static Boolean rpq_complained = False;
+
 #if !defined(_WIN32) /*[*/
 static Boolean omit_due_space_limit = False;
 #endif /*]*/
@@ -349,7 +349,7 @@ LIB3270_ACTION( selectfield )
 LIB3270_ACTION( selectall )
 {
-	int len, baddr;
+//	int len, baddr;
 	CHECK_SESSION_HANDLE(hSession);
@@ -360,7 +360,7 @@ LIB3270_ACTION( selectall )
 LIB3270_ACTION( reselect )
 {
-	int start, end;
+//	int start, end;
 	CHECK_SESSION_HANDLE(hSession);
@@ -542,7 +542,8 @@ LIB3270_EXPORT int lib3270_get_selection_bounds(H3270 *hSession, int *start, int
 LIB3270_EXPORT int lib3270_move_selected_area(H3270 *hSession, int from, int to)
 {
 	int pos[2];
-	int rows, cols, f, step, start, end;
+	int rows, cols, f, step;
+	// , start, end;
 	if(!lib3270_get_selection_bounds(hSession,&pos[0],&pos[1]))
 		return from;
@@ -715,5 +716,7 @@ LIB3270_EXPORT int lib3270_move_cursor(H3270 *hSession, LIB3270_DIRECTION dir, u
 		lib3270_select_to(hSession,cursor_addr);
 	else
 		cursor_move(hSession,cursor_addr);
+
+	return 0;
 }
@@ -30,11 +30,19 @@
  *
  */
+#ifndef ANDROID
+	#include <stdlib.h>
+#endif // !ANDROID
 #include "globals.h"
 #include "charsetc.h"
 #include "kybdc.h"
 #include "ansic.h"
+#include "togglesc.h"
+#include "screen.h"
+#include "screenc.h"
+#include "ctlrc.h"
+#include "ftc.h"
 /*---[ Globals ]--------------------------------------------------------------------------------------------------------------*/
@@ -119,18 +127,18 @@ static void set_cursor(H3270 *session, LIB3270_CURSOR id)
 {
 }
-static void message(H3270 *session, LIB3270_NOTIFY id , const char *title, const char *message, const char *text)
+static void message(H3270 *session, LIB3270_NOTIFY id , const char *title, const char *msg, const char *text)
 {
 #ifdef ANDROID
 	__android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "%s\n",title);
-	__android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "%s\n",message);
+	__android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "%s\n",msg);
 	__android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "%s\n",text);
 #else
 	lib3270_write_log(session,"%s",title);
-	lib3270_write_log(session,"%s",message);
+	lib3270_write_log(session,"%s",msg);
 	lib3270_write_log(session,"%s",text);
 #endif // ANDROID
@@ -370,7 +370,7 @@ static void continue_tls(unsigned char *sbbuf, int len);
 /*--[ Implement ]------------------------------------------------------------------------------------*/
-void set_ssl_state(H3270 *session, LIB3270_SSL_STATE state)
+static void set_ssl_state(H3270 *session, LIB3270_SSL_STATE state)
 {
 	if(state == session->secure)
 		return;
 #include <stdio.h>
 #include <string.h>
+#include <pthread.h>
+
 #include "globals.h"
 #include <lib3270/macros.h>
 #define MAX_ARGS 10
+#include <pthread.h>
+
+static H3270 *session = NULL;
+
+static void * mainloop(void *dunno)
+{
+	while(session)
+	{
+		lib3270_main_iterate(session,1);
+	}
+	return NULL;
+}
+
 int main(int numpar, char *param[])
 {
-	H3270	* h;
-	char 	  line[4096];
+	H3270		* h;
+	char	 	  line[4096];
+	pthread_t	  thread;
 	lib3270_initialize();
-	h = lib3270_session_new("");
+	session = h = lib3270_session_new("");
 	printf("3270 session %p created\n]",h);
+	pthread_create(&thread, NULL, mainloop, NULL);
+
 	while(fgets(line,4095,stdin))
 	{
 		const LIB3270_MACRO_LIST *cmd = get_3270_calls();
@@ -52,7 +70,7 @@ int main(int numpar, char *param[])
 				if(str)
 				{
 					printf("\n%s\n",str);
-					free(str);
+					lib3270_free(str);
 				}
 				else
 				{
@@ -66,6 +84,9 @@ int main(int numpar, char *param[])
 	}
+	session = 0;
+	pthread_cancel(thread);
+
 	printf("Ending 3270 session %p\n",h);
 	lib3270_session_free(h);
@@ -95,10 +95,12 @@ static char *dcs[] = {		// same order as enum UTF_IX and utf8_tab[]
  * Note that this could be done much more generally with the iconv library
  * or the ICU library, but there is no guarantee that either is available or
  * properly configured.
- */
+ */ /*
 #define HI_SIZE 96
 static char *utf8_tab[U_MAX][96] = {
-/* iso8859-1 */ {
+
+	// iso8859-1
+	{
      "\xc2\xa0",     "\xc2\xa1",     "\xc2\xa2",     "\xc2\xa3",
      "\xc2\xa4",     "\xc2\xa5",     "\xc2\xa6",     "\xc2\xa7",
      "\xc2\xa8",     "\xc2\xa9",     "\xc2\xaa",     "\xc2\xab",
@@ -124,7 +126,8 @@ static char *utf8_tab[U_MAX][96] = {
      "\xc3\xb8",     "\xc3\xb9",     "\xc3\xba",     "\xc3\xbb",
      "\xc3\xbc",     "\xc3\xbd",     "\xc3\xbe",     "\xc3\xbf"
 },
-/* iso8859-2 */ {
+// iso8859-2
+{
      "\xc2\xa0",     "\xc4\x84",     "\xcb\x98",     "\xc5\x81",
      "\xc2\xa4",     "\xc4\xbd",     "\xc5\x9a",     "\xc2\xa7",
      "\xc2\xa8",     "\xc5\xa0",     "\xc5\x9e",     "\xc5\xa4",
@@ -150,7 +153,8 @@ static char *utf8_tab[U_MAX][96] = {
      "\xc5\x99",     "\xc5\xaf",     "\xc3\xba",     "\xc5\xb1",
      "\xc3\xbc",     "\xc3\xbd",     "\xc5\xa3",     "\xcb\x99"
 },
-/* iso8859-7 */ {
+// iso8859-7
+{
      "\xc2\xa0", "\xe2\x80\x98", "\xe2\x80\x99",     "\xc2\xa3",
  "\xe2\x82\xac", "\xe2\x82\xaf",     "\xc2\xa6",     "\xc2\xa7",
      "\xc2\xa8",     "\xc2\xa9",     "\xcd\xba",     "\xc2\xab",
@@ -176,7 +180,8 @@ static char *utf8_tab[U_MAX][96] = {
      "\xcf\x88",     "\xcf\x89",     "\xcf\x8a",     "\xcf\x8b",
      "\xcf\x8c",     "\xcf\x8d",     "\xcf\x8e",            " "
 },
-/* iso8859-8 */ {
+// iso8859-8
+{
      "\xc2\xa0",            " ",     "\xc2\xa2",     "\xc2\xa3",
      "\xc2\xa4",     "\xc2\xa5",     "\xc2\xa6",     "\xc2\xa7",
      "\xc2\xa8",     "\xc2\xa9",     "\xc3\x97",     "\xc2\xab",
@@ -202,7 +207,8 @@ static char *utf8_tab[U_MAX][96] = {
      "\xd7\xa8",     "\xd7\xa9",     "\xd7\xaa",            " ",
             " ", "\xe2\x80\x8e", "\xe2\x80\x8f",            " "
 },
-/* iso8859-9 */ {
+// iso8859-9
+{
      "\xc2\xa0",     "\xc2\xa1",     "\xc2\xa2",     "\xc2\xa3",
      "\xc2\xa4",     "\xc2\xa5",     "\xc2\xa6",     "\xc2\xa7",
      "\xc2\xa8",     "\xc2\xa9",     "\xc2\xaa",     "\xc2\xab",
@@ -228,7 +234,8 @@ static char *utf8_tab[U_MAX][96] = {
      "\xc3\xb8",     "\xc3\xb9",     "\xc3\xba",     "\xc3\xbb",
      "\xc3\xbc",     "\xc4\xb1",     "\xc5\x9f",     "\xc3\xbf"
 },
-/* iso8859-11 */ {
+// iso8859-11
+{
      "\xc2\xa0", "\xe0\xb8\x81", "\xe0\xb8\x82", "\xe0\xb8\x83",
  "\xe0\xb8\x84", "\xe0\xb8\x85", "\xe0\xb8\x86", "\xe0\xb8\x87",
  "\xe0\xb8\x88", "\xe0\xb8\x89", "\xe0\xb8\x8a", "\xe0\xb8\x8b",
@@ -254,7 +261,8 @@ static char *utf8_tab[U_MAX][96] = {
  "\xe0\xb9\x98", "\xe0\xb9\x99", "\xe0\xb9\x9a", "\xe0\xb9\x9b",
             " ",            " ",            " ",            " "
 },
-/* iso8859-15 */ {
+// iso8859-15
+{
      "\xc2\xa0",     "\xc2\xa1",     "\xc2\xa2",     "\xc2\xa3",
  "\xe2\x82\xac",     "\xc2\xa5",     "\xc5\xa0",     "\xc2\xa7",
      "\xc5\xa1",     "\xc2\xa9",     "\xc2\xaa",     "\xc2\xab",
@@ -280,7 +288,8 @@ static char *utf8_tab[U_MAX][96] = {
      "\xc3\xb8",     "\xc3\xb9",     "\xc3\xba",     "\xc3\xbb",
      "\xc3\xbc",     "\xc3\xbd",     "\xc3\xbe",     "\xc3\xbf"
 },
-/* koi8-r */ {
+// koi8-r
+{
  "\xe2\x95\x90", "\xe2\x95\x91", "\xe2\x95\x92",     "\xd1\x91",
  "\xe2\x95\x93", "\xe2\x95\x94", "\xe2\x95\x95", "\xe2\x95\x96",
  "\xe2\x95\x97", "\xe2\x95\x98", "\xe2\x95\x99", "\xe2\x95\x9a",
@@ -306,8 +315,9 @@ static char *utf8_tab[U_MAX][96] = {
      "\xd0\xac",     "\xd0\xab",     "\xd0\x97",     "\xd0\xa8",
      "\xd0\xad",     "\xd0\xa9",     "\xd0\xa7",     "\xd0\xaa"
 },
-#if defined(X3270_DBCS) /*[*/
-/* pseudo-gb18030 - not actually a UTF-8 expansion */ {
+#if defined(X3270_DBCS)
+// pseudo-gb18030 - not actually a UTF-8 expansion
+{
  "\x81\x30\x84\x32", "\x81\x30\x84\x33", "\x81\x30\x84\x34", "\x81\x30\x84\x35",
          "\xa1\xe8", "\x81\x30\x84\x36", "\x81\x30\x84\x37",         "\xa1\xec",
          "\xa1\xa7", "\x81\x30\x84\x38", "\x81\x30\x84\x39", "\x81\x30\x85\x30",
@@ -333,9 +343,9 @@ static char *utf8_tab[U_MAX][96] = {
  "\x81\x30\x8b\x33",         "\xa8\xb4",         "\xa8\xb2", "\x81\x30\x8b\x34",
          "\xa8\xb9", "\x81\x30\x8b\x35", "\x81\x30\x8b\x36", "\x81\x30\x8b\x37"
 }
-#endif /*]*/
+#endif
 };
-
+*/
 /*
  * Look up a multi-byte UTF-8 string and return its value in the 'implied'
  * character set.
@@ -66,6 +66,7 @@
 #include "resources.h"
 #include "utilc.h"
+#include "popupsc.h"
 #include "api.h"
 #define my_isspace(c)	isspace((unsigned char)c)
	@@ -56,6 +56,7 @@		@@ -56,6 +56,7 @@
56	#include "tablesc.h"	56	#include "tablesc.h"
57	#include "telnetc.h"	57	#include "telnetc.h"
58	#include "utilc.h"	58	#include "utilc.h"
		59	+#include "trace_dsc.h"
59		60
60	static void ft_connected(H3270 session, int ignored, void unused);	61	static void ft_connected(H3270 session, int ignored, void unused);
61	static void ft_in3270(H3270 session, int ignored unused, void unused);	62	static void ft_in3270(H3270 session, int ignored unused, void unused);
	@@ -352,3 +352,5 @@ LIB3270_INTERNAL int cursor_move(H3270 *session, int baddr);		@@ -352,3 +352,5 @@ LIB3270_INTERNAL int cursor_move(H3270 *session, int baddr);
352	LIB3270_INTERNAL void add_input_calls(H3270 , void ()(H3270 ), void ()(H3270 *));	352	LIB3270_INTERNAL void add_input_calls(H3270 , void ()(H3270 ), void ()(H3270 *));
353		353
354	LIB3270_INTERNAL void toggle_rectselect(H3270 session, struct lib3270_toggle t, LIB3270_TOGGLE_TYPE tt);	354	LIB3270_INTERNAL void toggle_rectselect(H3270 session, struct lib3270_toggle t, LIB3270_TOGGLE_TYPE tt);
		355	+
		356	+LIB3270_INTERNAL void remove_input_calls(H3270 *session);
	@@ -96,7 +96,7 @@		@@ -96,7 +96,7 @@
96	static int init_calls = 0;	96	static int init_calls = 0;
97	#endif	97	#endif
98		98
99	- static void lib3270_session_init(H3270 hSession, const char model);	99	+// static void lib3270_session_init(H3270 hSession, const char model);
100		100
101	#define LAST_ARG "--"	101	#define LAST_ARG "--"
102		102
	@@ -104,30 +104,15 @@		@@ -104,30 +104,15 @@
104		104
105	LIB3270_MACRO( get )	105	LIB3270_MACRO( get )
106	{	106	{
107	- char *buffer = NULL;
108	-/*
109	- int start, qtd, rows, cols, row, col;	107	+ char *buffer = NULL;
110		108
111	switch(argc)	109	switch(argc)
112	{	110	{
113	case 1: // Get entire screen	111	case 1: // Get entire screen
114	- lib3270_get_screen_size(hSession,&rows,&cols);
115	- qtd = (rows*(cols+1)+1);
116	- buffer = lib3270_malloc(qtd+2);
117	-
118	- memset(buffer,0,qtd+1);
119	- start = qtd = 0;
120	- for(row = 0; row < rows;row++)
121	- {
122	- screen_read(buffer+qtd,start,cols);
123	- qtd += cols;
124	- start += cols;
125	- buffer[qtd++] = '\n';
126	- }
127	- buffer[qtd] = 0;
128	-
129	- return buffer;	112	+ buffer = lib3270_get_text(hSession,0,-1);
		113	+ break;
130		114
		115	+/*
131	case 2: // Just size, get current cursor position	116	case 2: // Just size, get current cursor position
132	start = 0;	117	start = 0;
133	qtd = atoi(argv[1]);	118	qtd = atoi(argv[1]);
	@@ -153,22 +138,11 @@		@@ -153,22 +138,11 @@
153	start = (row * cols) + col;	138	start = (row * cols) + col;
154	qtd = atoi(argv[3]);	139	qtd = atoi(argv[3]);
155	break;	140	break;
156	-	141	+*/
157	default:	142	default:
158	errno = EINVAL;	143	errno = EINVAL;
159	- return NULL;
160	}	144	}
161		145
162	- if(qtd < 1)
163	- {
164	- errno = EINVAL;
165	- return NULL;
166	- }
167	-
168	- buffer = lib3270_malloc(qtd+1);
169	- screen_read(buffer, start, qtd);
170	-
171	-*/
172	return buffer;	146	return buffer;
173	}	147	}
174		148
	@@ -62,6 +62,7 @@		@@ -62,6 +62,7 @@
62	#include "api.h"	62	#include "api.h"
63		63
64	#include "resolverc.h"	64	#include "resolverc.h"
		65	+#include "statusc.h"
65	#include "w3miscc.h"	66	#include "w3miscc.h"
66		67
67	#pragma pack(1)	68	#pragma pack(1)
	@@ -370,7 +370,7 @@ static void continue_tls(unsigned char *sbbuf, int len);		@@ -370,7 +370,7 @@ static void continue_tls(unsigned char *sbbuf, int len);
370		370
371	/--[ Implement ]------------------------------------------------------------------------------------/	371	/--[ Implement ]------------------------------------------------------------------------------------/
372		372
373	-void set_ssl_state(H3270 *session, LIB3270_SSL_STATE state)	373	+static void set_ssl_state(H3270 *session, LIB3270_SSL_STATE state)
374	{	374	{
375	if(state == session->secure)	375	if(state == session->secure)
376	return;	376	return;
	@@ -66,6 +66,7 @@		@@ -66,6 +66,7 @@
66	#include "resources.h"	66	#include "resources.h"
67		67
68	#include "utilc.h"	68	#include "utilc.h"
		69	+#include "popupsc.h"
69	#include "api.h"	70	#include "api.h"
70		71
71	#define my_isspace(c) isspace((unsigned char)c)	72	#define my_isspace(c) isspace((unsigned char)c)