From 932d75df265c4272b8d78c6e21f84d60bae3e7eb Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Wed, 19 Sep 2012 12:54:50 +0000 Subject: [PATCH] Atualizando plugin hllapi apos teste em VM --- Makefile.in | 4 +++- po/pt_BR.po | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------- pw3270.nsi.in | 4 +++- src/include/pw3270/hllapi.h | 5 +++++ src/plugins/remotectl/hllapi.c | 4 ++++ src/pw3270/Makefile.in | 1 + 6 files changed, 119 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in index e5cc01b..3dd9e63 100644 --- a/Makefile.in +++ b/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 diff --git a/po/pt_BR.po b/po/pt_BR.po index 762872b..eeb221b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" 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 \n" "Language-Team: Português \n" @@ -87,6 +87,10 @@ msgstr "Adicionar à cópia" 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 "Cursor piscante" 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 "Conexão foi cancelada pelo servidor" 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 "Cursor mira" msgid "Cut" msgstr "Recortar" -#: ui/99debug.xml:304 +#: ui/99debug.xml:402 msgid "DS Trace" msgstr "DS Trace" @@ -220,11 +228,11 @@ msgstr "DS Trace" 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 "Nome do servidor em branco" 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 "Erro em ioctl(%s) ao ativar o modo não blocante" 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 "Manter selecionado" 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 "Não está no modo 3270, transferência cancelada" 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 "RPQ: Erro em gethostbyname" 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 "Remover seleção" 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 "Salvar tela" 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 "Configurações" 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 "Esta versão do %s foi gerada sem suporte para conexões seguras (SSL)." msgid "Toolbar" msgstr "Barra de ferramentas" -#: ui/99debug.xml:304 +#: ui/99debug.xml:402 msgid "Trace" msgstr "Trace" @@ -945,7 +1037,7 @@ msgstr "Unsupported socks 4 proxy" 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" diff --git a/pw3270.nsi.in b/pw3270.nsi.in index 85c2c19..3d4385b 100644 --- a/pw3270.nsi.in +++ b/pw3270.nsi.in @@ -75,6 +75,7 @@ SubSection "@PACKAGE@" 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 "Software Development Kit" 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" diff --git a/src/include/pw3270/hllapi.h b/src/include/pw3270/hllapi.h index 64e9338..a8a424f 100644 --- a/src/include/pw3270/hllapi.h +++ b/src/include/pw3270/hllapi.h @@ -61,7 +61,12 @@ extern "C" { } 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" */ diff --git a/src/plugins/remotectl/hllapi.c b/src/plugins/remotectl/hllapi.c index 4f18675..c1c973a 100644 --- a/src/plugins/remotectl/hllapi.c +++ b/src/plugins/remotectl/hllapi.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; diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index d55cf39..25820bd 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -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" >> $@ -- libgit2 0.21.2