diff --git a/install-cross.sh b/install-cross.sh index d05b366..4c15b07 100755 --- a/install-cross.sh +++ b/install-cross.sh @@ -36,8 +36,11 @@ gdk-pixbuf-query-loaders python-devel EOF -# Instala o tema usado no pacote windows -sudo zypper --non-interactive in adwaita-icon-theme +# Instala apicativos e temas necessários +sudo zypper --non-interactive in \ + adwaita-icon-theme \ + gettext-tools \ + glib2-devel while read FILE do diff --git a/src/classlib/local.cc b/src/classlib/local.cc index 18a4f06..668d352 100644 --- a/src/classlib/local.cc +++ b/src/classlib/local.cc @@ -123,6 +123,8 @@ // Lib3270 entry points const char * (*_get_version)(void); LIB3270_CSTATE (*_get_connection_state)(H3270 *h); + LIB3270_MESSAGE (*_get_program_message)(H3270 *h); + int (*_disconnect)(H3270 *h); int (*_connect)(H3270 *h,int wait); const char (*_set_url)(H3270 *h, const char *n); @@ -183,6 +185,7 @@ { (void **) & _is_connected, "lib3270_is_connected" }, { (void **) & _get_connection_state, "lib3270_get_connection_state" }, + { (void **) & _get_program_message, "lib3270_get_program_message" }, { (void **) & _get_version, "lib3270_get_version" }, { (void **) & _disconnect, "lib3270_disconnect" }, @@ -266,6 +269,10 @@ return _get_connection_state(hSession); } + LIB3270_MESSAGE get_program_message(void) { + return _get_program_message(hSession); + } + int connect(void) { return _connect(hSession,0); diff --git a/src/classlib/remote.cc b/src/classlib/remote.cc index c7fd54a..2f27cad 100644 --- a/src/classlib/remote.cc +++ b/src/classlib/remote.cc @@ -49,20 +49,21 @@ #include #include #else - #define HLLAPI_PACKET_IS_CONNECTED "isConnected" - #define HLLAPI_PACKET_GET_CSTATE "getConnectionState" - #define HLLAPI_PACKET_IS_READY "isReady" - #define HLLAPI_PACKET_DISCONNECT "disconnect" - #define HLLAPI_PACKET_GET_CURSOR "getCursorAddress" - #define HLLAPI_PACKET_ENTER "enter" - #define HLLAPI_PACKET_QUIT "quit" - #define HLLAPI_PACKET_ERASE "erase" - #define HLLAPI_PACKET_ERASE_EOF "eraseEOF" - #define HLLAPI_PACKET_ERASE_EOL "eraseEOL" - #define HLLAPI_PACKET_ERASE_INPUT "eraseInput" - #define HLLAPI_PACKET_PRINT "print" - #define HLLAPI_PACKET_ASC2EBC "asc2ebc" - #define HLLAPI_PACKET_EBC2ASC "ebc2asc" + #define HLLAPI_PACKET_IS_CONNECTED "isConnected" + #define HLLAPI_PACKET_GET_CSTATE "getConnectionState" + #define HLLAPI_PACKET_GET_PROGRAM_MESSAGE "getProgramMessage" + #define HLLAPI_PACKET_IS_READY "isReady" + #define HLLAPI_PACKET_DISCONNECT "disconnect" + #define HLLAPI_PACKET_GET_CURSOR "getCursorAddress" + #define HLLAPI_PACKET_ENTER "enter" + #define HLLAPI_PACKET_QUIT "quit" + #define HLLAPI_PACKET_ERASE "erase" + #define HLLAPI_PACKET_ERASE_EOF "eraseEOF" + #define HLLAPI_PACKET_ERASE_EOL "eraseEOL" + #define HLLAPI_PACKET_ERASE_INPUT "eraseInput" + #define HLLAPI_PACKET_PRINT "print" + #define HLLAPI_PACKET_ASC2EBC "asc2ebc" + #define HLLAPI_PACKET_EBC2ASC "ebc2asc" #endif // WIN32 #include @@ -700,6 +701,10 @@ return (LIB3270_CSTATE) query_intval(HLLAPI_PACKET_GET_CSTATE); } + LIB3270_MESSAGE get_program_message(void) { + return (LIB3270_MESSAGE) query_intval(HLLAPI_PACKET_GET_PROGRAM_MESSAGE); + } + int connect(void) { int rc; diff --git a/src/include/pw3270/class.h b/src/include/pw3270/class.h index 0ca844a..d225ebd 100644 --- a/src/include/pw3270/class.h +++ b/src/include/pw3270/class.h @@ -146,6 +146,7 @@ virtual bool is_ready(void) = 0; virtual LIB3270_CSTATE get_cstate(void) = 0; + virtual LIB3270_MESSAGE get_program_message(void) = 0; // charset #ifdef WIN32 diff --git a/src/java/plugin.cc b/src/java/plugin.cc index c89d239..698034a 100644 --- a/src/java/plugin.cc +++ b/src/java/plugin.cc @@ -94,6 +94,10 @@ return lib3270_get_connection_state(hSession); } + LIB3270_MESSAGE get_program_message(void) { + return lib3270_get_program_message(hSession); + } + int disconnect(void) { lib3270_disconnect(hSession); return 0; diff --git a/src/plugins/hllapi/calls.cc b/src/plugins/hllapi/calls.cc index 5114002..86f1a46 100644 --- a/src/plugins/hllapi/calls.cc +++ b/src/plugins/hllapi/calls.cc @@ -164,7 +164,7 @@ HLLAPI_API_CALL hllapi_get_message_id(void) { - return session::get_default()->get_cstate(); + return session::get_default()->get_program_message(); } HLLAPI_API_CALL hllapi_get_screen_at(WORD row, WORD col, LPSTR buffer) diff --git a/src/plugins/hllapi/pluginmain.c b/src/plugins/hllapi/pluginmain.c index 093ca19..0211cde 100644 --- a/src/plugins/hllapi/pluginmain.c +++ b/src/plugins/hllapi/pluginmain.c @@ -216,10 +216,6 @@ send_result(source,lib3270_disconnect(lib3270_get_default_session_handle())); break; - case HLLAPI_PACKET_GET_PROGRAM_MESSAGE: - send_result(source,lib3270_get_program_message(lib3270_get_default_session_handle())); - break; - case HLLAPI_PACKET_IS_CONNECTED: send_result(source,lib3270_in_tn3270e(lib3270_get_default_session_handle())); break; @@ -320,6 +316,10 @@ send_result(source,lib3270_get_connection_state(lib3270_get_default_session_handle())); break; + case HLLAPI_PACKET_GET_PROGRAM_MESSAGE: + send_result(source,lib3270_get_program_message(lib3270_get_default_session_handle())); + break; + case HLLAPI_PACKET_SET_TOGGLE: send_result(source,lib3270_set_toggle(lib3270_get_default_session_handle(), (LIB3270_TOGGLE) ((struct hllapi_packet_set *) source->buffer)->id, -- libgit2 0.21.2