Download as
Browse Code »

Commit 2a3185b845c956658a3db159ec3258c8fdcc50b8

Authored by Perry Werneck
1 parent cd0f450e
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

função hllapi_get_text não deve considerar as quebras de linha.

Showing 9 changed files with 85 additions and 36 deletions   Show diff stats
locale/pt_BR.po
  Diff comments   View file @2a3185b
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2017-08-07 09:47-0300\n" 8 +"POT-Creation-Date: 2017-08-10 10:12-0300\n"
9 "PO-Revision-Date: 2017-02-15 17:08-0200\n" 9 "PO-Revision-Date: 2017-02-15 17:08-0200\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Português <perry.werneck@gmail.com>\n" 11 "Language-Team: Português <perry.werneck@gmail.com>\n"
@@ -419,6 +419,11 @@ msgstr &quot;Não foi possível conectar a %s&quot; @@ -419,6 +419,11 @@ msgstr &quot;Não foi possível conectar a %s&quot;
419 msgid "Can't connect to %s:%s" 419 msgid "Can't connect to %s:%s"
420 msgstr "Não foi possível conectar a %s:%s" 420 msgstr "Não foi possível conectar a %s:%s"
421 421
  422 +#: main.c:70
  423 +#, fuzzy
  424 +msgid "Can't connect to DBUS server"
  425 +msgstr "Não foi possível conectar a %s"
  426 +
422 #: selection.c:425 427 #: selection.c:425
423 #, c-format 428 #, c-format
424 msgid "Can't convert line %d from %s to %s" 429 msgid "Can't convert line %d from %s to %s"
@@ -433,6 +438,10 @@ msgstr &quot;Recortar não permitido em seleção retangular&quot; @@ -433,6 +438,10 @@ msgstr &quot;Recortar não permitido em seleção retangular&quot;
433 msgid "Can't determine value for environment variable \"%s\" " 438 msgid "Can't determine value for environment variable \"%s\" "
434 msgstr "Não consigo determinar o valor da variável de ambiente \"%s\" " 439 msgstr "Não consigo determinar o valor da variável de ambiente \"%s\" "
435 440
  441 +#: main.c:115
  442 +msgid "Can't get DBUS object name"
  443 +msgstr ""
  444 +
436 #: ft.c:413 445 #: ft.c:413
437 msgid "Can't get file size" 446 msgid "Can't get file size"
438 msgstr "Não foi possível obter o tamanho do arquivo" 447 msgstr "Não foi possível obter o tamanho do arquivo"
@@ -654,6 +663,11 @@ msgstr &quot;Configurar host&quot; @@ -654,6 +663,11 @@ msgstr &quot;Configurar host&quot;
654 msgid "Connect on startup" 663 msgid "Connect on startup"
655 msgstr "Conectar ao iniciar" 664 msgstr "Conectar ao iniciar"
656 665
  666 +#: gobject.c:205
  667 +#, fuzzy
  668 +msgid "Connecting to host"
  669 +msgstr "Não foi possível conectar ao servidor"
  670 +
657 #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397 671 #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397
658 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477 672 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477
659 #: connect.c:573 673 #: connect.c:573
@@ -1913,6 +1927,11 @@ msgstr &quot;Iniciar transferência de arquivo&quot; @@ -1913,6 +1927,11 @@ msgstr &quot;Iniciar transferência de arquivo&quot;
1913 msgid "Starting" 1927 msgid "Starting"
1914 msgstr "Iniciando" 1928 msgstr "Iniciando"
1915 1929
  1930 +#: gobject.c:193
  1931 +#, c-format
  1932 +msgid "State %04d can't accept requests"
  1933 +msgstr ""
  1934 +
1916 #: security.c:237 1935 #: security.c:237
1917 msgid "Subject issuer mismatch" 1936 msgid "Subject issuer mismatch"
1918 msgstr "Divergência na identidade do emissor" 1937 msgstr "Divergência na identidade do emissor"
@@ -2398,6 +2417,11 @@ msgstr &quot;Valor de cor inválido ou inesperado: \&quot;%s\&quot;&quot; @@ -2398,6 +2417,11 @@ msgstr &quot;Valor de cor inválido ou inesperado: \&quot;%s\&quot;&quot;
2398 msgid "Unexpected or unknown security status" 2417 msgid "Unexpected or unknown security status"
2399 msgstr "Estado de segurança inesperado ou desconhecido." 2418 msgstr "Estado de segurança inesperado ou desconhecido."
2400 2419
  2420 +#: gobject.c:208
  2421 +#, fuzzy, c-format
  2422 +msgid "Unexpected state %04d"
  2423 +msgstr "Alvo inesperado \"%s\""
  2424 +
2401 #: actions.c:391 2425 #: actions.c:391
2402 #, c-format 2426 #, c-format
2403 msgid "Unexpected target \"%s\"" 2427 msgid "Unexpected target \"%s\""
@@ -2802,10 +2826,6 @@ msgstr &quot;translator-credits&quot; @@ -2802,10 +2826,6 @@ msgstr &quot;translator-credits&quot;
2802 #~ "32768. Valores maiores trazem maior performance, porem, nem todos os " 2826 #~ "32768. Valores maiores trazem maior performance, porem, nem todos os "
2803 #~ "hosts podem suportá-los." 2827 #~ "hosts podem suportá-los."
2804 2828
2805 -#, fuzzy  
2806 -#~ msgid "Can't connect to DBUS server"  
2807 -#~ msgstr "Não foi possível conectar a %s"  
2808 -  
2809 #~ msgid "Can't start download." 2829 #~ msgid "Can't start download."
2810 #~ msgstr "Não foi possível iniciar o download." 2830 #~ msgstr "Não foi possível iniciar o download."
2811 2831
@@ -2842,10 +2862,6 @@ msgstr &quot;translator-credits&quot; @@ -2842,10 +2862,6 @@ msgstr &quot;translator-credits&quot;
2842 #~ msgid "Complete" 2862 #~ msgid "Complete"
2843 #~ msgstr "Completo" 2863 #~ msgstr "Completo"
2844 2864
2845 -#, fuzzy  
2846 -#~ msgid "Connecting to host"  
2847 -#~ msgstr "Não foi possível conectar ao servidor"  
2848 -  
2849 #~ msgid "Copiar tudo" 2865 #~ msgid "Copiar tudo"
2850 #~ msgstr "Copiar tudo" 2866 #~ msgstr "Copiar tudo"
2851 2867
@@ -3208,10 +3224,6 @@ msgstr &quot;translator-credits&quot; @@ -3208,10 +3224,6 @@ msgstr &quot;translator-credits&quot;
3208 #~ msgid "Unexpected element <%s>" 3224 #~ msgid "Unexpected element <%s>"
3209 #~ msgstr "Elemento <%s> inesperado" 3225 #~ msgstr "Elemento <%s> inesperado"
3210 3226
3211 -#, fuzzy  
3212 -#~ msgid "Unexpected state %04d"  
3213 -#~ msgstr "Alvo inesperado \"%s\""  
3214 -  
3215 #~ msgid "" 3227 #~ msgid ""
3216 #~ "Unknown host:\n" 3228 #~ "Unknown host:\n"
3217 #~ "%s" 3229 #~ "%s"
locale/pw3270.pot
  Diff comments   View file @2a3185b
@@ -9,7 +9,7 @@ msgstr &quot;&quot; @@ -9,7 +9,7 @@ msgstr &quot;&quot;
9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 "Project-Id-Version: PACKAGE VERSION\n" 10 "Project-Id-Version: PACKAGE VERSION\n"
11 "Report-Msgid-Bugs-To: \n" 11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2017-08-09 10:33-0300\n" 12 +"POT-Creation-Date: 2017-08-10 10:12-0300\n"
13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 "Language-Team: LANGUAGE <LL@li.org>\n" 15 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot; @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 "Project-Id-Version: PACKAGE VERSION\n" 21 "Project-Id-Version: PACKAGE VERSION\n"
22 "Report-Msgid-Bugs-To: \n" 22 "Report-Msgid-Bugs-To: \n"
23 -"POT-Creation-Date: 2017-08-09 10:33-0300\n" 23 +"POT-Creation-Date: 2017-08-10 10:12-0300\n"
24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 "Language-Team: LANGUAGE <LL@li.org>\n" 26 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,6 +39,17 @@ msgstr &quot;&quot; @@ -39,6 +39,17 @@ msgstr &quot;&quot;
39 "MIME-Version: 1.0\n" 39 "MIME-Version: 1.0\n"
40 "Content-Type: text/plain; charset=CHARSET\n" 40 "Content-Type: text/plain; charset=CHARSET\n"
41 "Content-Transfer-Encoding: 8bit\n" 41 "Content-Transfer-Encoding: 8bit\n"
  42 +"#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
  43 +"Project-Id-Version: PACKAGE VERSION\n"
  44 +"Report-Msgid-Bugs-To: \n"
  45 +"POT-Creation-Date: 2017-08-10 10:12-0300\n"
  46 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  47 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  48 +"Language-Team: LANGUAGE <LL@li.org>\n"
  49 +"Language: \n"
  50 +"MIME-Version: 1.0\n"
  51 +"Content-Type: text/plain; charset=CHARSET\n"
  52 +"Content-Transfer-Encoding: 8bit\n"
42 53
43 #: window.c:329 54 #: window.c:329
44 #, c-format 55 #, c-format
@@ -424,6 +435,10 @@ msgstr &quot;&quot; @@ -424,6 +435,10 @@ msgstr &quot;&quot;
424 msgid "Can't connect to %s:%s" 435 msgid "Can't connect to %s:%s"
425 msgstr "" 436 msgstr ""
426 437
  438 +#: main.c:70
  439 +msgid "Can't connect to DBUS server"
  440 +msgstr ""
  441 +
427 #: selection.c:425 442 #: selection.c:425
428 #, c-format 443 #, c-format
429 msgid "Can't convert line %d from %s to %s" 444 msgid "Can't convert line %d from %s to %s"
@@ -438,6 +453,10 @@ msgstr &quot;&quot; @@ -438,6 +453,10 @@ msgstr &quot;&quot;
438 msgid "Can't determine value for environment variable \"%s\" " 453 msgid "Can't determine value for environment variable \"%s\" "
439 msgstr "" 454 msgstr ""
440 455
  456 +#: main.c:115
  457 +msgid "Can't get DBUS object name"
  458 +msgstr ""
  459 +
441 #: ft.c:413 460 #: ft.c:413
442 msgid "Can't get file size" 461 msgid "Can't get file size"
443 msgstr "" 462 msgstr ""
@@ -647,6 +666,10 @@ msgstr &quot;&quot; @@ -647,6 +666,10 @@ msgstr &quot;&quot;
647 msgid "Connect on startup" 666 msgid "Connect on startup"
648 msgstr "" 667 msgstr ""
649 668
  669 +#: gobject.c:205
  670 +msgid "Connecting to host"
  671 +msgstr ""
  672 +
650 #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397 673 #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397
651 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477 674 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477
652 #: connect.c:573 675 #: connect.c:573
@@ -1861,6 +1884,11 @@ msgstr &quot;&quot; @@ -1861,6 +1884,11 @@ msgstr &quot;&quot;
1861 msgid "Starting" 1884 msgid "Starting"
1862 msgstr "" 1885 msgstr ""
1863 1886
  1887 +#: gobject.c:193
  1888 +#, c-format
  1889 +msgid "State %04d can't accept requests"
  1890 +msgstr ""
  1891 +
1864 #: security.c:237 1892 #: security.c:237
1865 msgid "Subject issuer mismatch" 1893 msgid "Subject issuer mismatch"
1866 msgstr "" 1894 msgstr ""
@@ -2292,6 +2320,11 @@ msgstr &quot;&quot; @@ -2292,6 +2320,11 @@ msgstr &quot;&quot;
2292 msgid "Unexpected or unknown security status" 2320 msgid "Unexpected or unknown security status"
2293 msgstr "" 2321 msgstr ""
2294 2322
  2323 +#: gobject.c:208
  2324 +#, c-format
  2325 +msgid "Unexpected state %04d"
  2326 +msgstr ""
  2327 +
2295 #: actions.c:391 2328 #: actions.c:391
2296 #, c-format 2329 #, c-format
2297 msgid "Unexpected target \"%s\"" 2330 msgid "Unexpected target \"%s\""
src/include/pw3270cpp.h
  Diff comments   View file @2a3185b
@@ -203,7 +203,7 @@ @@ -203,7 +203,7 @@
203 string ebc2asc(string &str); 203 string ebc2asc(string &str);
204 204
205 // Get/Set/Text with charset translation 205 // Get/Set/Text with charset translation
206 - string get_string(int baddr = 0, size_t len = -1); 206 + string get_string(int baddr = 0, size_t len = -1, bool lf = false);
207 string get_string_at(int row, int col, size_t sz); 207 string get_string_at(int row, int col, size_t sz);
208 int set_string_at(int row, int col, const char *str); 208 int set_string_at(int row, int col, const char *str);
209 int cmp_string_at(int row, int col, const char *text); 209 int cmp_string_at(int row, int col, const char *text);
@@ -274,12 +274,12 @@ @@ -274,12 +274,12 @@
274 session(); 274 session();
275 275
276 // Get/Set/Test without charset translation 276 // Get/Set/Test without charset translation
277 - virtual string get_text(int baddr = 0, size_t len = 1) = 0;  
278 - virtual string get_text_at(int row, int col, size_t sz) = 0;  
279 - virtual int set_text_at(int row, int col, const char *str) = 0;  
280 - virtual int cmp_text_at(int row, int col, const char *text) = 0; 277 + virtual string get_text(int baddr = 0, size_t len = 1, bool lf = false) = 0;
  278 + virtual string get_text_at(int row, int col, size_t sz) = 0;
  279 + virtual int set_text_at(int row, int col, const char *str) = 0;
  280 + virtual int cmp_text_at(int row, int col, const char *text) = 0;
  281 + virtual int emulate_input(const char *str) = 0;
281 virtual int wait_for_text_at(int row, int col, const char *key, int timeout); 282 virtual int wait_for_text_at(int row, int col, const char *key, int timeout);
282 - virtual int emulate_input(const char *str) = 0;  
283 283
284 private: 284 private:
285 285
src/libpw3270cpp/local.cc
  Diff comments   View file @2a3185b
@@ -377,10 +377,10 @@ @@ -377,10 +377,10 @@
377 return _cmp_text_at(hSession,row,col,text); 377 return _cmp_text_at(hSession,row,col,text);
378 } 378 }
379 379
380 - string get_text(int offset, size_t len) 380 + string get_text(int offset, size_t len, bool lf)
381 { 381 {
382 string rc; 382 string rc;
383 - char * ptr = _get_text(hSession,offset,len,'\n'); 383 + char * ptr = _get_text(hSession,offset,len,lf ? '\n' : 0);
384 384
385 if(ptr) 385 if(ptr)
386 { 386 {
src/libpw3270cpp/remote.cc
  Diff comments   View file @2a3185b
@@ -1148,18 +1148,18 @@ @@ -1148,18 +1148,18 @@
1148 return ETIMEDOUT; 1148 return ETIMEDOUT;
1149 } 1149 }
1150 1150
1151 - string get_text(int baddr, size_t len) 1151 + string get_text(int baddr, size_t len, bool lf)
1152 { 1152 {
1153 #if defined(WIN32) 1153 #if defined(WIN32)
1154 1154
1155 - struct hllapi_packet_query_offset query = { HLLAPI_PACKET_GET_TEXT_AT_OFFSET, (unsigned short) baddr, (unsigned short) len, '\n' }; 1155 + struct hllapi_packet_query_offset query = { HLLAPI_PACKET_GET_TEXT_AT_OFFSET, (unsigned short) baddr, (unsigned short) len, lf ? '\n' : 0 };
1156 return query_string(&query,sizeof(query),len); 1156 return query_string(&query,sizeof(query),len);
1157 1157
1158 #elif defined(HAVE_DBUS) 1158 #elif defined(HAVE_DBUS)
1159 1159
1160 dbus_int32_t b = (dbus_int32_t) baddr; 1160 dbus_int32_t b = (dbus_int32_t) baddr;
1161 dbus_int32_t l = (dbus_int32_t) len; 1161 dbus_int32_t l = (dbus_int32_t) len;
1162 - unsigned char d = '\n'; 1162 + unsigned char d = lf ? '\n' : 0;
1163 1163
1164 DBusMessage * msg = create_message("getText"); 1164 DBusMessage * msg = create_message("getText");
1165 if(!msg) 1165 if(!msg)
src/libpw3270cpp/service.cc
  Diff comments   View file @2a3185b
@@ -198,15 +198,17 @@ @@ -198,15 +198,17 @@
198 198
199 protected: 199 protected:
200 200
201 - virtual string get_text(int baddr = 0, size_t len = 1) 201 + virtual string get_text(int baddr = 0, size_t len = 1, bool lf = true)
202 { 202 {
203 - dbus_int32_t a = (dbus_int32_t) baddr;  
204 - dbus_int32_t s = (dbus_int32_t) len; 203 + dbus_int32_t a = (dbus_int32_t) baddr;
  204 + dbus_int32_t s = (dbus_int32_t) len;
  205 + char c = lf ? '\n' : 0;
205 206
206 return getString( "getText", 207 return getString( "getText",
207 DBUS_TYPE_STRING, &this->id, 208 DBUS_TYPE_STRING, &this->id,
208 - DBUS_TYPE_INT32, &a,  
209 - DBUS_TYPE_INT32, &s, 209 + DBUS_TYPE_INT32, &a,
  210 + DBUS_TYPE_INT32, &s,
  211 + DBUS_TYPE_BYTE, &c,
210 DBUS_TYPE_INVALID); 212 DBUS_TYPE_INVALID);
211 213
212 } 214 }
src/libpw3270cpp/session.cc
  Diff comments   View file @2a3185b
@@ -588,9 +588,9 @@ @@ -588,9 +588,9 @@
588 return wait_for_text_at(row,col,get_3270_text(key).c_str(),timeout); 588 return wait_for_text_at(row,col,get_3270_text(key).c_str(),timeout);
589 } 589 }
590 590
591 - string session::get_string(int baddr, size_t len) 591 + string session::get_string(int baddr, size_t len, bool lf)
592 { 592 {
593 - return get_local_text(get_text(baddr,len).c_str()); 593 + return get_local_text(get_text(baddr,len,lf).c_str());
594 } 594 }
595 595
596 string session::asc2ebc(string &str) 596 string session::asc2ebc(string &str)
src/plugins/hllapi/calls.cc
  Diff comments   View file @2a3185b
@@ -318,8 +318,9 @@ @@ -318,8 +318,9 @@
318 return HLLAPI_STATUS_DISCONNECTED; 318 return HLLAPI_STATUS_DISCONNECTED;
319 } 319 }
320 320
321 - if(!(buffer && *buffer))  
322 - return rc; 321 + if(!(buffer && *buffer)) {
  322 + return HLLAPI_STATUS_BAD_PARAMETER;
  323 + }
323 324
324 try 325 try
325 { 326 {
@@ -336,7 +337,7 @@ @@ -336,7 +337,7 @@
336 337
337 memset(buffer,' ',szBuffer); 338 memset(buffer,' ',szBuffer);
338 339
339 - string str = session::get_default()->get_string(offset,szBuffer); 340 + string str = session::get_default()->get_string(offset,szBuffer,false);
340 strncpy(buffer,str.c_str(),szBuffer); 341 strncpy(buffer,str.c_str(),szBuffer);
341 rc = HLLAPI_STATUS_SUCCESS; 342 rc = HLLAPI_STATUS_SUCCESS;
342 } 343 }
src/plugins/hllapi/hllapi.cbp
  Diff comments   View file @2a3185b
@@ -64,6 +64,7 @@ @@ -64,6 +64,7 @@
64 </Compiler> 64 </Compiler>
65 <Unit filename="../../include/lib3270.h" /> 65 <Unit filename="../../include/lib3270.h" />
66 <Unit filename="../../include/pw3270/hllapi.h" /> 66 <Unit filename="../../include/pw3270/hllapi.h" />
  67 + <Unit filename="../../include/pw3270cpp.h" />
67 <Unit filename="Makefile.in" /> 68 <Unit filename="Makefile.in" />
68 <Unit filename="calls.cc" /> 69 <Unit filename="calls.cc" />
69 <Unit filename="client.h" /> 70 <Unit filename="client.h" />