Updating API definitions.

Perry Werneck
1 parent aee80d5f
Showing 8 changed files with 83 additions and 22 deletions Show diff stats
lib3270.cbp
src/include/lib3270++.h
src/include/lib3270.h
src/lib3270++/host.cc
src/lib3270++/local/session.cc
src/lib3270/kybd.c
src/lib3270/paste.c
src/lib3270/selection.c
@@ -108,6 +108,15 @@
 		<Unit filename="src/include/winversc.h" />
 		<Unit filename="src/include/xioc.h" />
 		<Unit filename="src/include/xl.h" />
+		<Unit filename="src/lib3270++/abstract.cc" />
+		<Unit filename="src/lib3270++/events.cc" />
+		<Unit filename="src/lib3270++/host.cc" />
+		<Unit filename="src/lib3270++/local/events.cc" />
+		<Unit filename="src/lib3270++/local/session.cc" />
+		<Unit filename="src/lib3270++/private.h" />
+		<Unit filename="src/lib3270++/session.cc" />
+		<Unit filename="src/lib3270++/testprogram/testprogram.cc" />
+		<Unit filename="src/lib3270++/windows/resources.rc" />
 		<Unit filename="src/lib3270/actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -297,8 +297,8 @@
 				return session->getProgramMessage();
 			}
-			inline bool isReady() const {
-				return getProgramMessage() == MESSAGE_NONE;
+			inline operator bool() const {
+				return isConnected() && isReady();
 			}
 			inline operator ProgramMessage() const {
@@ -309,9 +309,8 @@
 				return session->getConnectionState();
 			}
-			inline bool isConnected() const {
-				return getConnectionState() == CONNECTED_TN3270E;
-			}
+			bool isReady() const;
+			bool isConnected() const;
 			inline operator ConnectionState() const {
 				return getConnectionState();
@@ -615,7 +615,20 @@
 	LIB3270_EXPORT int lib3270_set_string(H3270 *h, const unsigned char *str);
 	#define lib3270_set_text_at(h,r,c,t) lib3270_set_string_at(h,r,c,t)
-	LIB3270_EXPORT int lib3270_set_string_at(H3270 *h, int row, int col, const unsigned char *str);
+
+	/**
+	 * @brief Set string at defined position.
+	 *
+	 * @param hSession	Session handle.
+	 * @param row		Row for the first character.
+	 * @param col		Col for the first character.
+	 * @param str		String to set.
+	 *
+	 * @return Negative if error or number of processed characters.
+	 *
+	 */
+	LIB3270_EXPORT int lib3270_set_string_at(H3270 *hSession, int row, int col, const unsigned char *str);
+
 	LIB3270_EXPORT int lib3270_input_string(H3270 *hSession, const unsigned char *str);
 	/**
@@ -90,6 +90,16 @@
         return *this;
     }
+	bool Host::isReady() const {
+        this->session->waitForReady(this->timeout);
+		return getProgramMessage() == MESSAGE_NONE;
+	}
+
+	bool Host::isConnected() const {
+        this->session->waitForReady(this->timeout);
+		return getConnectionState() == CONNECTED_TN3270E;
+	}
+
 	std::string Host::toString() const {
         this->session->waitForReady(this->timeout);
@@ -268,7 +268,9 @@
 			baddr = lib3270_get_next_unprotected(hSession,0);
 		}
-		lib3270_set_cursor_address(hSession,baddr);
+		if(lib3270_set_cursor_address(hSession,baddr)) {
+			throw std::system_error(errno, std::system_category());
+		}
 		return *this;
 	}
@@ -278,12 +280,10 @@
 	/// @param addr	Cursor address.
 	void Local::Session::setCursorPosition(unsigned short addr) {
-		if(!lib3270_is_connected(hSession)) {
-			throw std::system_error(ENOTCONN, std::system_category());
+		if(lib3270_set_cursor_address(hSession,addr) < 0) {
+			throw std::system_error(errno, std::system_category());
 		}
-		lib3270_set_cursor_address(hSession,baddr);
-
 	}
 	/// @brief Set cursor position.
@@ -292,11 +292,10 @@
 	/// @param col	New cursor column.
 	void Local::Session::setCursorPosition(unsigned short row, unsigned short col) {
-		if(!lib3270_is_connected(hSession)) {
-			throw std::system_error(ENOTCONN, std::system_category());
+		if(lib3270_set_cursor_position(hSession,row,col)) {
+			throw std::system_error(errno, std::system_category());
 		}
-		lib3270_set_cursor_position(hSession,row,col);
 	}
@@ -974,6 +974,8 @@ static Boolean key_Character(H3270 *hSession, int code, Boolean with_ge, Boolean
 LIB3270_EXPORT int lib3270_input_string(H3270 *hSession, const unsigned char *str)
 {
+	FAIL_IF_NOT_ONLINE(hSession);
+
 	while(*str)
 	{
 		key_ACharacter(hSession,(unsigned char)((*str) & 0xff), KT_STD, IA_KEY, NULL);
@@ -986,7 +988,7 @@ LIB3270_EXPORT int lib3270_input_string(H3270 *hSession, const unsigned char *st
 }
 /**
- * Handle an ordinary character key, given an ASCII code.
+ * @brief Handle an ordinary character key, given an ASCII code.
  *
  */
 void key_ACharacter(H3270 *hSession, unsigned char c, enum keytype keytype, enum iaction cause,Boolean *skipped)
@@ -221,14 +221,29 @@ static int set_string(H3270 *hSession, const unsigned char *str)
 	return data.qtd;
 }
+/**
+ * @brief Set string at defined position.
+ *
+ * @param hSession	Session handle.
+ * @param row		Row for the first character.
+ * @param col		Col for the first character.
+ * @param str		String to set.
+ *
+ * @return -1 if error (sets errno) or number of processed characters.
+ *
+ */
 LIB3270_EXPORT int lib3270_set_string_at(H3270 *hSession, int row, int col, const unsigned char *str)
 {
     int rc = 0;
-	CHECK_SESSION_HANDLE(hSession);
+	FAIL_IF_NOT_ONLINE(hSession);
+	// Is Keyboard locked ?
 	if(hSession->kybdlock)
-		return -EINVAL;
+	{
+		errno = EPERM;
+		return -1;
+	}
 	if(hSession->selected && !lib3270_get_toggle(hSession,LIB3270_TOGGLE_KEEP_SELECTED))
 		lib3270_unselect(hSession);
@@ -247,6 +262,7 @@ LIB3270_EXPORT int lib3270_set_string_at(H3270 *hSession, int row, int col, cons
 	}
 	trace("%s rc=%d",__FUNCTION__,rc);
+
 	return rc;
 }
@@ -916,41 +916,54 @@ LIB3270_EXPORT int lib3270_move_cursor(H3270 *hSession, LIB3270_DIRECTION dir, u
 	int maxlen		= hSession->cols * hSession->rows;
 	if(!lib3270_connected(hSession))
+	{
+		errno = ENOTCONN;
 		return -1;
+	}
 	switch(dir)
 	{
 	case LIB3270_DIR_UP:
+
 		if(sel && cursor_addr <= hSession->cols)
-			return EINVAL;
+			return errno = EINVAL;
+
 		cursor_addr -= hSession->cols;
 		break;
 	case LIB3270_DIR_DOWN:
+
 		if(sel && cursor_addr >= (hSession->cols * (hSession->rows-1)))
-			return EINVAL;
+			return errno = EINVAL;
+
 		cursor_addr += hSession->cols;
 		break;
 	case LIB3270_DIR_LEFT:
+
 		if(sel &&  (cursor_addr % hSession->cols) < 1)
-			return EINVAL;
+			return errno = EINVAL;
+
 		cursor_addr--;
 		break;
 	case LIB3270_DIR_RIGHT:
+
 		if(sel &&  (cursor_addr % hSession->cols) >= (hSession->cols-1))
-			return EINVAL;
+			return errno = EINVAL;
+
 		cursor_addr++;
 		break;
 	case LIB3270_DIR_END:
+
 		cursor_addr = lib3270_get_field_end(hSession,cursor_addr);
 		if(cursor_addr == -1)
-			return EINVAL;
+			return errno = EINVAL;
 		break;
 	default:
+		errno = EINVAL;
 		return -1;
 	}
	@@ -108,6 +108,15 @@		@@ -108,6 +108,15 @@
108	<Unit filename="src/include/winversc.h" />	108	<Unit filename="src/include/winversc.h" />
109	<Unit filename="src/include/xioc.h" />	109	<Unit filename="src/include/xioc.h" />
110	<Unit filename="src/include/xl.h" />	110	<Unit filename="src/include/xl.h" />
		111	+ <Unit filename="src/lib3270++/abstract.cc" />
		112	+ <Unit filename="src/lib3270++/events.cc" />
		113	+ <Unit filename="src/lib3270++/host.cc" />
		114	+ <Unit filename="src/lib3270++/local/events.cc" />
		115	+ <Unit filename="src/lib3270++/local/session.cc" />
		116	+ <Unit filename="src/lib3270++/private.h" />
		117	+ <Unit filename="src/lib3270++/session.cc" />
		118	+ <Unit filename="src/lib3270++/testprogram/testprogram.cc" />
		119	+ <Unit filename="src/lib3270++/windows/resources.rc" />
111	<Unit filename="src/lib3270/actions.c">	120	<Unit filename="src/lib3270/actions.c">
112	<Option compilerVar="CC" />	121	<Option compilerVar="CC" />
113	</Unit>	122	</Unit>
	@@ -615,7 +615,20 @@		@@ -615,7 +615,20 @@
615	LIB3270_EXPORT int lib3270_set_string(H3270 h, const unsigned char str);	615	LIB3270_EXPORT int lib3270_set_string(H3270 h, const unsigned char str);
616		616
617	#define lib3270_set_text_at(h,r,c,t) lib3270_set_string_at(h,r,c,t)	617	#define lib3270_set_text_at(h,r,c,t) lib3270_set_string_at(h,r,c,t)
618	- LIB3270_EXPORT int lib3270_set_string_at(H3270 h, int row, int col, const unsigned char str);	618	+
		619	+ /**
		620	+ * @brief Set string at defined position.
		621	+ *
		622	+ * @param hSession Session handle.
		623	+ * @param row Row for the first character.
		624	+ * @param col Col for the first character.
		625	+ * @param str String to set.
		626	+ *
		627	+ * @return Negative if error or number of processed characters.
		628	+ *
		629	+ */
		630	+ LIB3270_EXPORT int lib3270_set_string_at(H3270 hSession, int row, int col, const unsigned char str);
		631	+
619	LIB3270_EXPORT int lib3270_input_string(H3270 hSession, const unsigned char str);	632	LIB3270_EXPORT int lib3270_input_string(H3270 hSession, const unsigned char str);
620		633
621	/**	634	/**
	@@ -90,6 +90,16 @@		@@ -90,6 +90,16 @@
90	return *this;	90	return *this;
91	}	91	}
92		92
		93	+ bool Host::isReady() const {
		94	+ this->session->waitForReady(this->timeout);
		95	+ return getProgramMessage() == MESSAGE_NONE;
		96	+ }
		97	+
		98	+ bool Host::isConnected() const {
		99	+ this->session->waitForReady(this->timeout);
		100	+ return getConnectionState() == CONNECTED_TN3270E;
		101	+ }
		102	+
93	std::string Host::toString() const {	103	std::string Host::toString() const {
94		104
95	this->session->waitForReady(this->timeout);	105	this->session->waitForReady(this->timeout);