Updating print API.

Perry Werneck
1 parent e85d9d21
Showing 3 changed files with 49 additions and 9 deletions Show diff stats
src/core/util.c
src/include/lib3270.h
src/testprogram/testprogram.c
@@ -593,26 +593,39 @@ void lib3270_popup_an_errno(H3270 *hSession, int errn, const char *fmt, ...)
 }
-LIB3270_EXPORT int lib3270_print(H3270 *hSession, LIB3270_CONTENT_OPTION mode)
+LIB3270_EXPORT int lib3270_print(H3270 *hSession)
 {
-	return hSession->cbk.print(hSession, mode);
+	if(check_online_session(hSession))
+		return errno = ENOTCONN;
+
+	return hSession->cbk.print(hSession, (hSession->selected ? LIB3270_CONTENT_SELECTED : LIB3270_CONTENT_ALL));
 }
 LIB3270_EXPORT int lib3270_print_all(H3270 *hSession)
 {
-	return lib3270_print(hSession,LIB3270_CONTENT_ALL);
+	if(check_online_session(hSession))
+		return errno = ENOTCONN;
+
+	return hSession->cbk.print(hSession,LIB3270_CONTENT_ALL);
 }
 LIB3270_EXPORT int lib3270_print_selected(H3270 *hSession)
 {
+	if(check_online_session(hSession))
+		return errno = ENOTCONN;
+
 	if(lib3270_has_selection(hSession))
-		return lib3270_print(hSession,LIB3270_CONTENT_SELECTED);
+		return hSession->cbk.print(hSession,LIB3270_CONTENT_SELECTED);
+
 	return errno = ENODATA;
 }
 LIB3270_EXPORT int lib3270_print_copy(H3270 *hSession)
 {
-	return lib3270_print(hSession,LIB3270_CONTENT_COPY);
+	if(check_online_session(hSession))
+		return errno = ENOTCONN;
+
+	return hSession->cbk.print(hSession,LIB3270_CONTENT_COPY);
 }
 LIB3270_EXPORT int lib3270_save(H3270 *hSession, LIB3270_CONTENT_OPTION mode, const char *filename)
@@ -781,18 +781,45 @@
 	 LIB3270_EXPORT int lib3270_move_cursor(H3270 *h, LIB3270_DIRECTION dir, unsigned char sel);
 	/**
-	 * @brief Print page
+	 * @brief Default print operation.
+	 *
+	 * If the terminal has selected area print them, if not, print all contents.
 	 *
 	 * @param hSession	Session Handle.
-	 * @param mode		Content option.
 	 *
 	 * @return 0 if ok, error code if not.
 	 *
 	 */
-	LIB3270_EXPORT int lib3270_print(H3270 *hSession, LIB3270_CONTENT_OPTION mode);
+	LIB3270_EXPORT int lib3270_print(H3270 *hSession);
+	/**
+	 * @brief Print terminal screen.
+	 *
+	 * @param hSession	Session Handle.
+	 *
+	 * @return 0 if ok, error code if not.
+	 *
+	 */
 	LIB3270_EXPORT int lib3270_print_all(H3270 *hSession);
+
+	/**
+	 * @brief Print only selected area (if available).
+	 *
+	 * @param hSession	Session Handle.
+	 *
+	 * @return 0 if ok, error code if not.
+	 *
+	 */
 	LIB3270_EXPORT int lib3270_print_selected(H3270 *hSession);
+
+	/**
+	 * @brief Ask the front end module to print stored copy.
+	 *
+	 * @param hSession	Session Handle.
+	 *
+	 * @return 0 if ok, error code if not.
+	 *
+	 */
 	LIB3270_EXPORT int lib3270_print_copy(H3270 *hSession);
 	/**
@@ -4,8 +4,8 @@
 #include <stdlib.h>
 #include <getopt.h>
-#include <lib3270.h>
 #include <lib3270-internals.h>
+#include <lib3270.h>
 #include <lib3270/actions.h>
 #include <lib3270/trace.h>
	@@ -781,18 +781,45 @@		@@ -781,18 +781,45 @@
781	LIB3270_EXPORT int lib3270_move_cursor(H3270 *h, LIB3270_DIRECTION dir, unsigned char sel);	781	LIB3270_EXPORT int lib3270_move_cursor(H3270 *h, LIB3270_DIRECTION dir, unsigned char sel);
782		782
783	/**	783	/**
784	- * @brief Print page	784	+ * @brief Default print operation.
		785	+ *
		786	+ * If the terminal has selected area print them, if not, print all contents.
785	*	787	*
786	* @param hSession Session Handle.	788	* @param hSession Session Handle.
787	- * @param mode Content option.
788	*	789	*
789	* @return 0 if ok, error code if not.	790	* @return 0 if ok, error code if not.
790	*	791	*
791	*/	792	*/
792	- LIB3270_EXPORT int lib3270_print(H3270 *hSession, LIB3270_CONTENT_OPTION mode);	793	+ LIB3270_EXPORT int lib3270_print(H3270 *hSession);
793		794
		795	+ /**
		796	+ * @brief Print terminal screen.
		797	+ *
		798	+ * @param hSession Session Handle.
		799	+ *
		800	+ * @return 0 if ok, error code if not.
		801	+ *
		802	+ */
794	LIB3270_EXPORT int lib3270_print_all(H3270 *hSession);	803	LIB3270_EXPORT int lib3270_print_all(H3270 *hSession);
		804	+
		805	+ /**
		806	+ * @brief Print only selected area (if available).
		807	+ *
		808	+ * @param hSession Session Handle.
		809	+ *
		810	+ * @return 0 if ok, error code if not.
		811	+ *
		812	+ */
795	LIB3270_EXPORT int lib3270_print_selected(H3270 *hSession);	813	LIB3270_EXPORT int lib3270_print_selected(H3270 *hSession);
		814	+
		815	+ /**
		816	+ * @brief Ask the front end module to print stored copy.
		817	+ *
		818	+ * @param hSession Session Handle.
		819	+ *
		820	+ * @return 0 if ok, error code if not.
		821	+ *
		822	+ */
796	LIB3270_EXPORT int lib3270_print_copy(H3270 *hSession);	823	LIB3270_EXPORT int lib3270_print_copy(H3270 *hSession);
797		824
798	/**	825	/**