Download as
Browse Code »

Commit 932d75df265c4272b8d78c6e21f84d60bae3e7eb

Authored by perry.werneck@gmail.com
1 parent 545d52b6
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Atualizando plugin hllapi apos teste em VM

Showing 6 changed files with 119 additions and 13 deletions   Show diff stats
Makefile.in
  Diff comments   View file @932d75d
... ... @@ -154,7 +154,7 @@ debian/lib3270-dev.install: Makefile
154 154 @echo "$(includedir)/lib3270.h" > $@
155 155 @echo "$(includedir)/lib3270" >> $@
156 156 @echo "$(datarootdir)/@PACKAGE_NAME@/ui/99debug.xml" >> $@
157   - @echo "$(libdir)/pkgconfig/*.pc" >: $@
  157 + @echo "$(libdir)/pkgconfig/*.pc" >> $@
158 158  
159 159 #---[ Debug targets ]----------------------------------------------------------
160 160  
... ... @@ -198,7 +198,9 @@ endif
198 198 nsi: Release
199 199 ifneq ($(MAKENSIS),no)
200 200 @chmod +x makegtkruntime.sh
  201 + @echo " GEN GTK Runtime"
201 202 @./makegtkruntime.sh
  203 + @echo " GEN Windows installer"
202 204 @"$(MAKENSIS)" $(PACKAGE_NAME).nsi
203 205 endif
204 206  
... ...
po/pt_BR.po
  Diff comments   View file @932d75d
... ... @@ -5,7 +5,7 @@ msgid ""
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2012-09-17 14:31-0300\n"
  8 +"POT-Creation-Date: 2012-09-19 09:13-0300\n"
9 9 "PO-Revision-Date: 2012-09-14 14:32-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Português <perry.werneck@gmail.com>\n"
... ... @@ -87,6 +87,10 @@ msgstr &quot;Adicionar à cópia&quot;
87 87 msgid "Alert sound"
88 88 msgstr "Aviso sonoro"
89 89  
  90 +#: ui/10keypad.xml:352
  91 +msgid "Attn"
  92 +msgstr "Attn"
  93 +
90 94 #: ui/00default.xml:128
91 95 msgid "Auto-Reconnect"
92 96 msgstr "Reconectar automaticamente"
... ... @@ -107,6 +111,10 @@ msgstr &quot;Cursor piscante&quot;
107 111 msgid "Bold"
108 112 msgstr "Negrito"
109 113  
  114 +#: ui/10keypad.xml:353
  115 +msgid "Break"
  116 +msgstr "Break"
  117 +
110 118 #: telnet.c:2059
111 119 msgid "Broken pipe"
112 120 msgstr "Conexão interrompida"
... ... @@ -196,7 +204,7 @@ msgstr &quot;Conexão foi cancelada pelo servidor&quot;
196 204 msgid "Copy"
197 205 msgstr "Copiar"
198 206  
199   -#: ui/99debug.xml:299
  207 +#: ui/99debug.xml:397
200 208 msgid "Copy as HTML"
201 209 msgstr "Copiar como HTML"
202 210  
... ... @@ -212,7 +220,7 @@ msgstr &quot;Cursor mira&quot;
212 220 msgid "Cut"
213 221 msgstr "Recortar"
214 222  
215   -#: ui/99debug.xml:304
  223 +#: ui/99debug.xml:402
216 224 msgid "DS Trace"
217 225 msgstr "DS Trace"
218 226  
... ... @@ -220,11 +228,11 @@ msgstr &quot;DS Trace&quot;
220 228 msgid "Data conversion error"
221 229 msgstr "Erro na conversão de dados"
222 230  
223   -#: ui/99debug.xml:312
  231 +#: ui/99debug.xml:410
224 232 msgid "Debug"
225 233 msgstr "Depuração"
226 234  
227   -#: ui/99debug.xml:314
  235 +#: ui/99debug.xml:412
228 236 msgid "Debug window updates"
229 237 msgstr "Mostrar atualizações de janela"
230 238  
... ... @@ -256,6 +264,21 @@ msgstr &quot;Nome do servidor em branco&quot;
256 264 msgid "Empty port name"
257 265 msgstr "Porta em branco"
258 266  
  267 +#: ui/10keypad.xml:348
  268 +msgid ""
  269 +"Erase\n"
  270 +"EOF"
  271 +msgstr ""
  272 +"Erase\n"
  273 +"EOF"
  274 +
  275 +#: ui/10keypad.xml:349
  276 +#, fuzzy
  277 +msgid ""
  278 +"Erase\n"
  279 +"Input"
  280 +msgstr "Apagar campos"
  281 +
259 282 #: ui/00default.xml:80
260 283 msgid "Erase input"
261 284 msgstr "Apagar campos"
... ... @@ -302,7 +325,7 @@ msgstr &quot;Erro em ioctl(%s) ao ativar o modo não blocante&quot;
302 325 msgid "Error resolving %s: %s"
303 326 msgstr "Erro ao resolver %s: %s"
304 327  
305   -#: ui/99debug.xml:306
  328 +#: ui/99debug.xml:404
306 329 msgid "Event Trace"
307 330 msgstr "Trace de eventos"
308 331  
... ... @@ -419,6 +442,10 @@ msgstr &quot;Manter selecionado&quot;
419 442 msgid "Keyboard is locked"
420 443 msgstr "Teclado está bloqueado"
421 444  
  445 +#: ui/10keypad.xml:298
  446 +msgid "Lateral keypad"
  447 +msgstr "Lateral keypad"
  448 +
422 449 #: host.c:390
423 450 msgid "Missing ']'"
424 451 msgstr "Faltando ']'"
... ... @@ -460,6 +487,66 @@ msgstr &quot;Não está no modo 3270, transferência cancelada&quot;
460 487 msgid "Option '%c:' is not supported"
461 488 msgstr "Opção não suportada: '%c:'"
462 489  
  490 +#: ui/10keypad.xml:335
  491 +msgid "PA1"
  492 +msgstr "PA1"
  493 +
  494 +#: ui/10keypad.xml:336
  495 +msgid "PA2"
  496 +msgstr "PA2"
  497 +
  498 +#: ui/10keypad.xml:337
  499 +msgid "PA3"
  500 +msgstr "PA3"
  501 +
  502 +#: ui/10keypad.xml:300
  503 +msgid "PF1"
  504 +msgstr "PF1"
  505 +
  506 +#: ui/10keypad.xml:315
  507 +msgid "PF10"
  508 +msgstr "PF10"
  509 +
  510 +#: ui/10keypad.xml:316
  511 +msgid "PF11"
  512 +msgstr "PF11"
  513 +
  514 +#: ui/10keypad.xml:317
  515 +msgid "PF12"
  516 +msgstr "PF12"
  517 +
  518 +#: ui/10keypad.xml:301
  519 +msgid "PF2"
  520 +msgstr "PF2"
  521 +
  522 +#: ui/10keypad.xml:302
  523 +msgid "PF3"
  524 +msgstr "PF3"
  525 +
  526 +#: ui/10keypad.xml:305
  527 +msgid "PF4"
  528 +msgstr "PF4"
  529 +
  530 +#: ui/10keypad.xml:306
  531 +msgid "PF5"
  532 +msgstr "PF5"
  533 +
  534 +#: ui/10keypad.xml:307
  535 +msgid "PF6"
  536 +msgstr "PF6"
  537 +
  538 +#: ui/10keypad.xml:310
  539 +msgid "PF7"
  540 +msgstr "PF7"
  541 +
  542 +#: ui/10keypad.xml:311
  543 +msgid "PF8"
  544 +msgstr "PF8"
  545 +
  546 +#: ui/10keypad.xml:312
  547 +msgid "PF9"
  548 +msgstr "PF9"
  549 +
463 550 #: proxy.c:363
464 551 msgid "Passthru Proxy: send error"
465 552 msgstr "Passthru Proxy: Erro ao enviar"
... ... @@ -567,7 +654,7 @@ msgstr &quot;RPQ: Erro em gethostbyname&quot;
567 654 msgid "Receive file"
568 655 msgstr "Receber arquivo"
569 656  
570   -#: ui/99debug.xml:313
  657 +#: ui/99debug.xml:411
571 658 msgid "Reload buffer contents"
572 659 msgstr "Recarregar conteúdo do buffer"
573 660  
... ... @@ -579,6 +666,11 @@ msgstr &quot;Remover seleção&quot;
579 666 msgid "Reselect"
580 667 msgstr "Reselecionar"
581 668  
  669 +#: ui/10keypad.xml:345
  670 +#, fuzzy
  671 +msgid "Reset"
  672 +msgstr "Reselecionar"
  673 +
582 674 #: ui/00default.xml:123
583 675 msgid "Resize on alternate screen"
584 676 msgstr "Mudar tamanho do terminal em tela alternativa"
... ... @@ -752,7 +844,7 @@ msgstr &quot;Salvar tela&quot;
752 844 msgid "Save selected"
753 845 msgstr "Salvar seleção"
754 846  
755   -#: ui/99debug.xml:305
  847 +#: ui/99debug.xml:403
756 848 msgid "Screen Trace"
757 849 msgstr "Trace de tela"
758 850  
... ... @@ -796,7 +888,7 @@ msgstr &quot;Configurações&quot;
796 888 msgid "Show Underline"
797 889 msgstr "Mostrar sublinhado"
798 890  
799   -#: ui/99debug.xml:312
  891 +#: ui/99debug.xml:410
800 892 msgid "Show test pattern"
801 893 msgstr "Mostrar padrão de teste"
802 894  
... ... @@ -842,7 +934,7 @@ msgstr &quot;Esta versão do %s foi gerada sem suporte para conexões seguras (SSL).&quot;
842 934 msgid "Toolbar"
843 935 msgstr "Barra de ferramentas"
844 936  
845   -#: ui/99debug.xml:304
  937 +#: ui/99debug.xml:402
846 938 msgid "Trace"
847 939 msgstr "Trace"
848 940  
... ... @@ -945,7 +1037,7 @@ msgstr &quot;Unsupported socks 4 proxy&quot;
945 1037 msgid "Use +/- for field navigation"
946 1038 msgstr "Usar teclas +/- para navegar por campos"
947 1039  
948   -#: ui/99debug.xml:307
  1040 +#: ui/99debug.xml:405
949 1041 msgid "View Field Delimiters"
950 1042 msgstr "Mostrar delimitadores de campo"
951 1043  
... ...
pw3270.nsi.in
  Diff comments   View file @932d75d
... ... @@ -75,6 +75,7 @@ SubSection &quot;@PACKAGE@&quot; SecMain
75 75 CreateDirectory "$INSTDIR\ui"
76 76  
77 77 file "/oname=$INSTDIR\ui\00default.xml" "ui\00default.xml"
  78 + file "/oname=$INSTDIR\ui\10keypad.xml" "ui\10keypad.xml"
78 79  
79 80 # Locale files
80 81 CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES"
... ... @@ -149,10 +150,11 @@ Section /o &quot;Software Development Kit&quot; SecSDK
149 150 CreateDirectory "$INSTDIR\sdk"
150 151 CreateDirectory "$INSTDIR\sdk\include"
151 152 CreateDirectory "$INSTDIR\sdk\include\lib3270"
  153 + CreateDirectory "$INSTDIR\sdk\include\pw3270"
152 154  
153 155 file "/oname=$INSTDIR\sdk\include\lib3270.h" "src\include\lib3270.h"
154 156 file "/oname=$INSTDIR\sdk\include\pw3270.h" "src\include\pw3270.h"
155   - file "/oname=$INSTDIR\sdk\include\v3270.h" "src\include\v3270.h"
  157 + file "/oname=$INSTDIR\sdk\include\pw3270\v3270.h" "src\include\pw3270\v3270.h"
156 158  
157 159 file "/oname=$INSTDIR\sdk\include\lib3270\config.h" "src\include\lib3270\config.h"
158 160 file "/oname=$INSTDIR\sdk\include\lib3270\rules.mak" "src\include\rules.mak"
... ...
src/include/pw3270/hllapi.h
  Diff comments   View file @932d75d
... ... @@ -61,7 +61,12 @@ extern &quot;C&quot; {
61 61 } HLLAPI_DATA;
62 62 #pragma pack()
63 63  
  64 +#ifdef _WIN32
  65 + // http://www.mingw.org/wiki/Visual_Basic_DLL
  66 + __declspec (dllexport) int __stdcall hllapi(const unsigned long *func, char *str, unsigned short *length, unsigned short *rc);
  67 +#else
64 68 LIB3270_EXPORT int hllapi(const unsigned long *func, char *str, unsigned short *length, unsigned short *rc);
  69 +#endif // _WIN32
65 70  
66 71 #ifdef __cplusplus
67 72 } /* end of extern "C" */
... ...
src/plugins/remotectl/hllapi.c
  Diff comments   View file @932d75d
... ... @@ -143,7 +143,11 @@
143 143 return result;
144 144 }
145 145  
  146 +#ifdef _WIN32
  147 + __declspec (dllexport) int __stdcall hllapi(const unsigned long *func, char *str, unsigned short *length, unsigned short *rc)
  148 +#else
146 149 LIB3270_EXPORT int hllapi(const unsigned long *func, char *str, unsigned short *length, unsigned short *rc)
  150 +#endif // _WIN32
147 151 {
148 152 int result = 1;
149 153 char * arg;
... ...
src/pw3270/Makefile.in
  Diff comments   View file @932d75d
... ... @@ -190,6 +190,7 @@ $(DEBDIR)/pw3270.install: Makefile
190 190 @echo "$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@" >> $@
191 191 @echo "$(libdir)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@" >> $@
192 192 @echo "$(datarootdir)/$(PACKAGE_NAME)/ui/00default.xml" >> $@
  193 + @echo "$(datarootdir)/$(PACKAGE_NAME)/ui/10keypad.xml" >> $@
193 194 @echo "$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME).png" >> $@
194 195 @echo "$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME)-logo.png" >> $@
195 196  
... ...