Atualizando plugin hllapi apos teste em VM

perry.werneck@gmail.com
1 parent 545d52b6
Showing 6 changed files with 119 additions and 13 deletions Show diff stats
Makefile.in
po/pt_BR.po
pw3270.nsi.in
src/include/pw3270/hllapi.h
src/plugins/remotectl/hllapi.c
src/pw3270/Makefile.in
@@ -154,7 +154,7 @@ debian/lib3270-dev.install: Makefile
 	@echo "$(includedir)/lib3270.h" > $@
 	@echo "$(includedir)/lib3270" >> $@
 	@echo "$(datarootdir)/@PACKAGE_NAME@/ui/99debug.xml" >> $@
-	@echo "$(libdir)/pkgconfig/*.pc" >: $@
+	@echo "$(libdir)/pkgconfig/*.pc" >> $@
 #---[ Debug targets ]----------------------------------------------------------
@@ -198,7 +198,9 @@ endif
 nsi: Release
 ifneq ($(MAKENSIS),no)
 	@chmod +x makegtkruntime.sh
+	@echo "  GEN  GTK Runtime"
 	@./makegtkruntime.sh
+	@echo "  GEN  Windows installer"
 	@"$(MAKENSIS)" $(PACKAGE_NAME).nsi
 endif
@@ -5,7 +5,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-17 14:31-0300\n"
+"POT-Creation-Date: 2012-09-19 09:13-0300\n"
 "PO-Revision-Date: 2012-09-14 14:32-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <perry.werneck@gmail.com>\n"
@@ -87,6 +87,10 @@ msgstr &quot;Adicionar à cópia&quot;
 msgid "Alert sound"
 msgstr "Aviso sonoro"
+#: ui/10keypad.xml:352
+msgid "Attn"
+msgstr "Attn"
+
 #: ui/00default.xml:128
 msgid "Auto-Reconnect"
 msgstr "Reconectar automaticamente"
@@ -107,6 +111,10 @@ msgstr &quot;Cursor piscante&quot;
 msgid "Bold"
 msgstr "Negrito"
+#: ui/10keypad.xml:353
+msgid "Break"
+msgstr "Break"
+
 #: telnet.c:2059
 msgid "Broken pipe"
 msgstr "Conexão interrompida"
@@ -196,7 +204,7 @@ msgstr &quot;Conexão foi cancelada pelo servidor&quot;
 msgid "Copy"
 msgstr "Copiar"
-#: ui/99debug.xml:299
+#: ui/99debug.xml:397
 msgid "Copy as HTML"
 msgstr "Copiar como HTML"
@@ -212,7 +220,7 @@ msgstr &quot;Cursor mira&quot;
 msgid "Cut"
 msgstr "Recortar"
-#: ui/99debug.xml:304
+#: ui/99debug.xml:402
 msgid "DS Trace"
 msgstr "DS Trace"
@@ -220,11 +228,11 @@ msgstr &quot;DS Trace&quot;
 msgid "Data conversion error"
 msgstr "Erro na conversão de dados"
-#: ui/99debug.xml:312
+#: ui/99debug.xml:410
 msgid "Debug"
 msgstr "Depuração"
-#: ui/99debug.xml:314
+#: ui/99debug.xml:412
 msgid "Debug window updates"
 msgstr "Mostrar atualizações de janela"
@@ -256,6 +264,21 @@ msgstr &quot;Nome do servidor em branco&quot;
 msgid "Empty port name"
 msgstr "Porta em branco"
+#: ui/10keypad.xml:348
+msgid ""
+"Erase\n"
+"EOF"
+msgstr ""
+"Erase\n"
+"EOF"
+
+#: ui/10keypad.xml:349
+#, fuzzy
+msgid ""
+"Erase\n"
+"Input"
+msgstr "Apagar campos"
+
 #: ui/00default.xml:80
 msgid "Erase input"
 msgstr "Apagar campos"
@@ -302,7 +325,7 @@ msgstr &quot;Erro em ioctl(%s) ao ativar o modo não blocante&quot;
 msgid "Error resolving %s: %s"
 msgstr "Erro ao resolver %s: %s"
-#: ui/99debug.xml:306
+#: ui/99debug.xml:404
 msgid "Event Trace"
 msgstr "Trace de eventos"
@@ -419,6 +442,10 @@ msgstr &quot;Manter selecionado&quot;
 msgid "Keyboard is locked"
 msgstr "Teclado está bloqueado"
+#: ui/10keypad.xml:298
+msgid "Lateral keypad"
+msgstr "Lateral keypad"
+
 #: host.c:390
 msgid "Missing ']'"
 msgstr "Faltando ']'"
@@ -460,6 +487,66 @@ msgstr &quot;Não está no modo 3270, transferência cancelada&quot;
 msgid "Option '%c:' is not supported"
 msgstr "Opção não suportada: '%c:'"
+#: ui/10keypad.xml:335
+msgid "PA1"
+msgstr "PA1"
+
+#: ui/10keypad.xml:336
+msgid "PA2"
+msgstr "PA2"
+
+#: ui/10keypad.xml:337
+msgid "PA3"
+msgstr "PA3"
+
+#: ui/10keypad.xml:300
+msgid "PF1"
+msgstr "PF1"
+
+#: ui/10keypad.xml:315
+msgid "PF10"
+msgstr "PF10"
+
+#: ui/10keypad.xml:316
+msgid "PF11"
+msgstr "PF11"
+
+#: ui/10keypad.xml:317
+msgid "PF12"
+msgstr "PF12"
+
+#: ui/10keypad.xml:301
+msgid "PF2"
+msgstr "PF2"
+
+#: ui/10keypad.xml:302
+msgid "PF3"
+msgstr "PF3"
+
+#: ui/10keypad.xml:305
+msgid "PF4"
+msgstr "PF4"
+
+#: ui/10keypad.xml:306
+msgid "PF5"
+msgstr "PF5"
+
+#: ui/10keypad.xml:307
+msgid "PF6"
+msgstr "PF6"
+
+#: ui/10keypad.xml:310
+msgid "PF7"
+msgstr "PF7"
+
+#: ui/10keypad.xml:311
+msgid "PF8"
+msgstr "PF8"
+
+#: ui/10keypad.xml:312
+msgid "PF9"
+msgstr "PF9"
+
 #: proxy.c:363
 msgid "Passthru Proxy: send error"
 msgstr "Passthru Proxy: Erro ao enviar"
@@ -567,7 +654,7 @@ msgstr &quot;RPQ: Erro em gethostbyname&quot;
 msgid "Receive file"
 msgstr "Receber arquivo"
-#: ui/99debug.xml:313
+#: ui/99debug.xml:411
 msgid "Reload buffer contents"
 msgstr "Recarregar conteúdo do buffer"
@@ -579,6 +666,11 @@ msgstr &quot;Remover seleção&quot;
 msgid "Reselect"
 msgstr "Reselecionar"
+#: ui/10keypad.xml:345
+#, fuzzy
+msgid "Reset"
+msgstr "Reselecionar"
+
 #: ui/00default.xml:123
 msgid "Resize on alternate screen"
 msgstr "Mudar tamanho do terminal em tela alternativa"
@@ -752,7 +844,7 @@ msgstr &quot;Salvar tela&quot;
 msgid "Save selected"
 msgstr "Salvar seleção"
-#: ui/99debug.xml:305
+#: ui/99debug.xml:403
 msgid "Screen Trace"
 msgstr "Trace de tela"
@@ -796,7 +888,7 @@ msgstr &quot;Configurações&quot;
 msgid "Show Underline"
 msgstr "Mostrar sublinhado"
-#: ui/99debug.xml:312
+#: ui/99debug.xml:410
 msgid "Show test pattern"
 msgstr "Mostrar padrão de teste"
@@ -842,7 +934,7 @@ msgstr &quot;Esta versão do %s foi gerada sem suporte para conexões seguras (SSL).&quot;
 msgid "Toolbar"
 msgstr "Barra de ferramentas"
-#: ui/99debug.xml:304
+#: ui/99debug.xml:402
 msgid "Trace"
 msgstr "Trace"
@@ -945,7 +1037,7 @@ msgstr &quot;Unsupported socks 4 proxy&quot;
 msgid "Use +/- for field navigation"
 msgstr "Usar teclas +/- para navegar por campos"
-#: ui/99debug.xml:307
+#: ui/99debug.xml:405
 msgid "View Field Delimiters"
 msgstr "Mostrar delimitadores de campo"
@@ -75,6 +75,7 @@ SubSection &quot;@PACKAGE@&quot; SecMain
 		CreateDirectory "$INSTDIR\ui"
 		file "/oname=$INSTDIR\ui\00default.xml" 	"ui\00default.xml"
+		file "/oname=$INSTDIR\ui\10keypad.xml" 		"ui\10keypad.xml"
 		# Locale files
 		CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES"
@@ -149,10 +150,11 @@ Section /o &quot;Software Development Kit&quot; SecSDK
 	CreateDirectory "$INSTDIR\sdk"
 	CreateDirectory "$INSTDIR\sdk\include"
 	CreateDirectory "$INSTDIR\sdk\include\lib3270"
+	CreateDirectory "$INSTDIR\sdk\include\pw3270"
 	file "/oname=$INSTDIR\sdk\include\lib3270.h" "src\include\lib3270.h"
 	file "/oname=$INSTDIR\sdk\include\pw3270.h" "src\include\pw3270.h"
-	file "/oname=$INSTDIR\sdk\include\v3270.h" "src\include\v3270.h"
+	file "/oname=$INSTDIR\sdk\include\pw3270\v3270.h" "src\include\pw3270\v3270.h"
 	file "/oname=$INSTDIR\sdk\include\lib3270\config.h" "src\include\lib3270\config.h"
 	file "/oname=$INSTDIR\sdk\include\lib3270\rules.mak" "src\include\rules.mak"
@@ -61,7 +61,12 @@ extern &quot;C&quot; {
  } HLLAPI_DATA;
  #pragma pack()
+#ifdef _WIN32
+ // http://www.mingw.org/wiki/Visual_Basic_DLL
+ __declspec (dllexport) int __stdcall hllapi(const unsigned long *func, char *str, unsigned short *length, unsigned short *rc);
+#else
  LIB3270_EXPORT int hllapi(const unsigned long *func, char *str, unsigned short *length, unsigned short *rc);
+#endif // _WIN32
 #ifdef __cplusplus
 }    /* end of extern "C" */
@@ -143,7 +143,11 @@
 	return result;
  }
+#ifdef _WIN32
+ __declspec (dllexport) int __stdcall hllapi(const unsigned long *func, char *str, unsigned short *length, unsigned short *rc)
+#else
  LIB3270_EXPORT int hllapi(const unsigned long *func, char *str, unsigned short *length, unsigned short *rc)
+#endif // _WIN32
  {
  	int 	  result = 1;
  	char	* arg;
@@ -190,6 +190,7 @@ $(DEBDIR)/pw3270.install: Makefile
 	@echo "$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@" >> $@
 	@echo "$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@" >> $@
 	@echo "$(datarootdir)/$(PACKAGE_NAME)/ui/00default.xml" >> $@
+	@echo "$(datarootdir)/$(PACKAGE_NAME)/ui/10keypad.xml" >> $@
 	@echo "$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME).png" >> $@
 	@echo "$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME)-logo.png" >> $@
	@@ -190,6 +190,7 @@ $(DEBDIR)/pw3270.install: Makefile		@@ -190,6 +190,7 @@ $(DEBDIR)/pw3270.install: Makefile
190	@echo "$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@" >> $@	190	@echo "$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@" >> $@
191	@echo "$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@" >> $@	191	@echo "$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@" >> $@
192	@echo "$(datarootdir)/$(PACKAGE_NAME)/ui/00default.xml" >> $@	192	@echo "$(datarootdir)/$(PACKAGE_NAME)/ui/00default.xml" >> $@
		193	+ @echo "$(datarootdir)/$(PACKAGE_NAME)/ui/10keypad.xml" >> $@
193	@echo "$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME).png" >> $@	194	@echo "$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME).png" >> $@
194	@echo "$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME)-logo.png" >> $@	195	@echo "$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME)-logo.png" >> $@
195		196