Corrigindo gerenciamento de código de página no HLLAPI.

Perry Werneck
1 parent 2a3185b8
Showing 6 changed files with 45 additions and 66 deletions Show diff stats
locale/pt_BR.po
locale/pw3270.pot
src/include/pw3270/hllapi.h
src/libpw3270cpp/session.cc
src/plugins/hllapi/calls.cc
src/pw3270/resources.rc.in
@@ -5,7 +5,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-10 10:12-0300\n"
+"POT-Creation-Date: 2017-08-10 10:21-0300\n"
 "PO-Revision-Date: 2017-02-15 17:08-0200\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <perry.werneck@gmail.com>\n"
@@ -419,11 +419,6 @@ msgstr &quot;Não foi possível conectar a %s&quot;
 msgid "Can't connect to %s:%s"
 msgstr "Não foi possível conectar a %s:%s"
-#: main.c:70
-#, fuzzy
-msgid "Can't connect to DBUS server"
-msgstr "Não foi possível conectar a %s"
-
 #: selection.c:425
 #, c-format
 msgid "Can't convert line %d from %s to %s"
@@ -438,10 +433,6 @@ msgstr &quot;Recortar não permitido em seleção retangular&quot;
 msgid "Can't determine value for environment variable \"%s\" "
 msgstr "Não consigo determinar o valor da variável de ambiente \"%s\" "
-#: main.c:115
-msgid "Can't get DBUS object name"
-msgstr ""
-
 #: ft.c:413
 msgid "Can't get file size"
 msgstr "Não foi possível obter o tamanho do arquivo"
@@ -663,11 +654,6 @@ msgstr &quot;Configurar host&quot;
 msgid "Connect on startup"
 msgstr "Conectar ao iniciar"
-#: gobject.c:205
-#, fuzzy
-msgid "Connecting to host"
-msgstr "Não foi possível conectar ao servidor"
-
 #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397
 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477
 #: connect.c:573
@@ -1927,11 +1913,6 @@ msgstr &quot;Iniciar transferência de arquivo&quot;
 msgid "Starting"
 msgstr "Iniciando"
-#: gobject.c:193
-#, c-format
-msgid "State %04d can't accept requests"
-msgstr ""
-
 #: security.c:237
 msgid "Subject issuer mismatch"
 msgstr "Divergência na identidade do emissor"
@@ -2417,11 +2398,6 @@ msgstr &quot;Valor de cor inválido ou inesperado: \&quot;%s\&quot;&quot;
 msgid "Unexpected or unknown security status"
 msgstr "Estado de segurança inesperado ou desconhecido."
-#: gobject.c:208
-#, fuzzy, c-format
-msgid "Unexpected state %04d"
-msgstr "Alvo inesperado \"%s\""
-
 #: actions.c:391
 #, c-format
 msgid "Unexpected target \"%s\""
@@ -2826,6 +2802,10 @@ msgstr &quot;translator-credits&quot;
 #~ "32768. Valores maiores trazem maior performance, porem, nem todos os "
 #~ "hosts podem suportá-los."
+#, fuzzy
+#~ msgid "Can't connect to DBUS server"
+#~ msgstr "Não foi possível conectar a %s"
+
 #~ msgid "Can't start download."
 #~ msgstr "Não foi possível iniciar o download."
@@ -2862,6 +2842,10 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "Complete"
 #~ msgstr "Completo"
+#, fuzzy
+#~ msgid "Connecting to host"
+#~ msgstr "Não foi possível conectar ao servidor"
+
 #~ msgid "Copiar tudo"
 #~ msgstr "Copiar tudo"
@@ -3224,6 +3208,10 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "Unexpected element <%s>"
 #~ msgstr "Elemento <%s> inesperado"
+#, fuzzy
+#~ msgid "Unexpected state %04d"
+#~ msgstr "Alvo inesperado \"%s\""
+
 #~ msgid ""
 #~ "Unknown host:\n"
 #~ "%s"
@@ -9,7 +9,7 @@ msgstr &quot;&quot;
 "#-#-#-#-#  lib3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-10 10:12-0300\n"
+"POT-Creation-Date: 2017-08-10 13:47-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot;
 "#-#-#-#-#  pw3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-10 10:12-0300\n"
+"POT-Creation-Date: 2017-08-10 13:47-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,17 +39,6 @@ msgstr &quot;&quot;
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  dbus3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-10 10:12-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
 #: window.c:329
 #, c-format
@@ -435,10 +424,6 @@ msgstr &quot;&quot;
 msgid "Can't connect to %s:%s"
 msgstr ""
-#: main.c:70
-msgid "Can't connect to DBUS server"
-msgstr ""
-
 #: selection.c:425
 #, c-format
 msgid "Can't convert line %d from %s to %s"
@@ -453,10 +438,6 @@ msgstr &quot;&quot;
 msgid "Can't determine value for environment variable \"%s\" "
 msgstr ""
-#: main.c:115
-msgid "Can't get DBUS object name"
-msgstr ""
-
 #: ft.c:413
 msgid "Can't get file size"
 msgstr ""
@@ -666,10 +647,6 @@ msgstr &quot;&quot;
 msgid "Connect on startup"
 msgstr ""
-#: gobject.c:205
-msgid "Connecting to host"
-msgstr ""
-
 #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397
 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477
 #: connect.c:573
@@ -1884,11 +1861,6 @@ msgstr &quot;&quot;
 msgid "Starting"
 msgstr ""
-#: gobject.c:193
-#, c-format
-msgid "State %04d can't accept requests"
-msgstr ""
-
 #: security.c:237
 msgid "Subject issuer mismatch"
 msgstr ""
@@ -2320,11 +2292,6 @@ msgstr &quot;&quot;
 msgid "Unexpected or unknown security status"
 msgstr ""
-#: gobject.c:208
-#, c-format
-msgid "Unexpected state %04d"
-msgstr ""
-
 #: actions.c:391
 #, c-format
 msgid "Unexpected target \"%s\""
@@ -154,9 +154,6 @@ extern &quot;C&quot; {
 	HLLAPI_API_CALL hllapi_reset(void);
-	HLLAPI_API_CALL hllapi_get_revision(void);
-	HLLAPI_API_CALL hllapi_get_datadir(LPSTR datadir);
-
 	HLLAPI_API_CALL hllapi_connect(LPSTR uri, WORD wait);
 	HLLAPI_API_CALL hllapi_disconnect(void);
 	HLLAPI_API_CALL hllapi_get_message_id(void);
@@ -192,6 +189,7 @@ extern &quot;C&quot; {
 	HLLAPI_API_CALL hllapi_get_revision(void);
 	HLLAPI_API_CALL hllapi_get_datadir(LPSTR datadir);
+	HLLAPI_API_CALL hllapi_set_charset(LPSTR datadir);
 	HLLAPI_API_CALL hllapi_connect(LPSTR uri, WORD wait);
 	HLLAPI_API_CALL hllapi_disconnect(void);
@@ -222,6 +222,7 @@
 		trace("%s(%s,%s)",__FUNCTION__,remote,local);
 #ifdef HAVE_ICONV
+
 		string display_charset = this->get_display_charset();
 		if(this->conv2Local != (iconv_t) (-1))
@@ -243,9 +244,16 @@
 		}
 		else
 		{
+			// Same charset, doesn't convert
 			conv2Local = conv2Host = (iconv_t)(-1);
 		}
+#else
+
+		#error aqui
+		throw exception("%s",strerror(ENOSUP));
+
+
 #endif
 	}
@@ -54,6 +54,9 @@
 		if(hSession)
 			delete hSession;
 		hSession = session::create(mode);
+
+		session::get_default()->set_display_charset();
+
 		trace("hSession=%p",hSession);
 	}
 	catch(std::exception &e)
@@ -239,6 +242,21 @@
 	return 0;
  }
+ HLLAPI_API_CALL hllapi_set_charset(LPSTR text)
+ {
+ 	try
+ 	{
+
+		session::get_default()->set_display_charset(NULL, (const char *) text);
+
+ 	}
+	catch(std::exception &e)
+	{
+		return HLLAPI_STATUS_SYSTEM_ERROR;
+	}
+
+	return 0;
+ }
  HLLAPI_API_CALL hllapi_pfkey(WORD key)
  {
 1 ICON @PACKAGE_NAME@.ico
 2 VERSIONINFO
-FILEVERSION     @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@
-PRODUCTVERSION  @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@
+FILEVERSION     @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@
+PRODUCTVERSION  @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -14,7 +14,7 @@ BEGIN
       VALUE "LegalCopyright", "Copyright (c) Banco do Brasil S.A."
       VALUE "OriginalFilename", "@PACKAGE_NAME@.exe"
       VALUE "ProductName", "@PACKAGE_NAME@"
-      VALUE "ProductVersion", "@PACKAGE_VERSION@"
+      VALUE "ProductVersion", "@PACKAGE_VERSION@-@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@"
     END
   END
 END
	@@ -54,6 +54,9 @@		@@ -54,6 +54,9 @@
54	if(hSession)	54	if(hSession)
55	delete hSession;	55	delete hSession;
56	hSession = session::create(mode);	56	hSession = session::create(mode);
		57	+
		58	+ session::get_default()->set_display_charset();
		59	+
57	trace("hSession=%p",hSession);	60	trace("hSession=%p",hSession);
58	}	61	}
59	catch(std::exception &e)	62	catch(std::exception &e)
	@@ -239,6 +242,21 @@		@@ -239,6 +242,21 @@
239	return 0;	242	return 0;
240	}	243	}
241		244
		245	+ HLLAPI_API_CALL hllapi_set_charset(LPSTR text)
		246	+ {
		247	+ try
		248	+ {
		249	+
		250	+ session::get_default()->set_display_charset(NULL, (const char *) text);
		251	+
		252	+ }
		253	+ catch(std::exception &e)
		254	+ {
		255	+ return HLLAPI_STATUS_SYSTEM_ERROR;
		256	+ }
		257	+
		258	+ return 0;
		259	+ }
242		260
243	HLLAPI_API_CALL hllapi_pfkey(WORD key)	261	HLLAPI_API_CALL hllapi_pfkey(WORD key)
244	{	262	{
1	1 ICON @PACKAGE_NAME@.ico	1	1 ICON @PACKAGE_NAME@.ico
2		2
3	2 VERSIONINFO	3	2 VERSIONINFO
4	-FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@
5	-PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@	4	+FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@
		5	+PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@
6	BEGIN	6	BEGIN
7	BLOCK "StringFileInfo"	7	BLOCK "StringFileInfo"
8	BEGIN	8	BEGIN
	@@ -14,7 +14,7 @@ BEGIN		@@ -14,7 +14,7 @@ BEGIN
14	VALUE "LegalCopyright", "Copyright (c) Banco do Brasil S.A."	14	VALUE "LegalCopyright", "Copyright (c) Banco do Brasil S.A."
15	VALUE "OriginalFilename", "@PACKAGE_NAME@.exe"	15	VALUE "OriginalFilename", "@PACKAGE_NAME@.exe"
16	VALUE "ProductName", "@PACKAGE_NAME@"	16	VALUE "ProductName", "@PACKAGE_NAME@"
17	- VALUE "ProductVersion", "@PACKAGE_VERSION@"	17	+ VALUE "ProductVersion", "@PACKAGE_VERSION@-@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@"
18	END	18	END
19	END	19	END
20	END	20	END