Implementando componente c++.

Perry Werneck
1 parent dddb96d1
Showing 3 changed files with 76 additions and 1 deletions Show diff stats
src/lib3270++/abstract.cc
src/lib3270++/local.cc
src/lib3270++/private.h
@@ -37,6 +37,7 @@
  */
  #include "private.h"
+ #include <cstring>
 /*---[ Implement ]----------------------------------------------------------------------------------*/
@@ -68,6 +69,38 @@
 	}
+	/// @brief Setup charsets
+	void Abstract::Session::setCharSet(const char *remote, const char *local) {
+
+#ifdef HAVE_ICONV
+
+		if(this->iconv.local != (iconv_t) (-1))
+			iconv_close(iconv.local);
+
+		if(this->iconv.host != (iconv_t) (-1))
+			iconv_close(iconv.host);
+
+		if(strcmp(local,remote)) {
+
+			// Local and remote charsets aren't the same, setup conversion
+			iconv.local	= iconv_open(local, remote);
+			iconv.host	= iconv_open(remote,local);
+
+		} else {
+			// Same charset, doesn't convert
+			iconv.local = iconv.host = (iconv_t)(-1);
+		}
+
+#else
+
+		#error No ICONV Support
+
+#endif
+
+
+	}
+
+
  }
@@ -30,13 +30,14 @@
 /**
  * @file src/lib3270++/local.cc
  *
- * @brief
+ * @brief Implement lib3270 direct access layout (NO IPC).
  *
  * @author perry.werneck@gmail.com
  *
  */
  #include "private.h"
+ #include <lib3270/actions.h>
 /*---[ Implement ]----------------------------------------------------------------------------------*/
@@ -44,26 +45,38 @@
  namespace TN3270 {
 	LocalSession::LocalSession() : Abstract::Session() {
+
+		std::lock_guard<std::mutex> lock(sync);
+
 		this->hSession = lib3270_session_new("");
 		lib3270_set_user_data(this->hSession,(void *) this);
+		setCharSet(lib3270_get_display_charset(this->hSession));
+
 	}
 	LocalSession::~LocalSession() {
+
+		std::lock_guard<std::mutex> lock(sync);
+
 		lib3270_session_free(this->hSession);
 		this->hSession = nullptr;
 	}
 	void LocalSession::connect(const char *url) {
+		std::lock_guard<std::mutex> lock(sync);
 		lib3270_connect_url(hSession,url,0);
 	}
 	void LocalSession::disconnect() {
+		std::lock_guard<std::mutex> lock(sync);
 		lib3270_disconnect(hSession);
 	}
 	// Wait for session state.
 	void LocalSession::waitForReady(time_t timeout) throw() {
+		std::lock_guard<std::mutex> lock(sync);
+
 		int rc = lib3270_wait_for_ready(this->hSession, timeout);
 		if(rc) {
@@ -74,56 +87,72 @@
 	// Gets
 	std::string LocalSession::toString() const {
+		std::lock_guard<std::mutex> lock(const_cast<LocalSession *>(this)->sync);
 	}
 	std::string	LocalSession::toString(int baddr, size_t len, bool lf) {
+		std::lock_guard<std::mutex> lock(sync);
 	}
 	std::string	LocalSession::toString(int row, int col, size_t sz, bool lf) {
+		std::lock_guard<std::mutex> lock(sync);
 	}
 	ProgramMessage LocalSession::getProgramMessage() const {
+		std::lock_guard<std::mutex> lock(const_cast<LocalSession *>(this)->sync);
 		return (ProgramMessage) lib3270_get_program_message(this->hSession);
 	}
 	ConnectionState LocalSession::getConnectionState() const {
+		std::lock_guard<std::mutex> lock(const_cast<LocalSession *>(this)->sync);
 		return (ConnectionState) lib3270_get_connection_state(this->hSession);
 	}
 	/// @brief Set field at current posicion, jumps to next writable field.
 	TN3270::Session & LocalSession::push(const char *text) {
+		std::lock_guard<std::mutex> lock(sync);
 		return *this;
 	}
 	TN3270::Session & LocalSession::push(int baddr, const std::string &text) {
+		std::lock_guard<std::mutex> lock(sync);
 		return *this;
 	}
 	TN3270::Session & LocalSession::push(int row, int col, const std::string &text) {
+		std::lock_guard<std::mutex> lock(sync);
 		return *this;
 	}
 	TN3270::Session & LocalSession::push(const PFKey key) {
+		std::lock_guard<std::mutex> lock(sync);
+		lib3270_pfkey(hSession,(int) key);
 		return *this;
 	}
 	TN3270::Session & LocalSession::push(const PAKey key) {
+		std::lock_guard<std::mutex> lock(sync);
+		lib3270_pakey(hSession,(int) key);
 		return *this;
 	}
 	TN3270::Session & LocalSession::push(const Action action) {
+		std::lock_guard<std::mutex> lock(sync);
 		return *this;
 	}
 	TN3270::Session & LocalSession::pop(int baddr, std::string &text) {
+		std::lock_guard<std::mutex> lock(sync);
 		return *this;
 	}
 	TN3270::Session & LocalSession::pop(int row, int col, std::string &text) {
+		std::lock_guard<std::mutex> lock(sync);
 		return *this;
 	}
 	TN3270::Session & LocalSession::pop(std::string &text) {
+		std::lock_guard<std::mutex> lock(sync);
 		return *this;
 	}
@@ -41,6 +41,7 @@
 	#define PRIVATE_H_INCLUDED
 	#include <config.h>
+	#include <mutex>
 	#include <lib3270++.h>
 	#include <system_error>
@@ -49,6 +50,12 @@
 	#include <iconv.h>
 #endif // HAVE_ICONV
+#ifdef WIN32
+	#define SYSTEM_CHARSET "CP1252"
+#else
+	#define SYSTEM_CHARSET "UTF-8"
+#endif // WIN32
+
 	namespace TN3270 {
 		namespace Abstract {
@@ -76,6 +83,9 @@
 				Session();
 				virtual ~Session();
+				/// @brief Setup charsets
+				void setCharSet(const char *remote, const char *local = SYSTEM_CHARSET);
+
 			};
 		}
@@ -86,6 +96,9 @@
 			/// @brief Handle of the related instance of lib3270
 			H3270 * hSession;
+			/// @brief Mutex to serialize access to lib3270
+			std::mutex sync;
+
 		public:
 			LocalSession();
 			virtual ~LocalSession();
	@@ -37,6 +37,7 @@		@@ -37,6 +37,7 @@
37	*/	37	*/
38		38
39	#include "private.h"	39	#include "private.h"
		40	+ #include <cstring>
40		41
41		42
42	/---[ Implement ]----------------------------------------------------------------------------------/	43	/---[ Implement ]----------------------------------------------------------------------------------/
	@@ -68,6 +69,38 @@		@@ -68,6 +69,38 @@
68		69
69	}	70	}
70		71
		72	+ /// @brief Setup charsets
		73	+ void Abstract::Session::setCharSet(const char remote, const char local) {
		74	+
		75	+#ifdef HAVE_ICONV
		76	+
		77	+ if(this->iconv.local != (iconv_t) (-1))
		78	+ iconv_close(iconv.local);
		79	+
		80	+ if(this->iconv.host != (iconv_t) (-1))
		81	+ iconv_close(iconv.host);
		82	+
		83	+ if(strcmp(local,remote)) {
		84	+
		85	+ // Local and remote charsets aren't the same, setup conversion
		86	+ iconv.local = iconv_open(local, remote);
		87	+ iconv.host = iconv_open(remote,local);
		88	+
		89	+ } else {
		90	+ // Same charset, doesn't convert
		91	+ iconv.local = iconv.host = (iconv_t)(-1);
		92	+ }
		93	+
		94	+#else
		95	+
		96	+ #error No ICONV Support
		97	+
		98	+#endif
		99	+
		100	+
		101	+ }
		102	+
		103	+
71	}	104	}
72		105
73		106