Refactoring convenience object.

Perry Werneck
1 parent dae54685
Showing 3 changed files with 89 additions and 125 deletions Show diff stats
client/src/core/host.cc
client/src/testprogram/testprogram.cc
common/src/include/lib3270/ipc.h
@@ -49,13 +49,12 @@
  namespace TN3270 {
-	/*
 	Host::Host(const char *id, const char *url, time_t timeout) {
 		debug("Creating host id=\"", id);
 		this->timeout = timeout;
-		this->session = Session::create(id);
+		this->session = Session::getInstance(id);
 		if(url) {
 			this->connect(url);
 		}
@@ -104,14 +103,7 @@
 	}
-    Host & Host::push(const Action action) {
-        session->push(action);
-        sync();
-        return *this;
-    }
-
 	bool Host::isReady() const {
-//        this->session->waitForReady(this->timeout);
 		return getProgramMessage() == MESSAGE_NONE;
 	}
@@ -194,28 +186,13 @@
 		return *this;
 	}
-	/// @brief Send PF.
-	Host & Host::pfkey(unsigned short value) {
-		this->session->pfkey(value);
-		return *this;
-	}
-
-	/// @brief Send PA.
-	Host & Host::pakey(unsigned short value) {
-		this->session->pakey(value);
-		return *this;
-	}
-
-	/// @brief Request print
-	Host & Host::print(LIB3270_CONTENT_OPTION option) {
-            throw std::system_error(ENOTSUP, std::system_category());
-	}
-
+	/*
 	Host & Host::input(const char *text, size_t sz) {
 		this->session->input(text, sz);
 		return *this;
 	}
+
 	Host & Host::input(const char *text, const char control_char) {
 		for(const char * ptr = strchr(text,control_char); ptr; ptr = strchr(text,control_char)) {
@@ -467,6 +444,5 @@
 	}
 	*/
-
  }
@@ -44,6 +44,7 @@
 /*---[ Implement ]----------------------------------------------------------------------------------*/
+/*
  // Test "Session" object
  static void chkSession() {
@@ -81,37 +82,10 @@
 	delete hSession;
  }
+ */
- int main(int argc, char **argv) {
-
-	const char * session = ""; // "pw3270:a";
-
-	#pragma GCC diagnostic push
-	#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
-	static struct option options[] = {
-		{ "session",	required_argument,	0,	's' },
-		{ 0, 0, 0, 0}
-
-	};
-	#pragma GCC diagnostic pop
-
-	int long_index =0;
-	int opt;
-	while((opt = getopt_long(argc, argv, "s:", options, &long_index )) != -1) {
-
-		switch(opt) {
-		case 's':
-			session = optarg;
-			break;
-
-		}
-
-	}
-
-	chkSession();
-
-	/*
-	cout << "Session: " << session << endl;
+ // test host object
+ static void testHost(const char *session) {
 	TN3270::Host host{session};
@@ -143,8 +117,37 @@
 		cerr << std::endl << e.what() << std::endl << std::endl;
 	}
-	*/
+ }
+
+ int main(int argc, char **argv) {
+
+	const char * session = ""; // "pw3270:a";
+
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+	static struct option options[] = {
+		{ "session",	required_argument,	0,	's' },
+		{ 0, 0, 0, 0}
+
+	};
+	#pragma GCC diagnostic pop
+
+	int long_index =0;
+	int opt;
+	while((opt = getopt_long(argc, argv, "s:", options, &long_index )) != -1) {
+
+		switch(opt) {
+		case 's':
+			session = optarg;
+			break;
+
+		}
+
+	}
+
+	cout << "Session: " << session << endl;
+	testHost(session);
 	return 0;
  }
@@ -255,14 +255,18 @@
 			virtual void push(int baddr, const char *text, int length) = 0;
 			virtual void push(int row, int col, const char *text, int length) = 0;
-			inline void push(int row, int col, const std::string &text) {
-				push(row,col,text.c_str(),text.size());
+			inline void push(const std::string &text) {
+				push(-1,text.c_str(),text.size());
 			}
 			inline void push(int baddr, const std::string &text) {
 				push(baddr,text.c_str(),text.size());
 			}
+			inline void push(int row, int col, const std::string &text) {
+				push(row,col,text.c_str(),text.size());
+			}
+
 			void push(const PFKey key);
 			void push(const PAKey key);
 			virtual void push(const Action action) = 0;
@@ -354,7 +358,6 @@
 		};
 		/// @brief TN3270 Host
-		/*
 		class TN3270_PUBLIC Host : public std::basic_streambuf<char, std::char_traits<char> > {
 		private:
@@ -389,9 +392,32 @@
 				return session->getConnectionState() == state;
 			}
+			// Contents
+			Host & pop(int baddr, std::string &text);
+			Host & pop(int row, int col, std::string &text);
+			Host & pop(std::string &text);
+
+			std::string toString() const;
+			std::string toString(int baddr, size_t len = -1, char lf = '\n') const;
+			std::string toString(int row, int col, size_t len = -1, char lf = '\n') const;
+
+			template<typename T>
+			Host & push(T value) {
+				session->push(value);
+				sync();
+				return *this;
+			}
+
+			template<typename T>
+			Host & pop(T value) {
+				sync();
+				session->pop(value);
+				return *this;
+			}
+
+			// Actions
 			Host & connect(const char *url = nullptr, bool sync = true);
 			Host & disconnect();
-
 			Host & waitForReady(time_t timeout = DEFAULT_TIMEOUT);
 			/// @brief Execute action by name.
@@ -424,17 +450,16 @@
 			}
 			/// @brief Set cursor address.
-			inline void setCursor(unsigned short addr) {
+			inline Host & setCursor(unsigned short addr) {
 				session->setCursor(addr);
+				return *this;
 			}
-			inline void setCursorAddress(unsigned short addr) {
-				session->setCursor(addr);
-			}
 			/// @brief Set cursor position.
-			inline void setCursor(unsigned short row, unsigned short col) {
+			inline Host & setCursor(unsigned short row, unsigned short col) {
 				session->setCursor(row,col);
+				return *this;
 			}
 			/// @brief Get cursor address
@@ -470,13 +495,22 @@
 			// Actions
 			/// @brief Send PF.
-			Host & pfkey(unsigned short value);
+			inline Host & pfkey(unsigned short value) {
+				session->pfkey(value);
+				return *this;
+			}
 			/// @brief Send PA.
-			Host & pakey(unsigned short value);
+			inline Host & pakey(unsigned short value) {
+				session->pakey(value);
+				return *this;
+			}
 			/// @brief Request print
-			Host & print(LIB3270_CONTENT_OPTION option = LIB3270_CONTENT_ALL);
+			inline Host & print(LIB3270_CONTENT_OPTION option = LIB3270_CONTENT_ALL) {
+				session->print(option);
+				return *this;
+			}
 			/// @brief Wait.
 			inline Host & wait(unsigned short seconds) {
@@ -499,73 +533,26 @@
 			///
 			/// @param text			String with the text to input.
 			/// @param control_char	Control character used to identify commands.
-			Host & input(const char *text, const char control_char = '@');
+			// Host & input(const char *text, const char control_char = '@');
-			Host & input(const char *text, size_t sz);
+			// Host & input(const char *text, size_t sz);
-			/// @brief Set field at current posicion, jumps to next writable field.
+			/// @brief Set field at current position, jumps to next writable field.
 			inline Host & push(const char *text) {
-				session->push(text);
+				session->push(text,-1);
 				return *this;
 			};
-			inline Host & push(const std::string &text) {
-				session->push(text);
-				return *this;
-
-			}
-
-			inline Host & push(int baddr, const std::string &text) {
-				session->push(baddr,text);
-				return *this;
-			}
-
-			inline Host & push(int baddr, const char *text, int length = -1) {
-				session->push(baddr,text,length);
-				return *this;
-			}
-
-			inline Host & push(int row, int col, const std::string &text) {
-				session->push(row,col,text);
-				return *this;
-			}
-
-			inline Host & push(int row, int col, const char *text, int length = -1) {
-				session->push(row,col,text,length);
-				return *this;
-			}
-
-			inline Host & push(const PFKey key) {
-				session->push(key);
-				return *this;
-			}
-
-			inline Host & push(const PAKey key) {
-				session->push(key);
-				return *this;
-			}
-
-			Host & push(const Action action);
-
-			// Get contents.
-
-			Host & pop(int baddr, std::string &text);
-			Host & pop(int row, int col, std::string &text);
-			Host & pop(std::string &text);
-
-			std::string toString() const;
-			std::string toString(int baddr, size_t len = -1, char lf = '\n') const;
-			std::string toString(int row, int col, size_t sz, char lf = '\n') const;
-
+			/*
 			// Event listeners
 			inline Host & insert(Event::Type type, std::function <void(const Event &event)> listener) noexcept {
 				session->insert(type, listener);
 				return *this;
 			}
+			*/
 		};
-		*/
 	}
@@ -573,7 +560,6 @@
 	TN3270_PUBLIC const char * toCharString(const TN3270::ConnectionState connectionState);
 	TN3270_PUBLIC const char * toCharString(const TN3270::Action action);
-	/*
 	template <typename T>
 	inline TN3270_PUBLIC TN3270::Session & operator<<(TN3270::Session& session, const T value) {
 		return session.push(value);
@@ -593,7 +579,6 @@
         stream << host.toString();
         return stream;
 	}
-	*/
 #endif