From 06558910cdd1834e4e55a664cf8a2dbb1271d104 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 5 Apr 2018 14:38:38 -0300 Subject: [PATCH] Modificando tratamento do clipboard em windows para identificar falha no processo de "paste" --- locale/pt_BR.po | 42 +++++++++++++++--------------------------- locale/pw3270.pot | 241 ++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/pw3270/v3270/selection.c | 51 +++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 60 insertions(+), 274 deletions(-) diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 4a5b08a..1277645 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" +"POT-Creation-Date: 2018-04-05 14:19-0300\n" "PO-Revision-Date: 2018-01-15 13:50-0200\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português \n" @@ -419,12 +419,7 @@ msgstr "Não foi possível conectar a %s" 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 +#: selection.c:466 #, c-format msgid "Can't convert line %d from %s to %s" msgstr "Não foi possível converter a linha %d de %s para %s" @@ -438,10 +433,6 @@ msgstr "Recortar não permitido em seleção retangular" 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" @@ -636,7 +627,7 @@ msgstr "Certificado revogado" msgid "Certificate signature failure" msgstr "Falha na assinatura do certificado" -#: tools.c:310 selection.c:427 +#: tools.c:310 selection.c:468 msgid "Charset error" msgstr "Erro de codificação de caracteres" @@ -676,11 +667,6 @@ msgstr "Configurar host" 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 @@ -1956,11 +1942,6 @@ msgstr "Iniciar transferência de arquivo" 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" @@ -2450,11 +2431,6 @@ msgstr "Valor de cor inválido ou inesperado: \"%s\"" 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\"" @@ -2859,6 +2835,10 @@ msgstr "translator-credits" #~ "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." @@ -2895,6 +2875,10 @@ msgstr "translator-credits" #~ msgid "Complete" #~ msgstr "Completo" +#, fuzzy +#~ msgid "Connecting to host" +#~ msgstr "Não foi possível conectar ao servidor" + #~ msgid "Copiar tudo" #~ msgstr "Copiar tudo" @@ -3257,6 +3241,10 @@ msgstr "translator-credits" #~ msgid "Unexpected element <%s>" #~ msgstr "Elemento <%s> inesperado" +#, fuzzy +#~ msgid "Unexpected state %04d" +#~ msgstr "Alvo inesperado \"%s\"" + #~ msgid "" #~ "Unknown host:\n" #~ "%s" diff --git a/locale/pw3270.pot b/locale/pw3270.pot index 2a94746..11a7ff2 100644 --- a/locale/pw3270.pot +++ b/locale/pw3270.pot @@ -9,7 +9,7 @@ msgstr "" "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" +"POT-Creation-Date: 2018-04-05 14:19-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,209 +18,9 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" -"#-#-#-#-# window.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# actions.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# dialog.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# print.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# colors.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# tools.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# plugin.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# trace.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# main.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# v3270.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# uiparser.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# v3270ft.pot (PACKAGE VERSION) #-#-#-#-#\n" -"#-#-#-#-# load.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# select.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# transfer.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:10-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# v3270ftprogress.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:11-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# save.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:11-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# set.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:11-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# v3270ft.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:11-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# tables.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-21 10:11-0300\n" +"POT-Creation-Date: 2018-04-05 14:19-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -239,17 +39,6 @@ msgstr "" "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: 2018-02-21 10:11-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \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 @@ -635,11 +424,7 @@ msgstr "" msgid "Can't connect to %s:%s" msgstr "" -#: main.c:70 -msgid "Can't connect to DBUS server" -msgstr "" - -#: selection.c:425 +#: selection.c:466 #, c-format msgid "Can't convert line %d from %s to %s" msgstr "" @@ -653,10 +438,6 @@ msgstr "" 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 "" @@ -839,7 +620,7 @@ msgstr "" msgid "Certificate signature failure" msgstr "" -#: tools.c:310 selection.c:427 +#: tools.c:310 selection.c:468 msgid "Charset error" msgstr "" @@ -879,10 +660,6 @@ msgstr "" 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 @@ -2113,11 +1890,6 @@ msgstr "" msgid "Starting" msgstr "" -#: gobject.c:193 -#, c-format -msgid "State %04d can't accept requests" -msgstr "" - #: security.c:237 msgid "Subject issuer mismatch" msgstr "" @@ -2553,11 +2325,6 @@ msgstr "" 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\"" diff --git a/src/pw3270/v3270/selection.c b/src/pw3270/v3270/selection.c index d2d836e..d636bbf 100644 --- a/src/pw3270/v3270/selection.c +++ b/src/pw3270/v3270/selection.c @@ -346,6 +346,47 @@ void v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode, gboolean cut) update_system_clipboard(widget); } +#ifdef _WIN32 + +void v3270_paste(GtkWidget *widget) +{ + HGLOBAL hglb; + + if (!IsClipboardFormatAvailable(CF_TEXT)) + return; + + if (!OpenClipboard(NULL)) + return; + + hglb = GetClipboardData(CF_TEXT); + if (hglb != NULL) + { + LPTSTR lptstr = GlobalLock(hglb); + if (lptstr != NULL) + { + v3270_paste_string(widget,lptstr,"CP1252"); + GlobalUnlock(hglb); + } + } + + CloseClipboard(); + +} + +#else + +static void text_received(GtkClipboard *clipboard, const gchar *text, GtkWidget *widget) +{ + v3270_paste_string(widget,text,"UTF-8"); +} + +void v3270_paste(GtkWidget *widget) +{ + gtk_clipboard_request_text(gtk_widget_get_clipboard(widget,GDK_SELECTION_CLIPBOARD),(GtkClipboardTextReceivedFunc) text_received,(gpointer) widget); +} + +#endif // _WIN32 + void v3270_paste_string(GtkWidget *widget, const gchar *text, const gchar *encoding) { gchar * buffer = NULL; @@ -472,16 +513,6 @@ void v3270_paste_string(GtkWidget *widget, const gchar *text, const gchar *encod } -static void text_received(GtkClipboard *clipboard, const gchar *text, GtkWidget *widget) -{ - v3270_paste_string(widget,text,"UTF-8"); -} - -void v3270_paste(GtkWidget *widget) -{ - gtk_clipboard_request_text(gtk_widget_get_clipboard(widget,GDK_SELECTION_CLIPBOARD),(GtkClipboardTextReceivedFunc) text_received,(gpointer) widget); -} - void v3270_unselect(GtkWidget *widget) { v3270_disable_updates(widget); -- libgit2 0.21.2