Merge branch 'develop'

Perry Werneck
2 parents 0f3ebf1c b71485a6
Showing 38 changed files with 1238 additions and 593 deletions Show diff stats
locale/pt_BR.po
src/dialogs/popups.c
src/dialogs/save/save.c
src/dialogs/settings/accelerator.c
src/dialogs/settings/clipboard.c
src/dialogs/settings/host.c
src/include/clipboard.h
src/include/internals.h
src/include/terminal.h
src/include/v3270.h
src/include/v3270/settings.h
src/selection/linux/copy.c
src/selection/linux/paste.c
src/selection/pixbuf.c
src/selection/selection.c
src/selection/windows/copy.c
src/terminal/actions/action.c
src/terminal/actions/table.c
src/terminal/actions/toggle.c
src/terminal/callbacks.c
@@ -5,8 +5,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-03 12:42-0300\n"
-"PO-Revision-Date: 2020-07-03 15:04-0300\n"
+"POT-Creation-Date: 2020-08-03 15:22-0300\n"
+"PO-Revision-Date: 2020-08-03 15:26-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <>\n"
 "Language: pt_BR\n"
@@ -59,15 +59,15 @@ msgstr &quot;_Adicionar ao arquivo&quot;
 msgid "About security"
 msgstr "Sobre a segurança"
-#: src/dialogs/settings/accelerator.c:191
+#: src/dialogs/settings/accelerator.c:196
 msgid "Accelerator"
 msgstr "Atalho"
-#: src/dialogs/settings/accelerator.c:329
+#: src/dialogs/settings/accelerator.c:334
 msgid "Accelerator is in use"
 msgstr "Atalho está em uso"
-#: src/dialogs/settings/accelerator.c:240
+#: src/dialogs/settings/accelerator.c:245
 msgid "Accelerators"
 msgstr "Atalhos"
@@ -88,7 +88,7 @@ msgstr &quot;Adicionar à cópia&quot;
 msgid "Address or name of the host to connect."
 msgstr "Endereço ou nome do host a conectar."
-#: src/dialogs/settings/accelerator.c:201
+#: src/dialogs/settings/accelerator.c:206
 msgid "Alternative"
 msgstr "Alternativa"
@@ -120,7 +120,7 @@ msgstr &quot;Adiciona seleção na área de transferência&quot;
 msgid "Appends the source file to the destination file."
 msgstr "Adiciona conteúdo do arquivo origem ao final do arquivo destino."
-#: src/dialogs/settings/accelerator.c:311
+#: src/dialogs/settings/accelerator.c:316
 #, c-format
 msgid "Assign it to action (<b>%s</b>)?"
 msgstr "Associar com a ação (<b>%s</b>)?"
@@ -162,7 +162,7 @@ msgstr &quot;Azul&quot;
 msgid "Bold"
 msgstr "Negrito"
-#: src/dialogs/load.c:181 src/dialogs/save/save.c:216
+#: src/dialogs/load.c:181 src/dialogs/save/save.c:268
 msgid "C_haracter Coding"
 msgstr "C_odificação de caracteres"
@@ -202,7 +202,7 @@ msgstr &quot;Erro ao converter valor do cgcsid&quot;
 msgid "Can't parse character value"
 msgstr "Erro ao analisar valor de caractere"
-#: src/selection/windows/paste.c:79 src/selection/windows/paste.c:119
+#: src/selection/linux/paste.c:81 src/selection/linux/paste.c:115
 msgid "Can't paste"
 msgstr "Não é possivel colar"
@@ -211,7 +211,7 @@ msgid &quot;Can&#39;t paste text&quot;
 msgstr "Não é possível colar texto"
 #: src/filetransfer/save.c:117 src/filetransfer/activitylist.c:436
-#: src/trace/trace.c:486 src/dialogs/transfer.c:91 src/dialogs/save/save.c:461
+#: src/trace/trace.c:486 src/dialogs/transfer.c:91 src/dialogs/save/save.c:627
 #, c-format
 msgid "Can't save %s"
 msgstr "Não foi possível salvar arquivo %s"
@@ -220,7 +220,7 @@ msgstr &quot;Não foi possível salvar arquivo %s&quot;
 msgid "Can't set callback table"
 msgstr "Não foi possível setar a tabela de retornos"
-#: src/terminal/iocallback.c:199
+#: src/terminal/iocallback.c:200
 msgid "Can't set lib3270 I/O controller"
 msgstr "Não foi possível registrar manipuladores de I/O 3270"
@@ -228,25 +228,21 @@ msgstr &quot;Não foi possível registrar manipuladores de I/O 3270&quot;
 msgid "Can't start file transfer session"
 msgstr "Não foi possível iniciar transferência de arquivo"
-#: src/terminal/callbacks.c:396 src/filetransfer/v3270ftprogress.c:433
-#: src/filetransfer/transfer.c:89 src/dialogs/load.c:111
-#: src/dialogs/save/save.c:136 src/dialogs/settings/host.c:401
+#: src/filetransfer/v3270ftprogress.c:433 src/filetransfer/transfer.c:89
+#: src/dialogs/load.c:111 src/dialogs/save/save.c:117
+#: src/dialogs/settings/host.c:401
 msgid "Cancel"
-msgstr "_Cancelar"
+msgstr "Cancelar"
 #: src/filetransfer/transfer.c:90
 msgid "Cancel transfer operation."
 msgstr "Cancelar transferência"
-#: src/dialogs/settings/host.c:546
-msgid "Check for SSL secure connection."
-msgstr "Marcar para ativar a conexão segura via SSL."
-
 #: src/filetransfer/tables.c:44
 msgid "Check this if the file consists of character data only."
 msgstr "Marque se o arquivo contem apenas texto."
-#: src/dialogs/load.c:206 src/dialogs/save/save.c:268
+#: src/dialogs/load.c:206 src/dialogs/save/save.c:343
 msgid "Click to cancel operation"
 msgstr "Clique para cancelar operação"
@@ -254,11 +250,11 @@ msgstr &quot;Clique para cancelar operação&quot;
 msgid "Click to load file"
 msgstr "Clique para carregar arquivo"
-#: src/dialogs/save/save.c:273
+#: src/dialogs/save/save.c:348
 msgid "Click to save file"
 msgstr "Clique para salvar arquivo"
-#: src/dialogs/settings/clipboard.c:409
+#: src/dialogs/settings/clipboard.c:420
 msgid "Clipboard"
 msgstr "Área de transferência"
@@ -266,7 +262,7 @@ msgstr &quot;Área de transferência&quot;
 msgid "Clipboard name"
 msgstr "Nome da área de transferência"
-#: src/dialogs/settings/clipboard.c:408
+#: src/dialogs/settings/clipboard.c:419
 msgid "Clipboard properties"
 msgstr "Configuração da área de transferência"
@@ -302,10 +298,6 @@ msgstr &quot;Comando a executar&quot;
 msgid "Connection"
 msgstr "Conexão"
-#: src/terminal/callbacks.c:397
-msgid "Continue"
-msgstr "Continuar"
-
 #: src/terminal/actions/table.c:64 src/terminal/actions/table.c:87
 msgid "Copy"
 msgstr "Copiar"
@@ -318,7 +310,7 @@ msgstr &quot;Copiar como texto puro&quot;
 msgid "Copy as table"
 msgstr "Copiar como tabela"
-#: src/dialogs/settings/clipboard.c:239
+#: src/dialogs/settings/clipboard.c:250
 msgid "Copy options"
 msgstr "Opções da cópia"
@@ -405,7 +397,7 @@ msgstr &quot;Turquesa Escuro&quot;
 msgid "Default"
 msgstr "Padrão"
-#: src/dialogs/popups.c:149
+#: src/dialogs/popups.c:132
 msgid "Don't ask again"
 msgstr "Não perguntar de novo"
@@ -425,14 +417,14 @@ msgstr &quot;Emulação&quot;
 msgid "Enabled"
 msgstr "Habilitado"
-#: src/dialogs/popups.c:56 src/dialogs/popups.c:85
-msgid "Error"
-msgstr "Erro"
-
 #: src/dialogs/print/print.c:72
 msgid "Error on print operation"
 msgstr "Erro na operação de impressão"
+#: src/dialogs/save/save.c:579
+msgid "Error saving image"
+msgstr "Erro ao salvar imagem"
+
 #: src/filetransfer/tables.c:224
 msgid "Estimated transfer arrival"
 msgstr "Tempo estimado para a transferência"
@@ -441,7 +433,7 @@ msgstr &quot;Tempo estimado para a transferência&quot;
 msgid "Field colors"
 msgstr "Cor dos campos"
-#: src/dialogs/save/save.c:230
+#: src/dialogs/save/save.c:282
 msgid "File _Format"
 msgstr "_Formato do arquivo"
@@ -524,15 +516,15 @@ msgstr &quot;Cinza&quot;
 msgid "Green"
 msgstr "Verde"
-#: src/dialogs/settings/clipboard.c:241
+#: src/dialogs/settings/clipboard.c:252
 msgid "HTML options"
 msgstr "Opções HTML"
-#: src/dialogs/settings/host.c:635
+#: src/dialogs/settings/host.c:664
 msgid "Host"
 msgstr "Servidor"
-#: src/dialogs/settings/host.c:634
+#: src/dialogs/settings/host.c:663
 msgid "Host settings"
 msgstr "Configurações do servidor"
@@ -568,6 +560,10 @@ msgstr &quot;Ignore&quot;
 msgid "Ignore the fail and remove the file from queue."
 msgstr "Ignore the fail and remove the file from queue."
+#: src/dialogs/settings/clipboard.c:173
+msgid "Image copy"
+msgstr "Copiar imagem"
+
 #: src/terminal/actions/table.c:196
 msgid "Increase the font size"
 msgstr "Aumenta o tamanho da fonte"
@@ -588,10 +584,14 @@ msgstr &quot;Intensificado/Protegido&quot;
 msgid "Intensified/Unprotected"
 msgstr "Intensificado/Desprotegido"
-#: src/terminal/callbacks.c:424
-msgid "Invalid callback table, possible version mismatch in lib3270"
+#: src/terminal/callbacks.c:463
+#, c-format
+msgid ""
+"Invalid callback table, the release %s of lib%s can't be used (expecting "
+"revision %s)"
 msgstr ""
-"Tabela de callbacks inválida, possível divergência de versão na lib3270"
+"Tabela de callbacks inválida, a revisão %s da lib%s não pode ser usada "
+"(esperando a revisão %s)"
 #: src/terminal/charset.c:132
 msgid "Invalid cgcsgid value"
@@ -605,8 +605,8 @@ msgstr &quot;Escopo de mapeamento inválido&quot;
 msgid "Invalid state"
 msgstr "Estado inválido"
-#: src/dialogs/settings/accelerator.c:145
-#: src/dialogs/settings/accelerator.c:239
+#: src/dialogs/settings/accelerator.c:150
+#: src/dialogs/settings/accelerator.c:244
 msgid "Keyboard accelerators"
 msgstr "Atalhos de teclado"
@@ -662,7 +662,7 @@ msgstr &quot;Monocromático&quot;
 msgid "Mustard"
 msgstr "Mostarda"
-#: src/dialogs/settings/accelerator.c:153
+#: src/dialogs/settings/accelerator.c:158
 msgid "Name"
 msgstr "Nome"
@@ -678,7 +678,7 @@ msgstr &quot;Próxima página&quot;
 msgid "No active transfer"
 msgstr "Nenhuma transferência ativa"
-#: src/terminal/properties/get.c:198
+#: src/terminal/properties/get.c:205
 msgid "No host defined"
 msgstr "Nenhum servidor definido"
@@ -694,14 +694,18 @@ msgstr &quot;Nenhuma transferência&quot;
 msgid "No transfer in progress"
 msgstr "Nenhuma transferência em andamento"
-#: src/dialogs/settings/clipboard.c:306
+#: src/dialogs/settings/clipboard.c:317
 msgid "None (Don't export color)"
 msgstr "Nenhum (Não exporta cores)"
-#: src/dialogs/settings/clipboard.c:426
+#: src/dialogs/settings/clipboard.c:437
 msgid "None (Don't export font name)"
 msgstr "Nenhuma (Não exporta fontes)"
+#: src/selection/linux/paste.c:117
+msgid "None of the screens in the clipboard match with the current one."
+msgstr "Nenhuma das telas da área de transferência corresponde à atual."
+
 #: src/dialogs/settings/colors.c:174
 msgid "Normal/Protected"
 msgstr "Normal/Protegido"
@@ -710,7 +714,7 @@ msgstr &quot;Normal/Protegido&quot;
 msgid "Normal/Unprotected"
 msgstr "Normal/Desprotegido"
-#: src/selection/windows/paste.c:75
+#: src/selection/linux/paste.c:77
 msgid "Not the same terminal type"
 msgstr "O tipo de terminal é diferente"
@@ -742,10 +746,6 @@ msgstr &quot;Estado normal na OIA&quot;
 msgid "Open"
 msgstr "Abrir"
-#: src/dialogs/popups.c:116
-msgid "Operation failed"
-msgstr "Operação falhou"
-
 #: src/dialogs/save/convenience.c:65 src/dialogs/save/convenience.c:93
 msgid "Operation has failed"
 msgstr "Operação falhou"
@@ -802,7 +802,7 @@ msgstr &quot;Colar de um arquivo&quot;
 msgid "Paste from text file"
 msgstr "Colar de um arquivo texto"
-#: src/dialogs/settings/clipboard.c:240
+#: src/dialogs/settings/clipboard.c:251
 msgid "Paste options"
 msgstr "Opções para colar"
@@ -830,7 +830,7 @@ msgstr &quot;Rosa&quot;
 msgid "Plain text"
 msgstr "Texto puro"
-#: src/dialogs/settings/clipboard.c:374
+#: src/dialogs/settings/clipboard.c:385
 msgid "Plain text only"
 msgstr "Apenas texto puro"
@@ -938,7 +938,7 @@ msgstr &quot;Formato de registro&quot;
 msgid "Red"
 msgstr "Vermelho"
-#: src/dialogs/settings/accelerator.c:454
+#: src/dialogs/settings/accelerator.c:459
 msgid "Rejected by action"
 msgstr "Rejeitado pela ação"
@@ -987,7 +987,11 @@ msgstr &quot;&quot;
 "SPACE can be specified in units of TRACKS, CYLINDERS, or AVBLOCK, and only "
 "one option can be used."
-#: src/dialogs/settings/clipboard.c:307 src/dialogs/settings/clipboard.c:427
+#: src/dialogs/settings/host.c:560
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#: src/dialogs/settings/clipboard.c:318 src/dialogs/settings/clipboard.c:438
 msgid "Same of the screen"
 msgstr "Igual ao terminal"
@@ -1009,7 +1013,7 @@ msgstr &quot;Salvar _Como&quot;
 msgid "Save all"
 msgstr "Salvar tela"
-#: src/terminal/actions/table.c:262 src/dialogs/save/save.c:302
+#: src/terminal/actions/table.c:262 src/dialogs/save/save.c:377
 msgid "Save copy"
 msgstr "Salvar cópia"
@@ -1029,11 +1033,11 @@ msgstr &quot;Salvar tela ou seleção&quot;
 msgid "Save selected"
 msgstr "Salvar seleção"
-#: src/terminal/actions/table.c:253 src/dialogs/save/save.c:301
+#: src/terminal/actions/table.c:253 src/dialogs/save/save.c:376
 msgid "Save selected area"
 msgstr "Salvar área selecionada"
-#: src/dialogs/save/save.c:300
+#: src/dialogs/save/save.c:375
 msgid "Save terminal contents"
 msgstr "Salvar conteúdo da tela"
@@ -1061,7 +1065,7 @@ msgstr &quot;Guarda fila de transferência num arquivo XML externo&quot;
 msgid "Save transfer queue to file"
 msgstr "Salvar fila de transferências para arquivo"
-#: src/dialogs/settings/clipboard.c:375
+#: src/dialogs/settings/clipboard.c:386
 msgid "Screen with terminal attributes"
 msgstr "Completa incluindo atributos do terminal"
@@ -1086,7 +1090,7 @@ msgid &quot;Secondary space&quot;
 msgstr "Secondary space"
 #: src/filetransfer/v3270ft.c:303 src/filetransfer/settings.c:209
-#: src/dialogs/save/save.c:114 src/dialogs/save/save.c:137
+#: src/dialogs/save/save.c:98 src/dialogs/save/save.c:118
 #: src/dialogs/settings/host.c:402
 msgid "Select"
 msgstr "Selecionar"
@@ -1099,13 +1103,13 @@ msgstr &quot;Selecionar arquivo com mapeamento personalizado&quot;
 msgid "Select custom charset mapping"
 msgstr "Seleciona mapeamento de teclado personalizado"
-#: src/dialogs/save/save.c:113 src/dialogs/save/save.c:133
+#: src/dialogs/save/save.c:97 src/dialogs/save/save.c:114
 msgid "Select destination file"
 msgstr "Selecionar arquivo destino"
 #: src/filetransfer/v3270ft.c:591 src/filetransfer/settings.c:467
 #: src/dialogs/load.c:92 src/dialogs/load.c:108 src/dialogs/load.c:171
-#: src/dialogs/save/save.c:205
+#: src/dialogs/save/save.c:258
 msgid "Select file"
 msgstr "Selecionar arquivo"
@@ -1245,7 +1249,7 @@ msgstr &quot;Tipo de situação&quot;
 msgid "State of the dynamic font spacing"
 msgstr "Estado do espaçamento dinâmico"
-#: src/dialogs/settings/accelerator.c:171
+#: src/dialogs/settings/accelerator.c:176
 msgid "Summary"
 msgstr "Sumário"
@@ -1288,11 +1292,11 @@ msgstr &quot;&quot;
 "has been reached, or the maximum number of data blocks per file (16060) has "
 "been reached."
-#: src/dialogs/settings/host.c:616
+#: src/dialogs/settings/host.c:645
 msgid "The EBCDIC host character set. "
 msgstr "A tabela de caracteres EBCDIC."
-#: src/dialogs/settings/accelerator.c:450
+#: src/dialogs/settings/accelerator.c:455
 #, c-format
 msgid "The action \"%s\" can't manage alternative keys"
 msgstr "A ação \"%s\" não permite uso de atalho alternativo"
@@ -1313,12 +1317,7 @@ msgstr &quot;&quot;
 "Tabela de callbacks para transferência de arquivos inválida, possível "
 "divergência de versão na lib3270"
-#: src/terminal/callbacks.c:391
-#, c-format
-msgid "The error code was %d"
-msgstr "O código de erro foi %d"
-
-#: src/dialogs/save/save.c:415
+#: src/dialogs/save/save.c:425
 #, c-format
 msgid "The file \"%s\" already exists. Replace it?"
 msgstr "O arquivo \"%s\" já existe, substituir?"
@@ -1377,12 +1376,12 @@ msgstr &quot;Operação de impressão está em andamento&quot;
 msgid "The print settings should be stored."
 msgstr "Configuração de impressão deve ser armazenada"
-#: src/dialogs/settings/accelerator.c:304
+#: src/dialogs/settings/accelerator.c:309
 #, c-format
 msgid "The selected accelerator is in use by action <b>%s</b> (<b>%s</b>)"
 msgstr "O atalho selecionado está em uso pela ação <b>%s</b> (<b>%s</b>)"
-#: src/dialogs/settings/accelerator.c:324
+#: src/dialogs/settings/accelerator.c:329
 msgid "The selected accelerator is in use by the same action"
 msgstr "O atalho selecionado está em uso na mesma ação"
@@ -1464,10 +1463,14 @@ msgstr &quot;Fila de transferências&quot;
 msgid "Transfer speed"
 msgstr "Velocidade de transferência"
-#: src/terminal/properties/init.c:250
+#: src/terminal/properties/init.c:249
 msgid "True if the terminal has copy blocks"
 msgstr "Verdadeiro se o terminal tiver blocos copiados"
+#: src/terminal/properties/init.c:264
+msgid "True if the timer indicator is active"
+msgstr "Verdadeiro se indicador de tempo estiver ativo"
+
 #: src/filetransfer/transfer.c:84
 msgid "Try again with the same file."
 msgstr "Tente de novo com o mesmo arquivo."
@@ -1480,20 +1483,25 @@ msgstr &quot;Turquesa&quot;
 msgid "UTF-8"
 msgstr "UTF-8"
-#: src/selection/windows/paste.c:115
-msgid "Unable to paste formatted data"
-msgstr "Incapaz de colar tela formatada."
+#: src/selection/linux/paste.c:116
+msgid "Unable to paste formatted data."
+msgstr "Incapaz de colar dados formatados."
 #: src/filetransfer/tables.c:92
 msgid "Undefined"
 msgstr "Indefinido"
-#: src/dialogs/save/save.c:400
+#: src/terminal/callbacks.c:472
+#, c-format
+msgid "Unexpected callback table, the release %s of lib%s is invalid"
+msgstr "Tabela de callbacks inesperada, a revisão %s da lib%s é inválida"
+
+#: src/dialogs/save/save.c:495
 #, c-format
 msgid "Unexpected format %d"
 msgstr "Formato inesperado %d"
-#: src/dialogs/save/save.c:370
+#: src/dialogs/save/save.c:463 src/dialogs/save/save.c:559
 #, c-format
 msgid "Unexpected mode %d"
 msgstr "Modo inesperado %d"
@@ -1503,7 +1511,11 @@ msgstr &quot;Modo inesperado %d&quot;
 msgid "Unexpected status %d in print operation"
 msgstr "Estado inesperado %d na operação de impressão"
-#: src/dialogs/windows/select.c:169 src/dialogs/save/save.c:149
+#: src/dialogs/settings/host.c:559
+msgid "Unsecure"
+msgstr "Insegura"
+
+#: src/dialogs/save/save.c:130
 msgid "Untitled document"
 msgstr "Documento sem título"
@@ -1524,6 +1536,10 @@ msgstr &quot;Variável&quot;
 msgid "Western Europe (ISO 8859-1)"
 msgstr "Europa ocidental (ISO 8859-1)"
+#: src/dialogs/settings/clipboard.c:174
+msgid "When set allow image formats on clipboard"
+msgstr "Quando ativo permite imagens na área de transferência"
+
 #: src/dialogs/settings/clipboard.c:154
 msgid ""
 "When set search clipboard for a similar screen, if found paste unprotected "
@@ -1705,20 +1721,21 @@ msgstr &quot;Texto _ASCII&quot;
 msgid "_Apply"
 msgstr "_Aplicar"
-#: src/selection/windows/paste.c:83 src/selection/windows/paste.c:123
-#: src/dialogs/load.c:205 src/dialogs/load.c:224
-#: src/dialogs/windows/select.c:158 src/dialogs/print/settingsdialog.c:410
-#: src/dialogs/print/settingsdialog.c:429 src/dialogs/save/save.c:267
-#: src/dialogs/save/save.c:286 src/dialogs/settings/dialog.c:231
+#: src/selection/linux/paste.c:85 src/dialogs/popups.c:157
+#: src/dialogs/load.c:205 src/dialogs/load.c:224 src/dialogs/linux/select.c:51
+#: src/dialogs/linux/select.c:77 src/dialogs/print/settingsdialog.c:410
+#: src/dialogs/print/settingsdialog.c:429 src/dialogs/save/save.c:342
+#: src/dialogs/save/save.c:361 src/dialogs/settings/dialog.c:231
 msgid "_Cancel"
 msgstr "_Cancelar"
-#: src/dialogs/settings/host.c:615
+#: src/dialogs/settings/host.c:644
 msgid "_Charset"
 msgstr "Tabela de _Caracteres"
 #: src/trace/tracewindow.c:125 src/dialogs/transfer.c:163
 #: src/dialogs/transfer.c:183 src/dialogs/security.c:235
+#: src/dialogs/popups.c:95
 msgid "_Close"
 msgstr "_Close"
@@ -1730,7 +1747,7 @@ msgstr &quot;_Tabela de cores&quot;
 msgid "_File"
 msgstr "_Arquivo"
-#: src/dialogs/load.c:163 src/dialogs/save/save.c:192
+#: src/dialogs/load.c:163 src/dialogs/save/save.c:250
 msgid "_Filename"
 msgstr "Nome do _Arquivo"
@@ -1754,11 +1771,16 @@ msgstr &quot;Arquivo _local:&quot;
 msgid "_Model"
 msgstr "_Modelo"
+#: src/dialogs/popups.c:77 src/dialogs/popups.c:83 src/dialogs/popups.c:89
+#: src/dialogs/popups.c:101
+msgid "_Ok"
+msgstr "_Ok"
+
 #: src/filetransfer/v3270ft.c:333
 msgid "_Operation"
 msgstr "_Operação:"
-#: src/selection/windows/paste.c:84 src/selection/windows/paste.c:124
+#: src/selection/linux/paste.c:86 src/selection/linux/paste.c:118
 msgid "_Paste as text"
 msgstr "_Colar como texto"
@@ -1766,14 +1788,14 @@ msgstr &quot;_Colar como texto&quot;
 msgid "_Remote file"
 msgstr "Arquivo _remoto:"
-#: src/trace/tracewindow.c:123 src/dialogs/save/save.c:272
-#: src/dialogs/save/save.c:287
+#: src/trace/tracewindow.c:123 src/dialogs/save/save.c:347
+#: src/dialogs/save/save.c:362
 msgid "_Save"
 msgstr "_Salvar"
 #: src/dialogs/settings/host.c:545
-msgid "_Secure connection."
-msgstr "Conexão _Segura."
+msgid "_Security"
+msgstr "_Segurança"
 #: src/dialogs/settings/host.c:228
 msgid "_Service"
@@ -2305,6 +2327,9 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ msgid "Charset has more than 256 entries"
 #~ msgstr "Tabela de tradução tem mais de 256 caracteres"
+#~ msgid "Check for SSL secure connection."
+#~ msgstr "Marcar para ativar a conexão segura via SSL."
+
 #~ msgid "Check for text files."
 #~ msgstr "Marque se o arquivo for texto."
@@ -2347,12 +2372,18 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ msgid "Connection state"
 #~ msgstr "Estado da conexão"
+#~ msgid "Continue"
+#~ msgstr "Continuar"
+
 #~ msgid "Copiar tudo"
 #~ msgstr "Copiar tudo"
 #~ msgid "Copy as HTML"
 #~ msgstr "Copiar como HTML"
+#~ msgid "Critical Error"
+#~ msgstr "Erro crítico"
+
 #, fuzzy
 #~ msgid "Cross hair Cursor"
 #~ msgstr "Cursor mira"
@@ -2490,6 +2521,9 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ msgid "Erase to end of line"
 #~ msgstr "Apagar até o final da linha"
+#~ msgid "Error"
+#~ msgstr "Erro"
+
 #~ msgid "Error \"%s\" reading from local file (rc=%d)"
 #~ msgstr "Erro \"%s\" lendo arquivo local (rc=%d)"
@@ -2511,9 +2545,6 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ msgid "Error in ioctl(%s) when setting no blocking mode"
 #~ msgstr "Erro em ioctl(%s) ao ativar o modo não blocante"
-#~ msgid "Error loading %s"
-#~ msgstr "Erro lendo %s"
-
 #~ msgid "Error loading CRL"
 #~ msgstr "Erro lendo CRL"
@@ -2750,8 +2781,8 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ msgid "Incorrect request code: file transfer canceled"
 #~ msgstr "Código de requisição incorreto, transferência cancelada"
-#~ msgid "Informations"
-#~ msgstr "Informações"
+#~ msgid "Information"
+#~ msgstr "Informação"
 #~ msgid "Input method"
 #~ msgstr "Método de entrada"
@@ -2774,6 +2805,10 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ msgid "Invalid argument format"
 #~ msgstr "O formato do argumento é inválido"
+#~ msgid "Invalid callback table, possible version mismatch in lib3270"
+#~ msgstr ""
+#~ "Tabela de callbacks inválida, possível divergência de versão na lib3270"
+
 #~ msgid "Invalid character value"
 #~ msgstr "Valor de caractere inválido"
@@ -2927,9 +2962,6 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ msgid "Non zero if the host is TSO."
 #~ msgstr "Diferente de zero se o host é TSO"
-#~ msgid "None of the screens in the clipboard match with the current one."
-#~ msgstr "Nenhuma das telas da área de transferência corresponde à atual."
-
 #~ msgid "Not available"
 #~ msgstr "Não disponível"
@@ -2942,6 +2974,9 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ "Permitida apenas uma opção dentre TRACKS, CYLINDERS, AVBLOCK: "
 #~ "Transferência cancelada"
+#~ msgid "Operation failed"
+#~ msgstr "Operação falhou"
+
 #~ msgid "Option '%c:' is not supported"
 #~ msgstr "Opção não suportada: '%c:'"
@@ -3339,9 +3374,6 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ msgid "Secure connection was successful."
 #~ msgstr "Conexão segura efetuada com sucesso."
-#~ msgid "Security error"
-#~ msgstr "Erro de segurança"
-
 #~ msgid "Security warning"
 #~ msgstr "Alerta de segurança"
@@ -3652,6 +3684,9 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ "Intervalo de tempo entre o desbloqueio de teclado pelo host e o "
 #~ "desbloqueio real"
+#~ msgid "The error code was %d"
+#~ msgstr "O código de erro foi %d"
+
 #~ msgid "The height %d is less than model %d rows (%d)"
 #~ msgstr "A altura %d é menor que o número de linhas do modelo %d (%d)"
@@ -3995,6 +4030,9 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ msgid "Waiting for PUT response"
 #~ msgstr "Aguardando resposta do pedido de upload"
+#~ msgid "Warning"
+#~ msgstr "Alerta"
+
 #~ msgid "Where to save the received file."
 #~ msgstr "Onde salvar o arquivo recebido."
@@ -4040,6 +4078,9 @@ msgstr &quot;Diminui o tamanho da fonte&quot;
 #~ msgid "_Receive"
 #~ msgstr "_Receber"
+#~ msgid "_Secure connection."
+#~ msgstr "Conexão _Segura."
+
 #~ msgid "_Send"
 #~ msgstr "_Enviar"
@@ -32,182 +32,204 @@
  #include <terminal.h>
  #include <v3270/dialogs.h>
  #include <v3270/settings.h>
+ #include <lib3270/popup.h>
  /*--[ Implement ]------------------------------------------------------------------------------------*/
- void v3270_popup_message(GtkWidget *widget, LIB3270_NOTIFY type , const gchar *title, const gchar *message, const gchar *text) {
-	GtkWidget		* dialog;
-	GtkWidget		* toplevel	= NULL;
-	GtkMessageType	  msgtype	= GTK_MESSAGE_WARNING;
-	GtkButtonsType	  buttons	= GTK_BUTTONS_OK;
+ GtkResponseType v3270_popup_dialog_show(GtkWidget *widget, const LIB3270_POPUP *popup, gboolean wait) {
-	if(widget && GTK_IS_WIDGET(widget))
-		toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
+	g_return_val_if_fail(GTK_IS_WIDGET(widget),GTK_RESPONSE_NONE);
-	if(!GTK_IS_WINDOW(toplevel))
-		toplevel = NULL;
+	// Check if the dialog is enabled
+	gboolean allow_disabling = (popup->name && GTK_IS_V3270(widget));
-	if(type == LIB3270_NOTIFY_CRITICAL) {
-		msgtype	= GTK_MESSAGE_ERROR;
-		buttons = GTK_BUTTONS_CLOSE;
-	}
+	debug("%s: name=%s allow-disabling: %s", __FUNCTION__, popup->name, allow_disabling ? "Yes" : "No");
-	if(!title)
-		title = _( "Error" );
-
-	if(message) {
-		dialog = gtk_message_dialog_new_with_markup(GTK_WINDOW(toplevel),GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,msgtype,buttons,"%s",message);
-		if(text && *text)
-			gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(dialog),"%s",text);
-	} else if(text && *text) {
-		dialog = gtk_message_dialog_new_with_markup(GTK_WINDOW(toplevel),GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,msgtype,buttons,"%s",text);
-	} else {
-		dialog = gtk_message_dialog_new_with_markup(GTK_WINDOW(toplevel),GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,msgtype,buttons,"%s",title);
-	}
+	if(allow_disabling) {
-	gtk_window_set_title(GTK_WINDOW(dialog),title);
-	gtk_widget_show_all(dialog);
-	gtk_dialog_run(GTK_DIALOG (dialog));
-	gtk_widget_destroy(dialog);
+			GtkResponseType response = 0;
- }
+			debug("Emitting %s","V3270_SIGNAL_LOAD_POPUP_RESPONSE");
+			v3270_signal_emit(
+				widget,
+				V3270_SIGNAL_LOAD_POPUP_RESPONSE,
+				popup->name,
+				&response
+			);
- void v3270_error_popup(GtkWidget *widget, const gchar *title, const gchar *summary, const gchar *body) {
-	GtkWidget * dialog =
-					gtk_message_dialog_new_with_markup(
-						GTK_WINDOW(gtk_widget_get_toplevel(widget)),
-						GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-						GTK_MESSAGE_ERROR,
-						GTK_BUTTONS_CLOSE,
-						"%s",summary
-					);
+			debug("Got response %d",(int) response);
-	gtk_window_set_title(GTK_WINDOW(dialog), (title ? title : _("Error")));
+			if(response && response != GTK_RESPONSE_NONE)
+				return response;
-	if(body)
-		gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(dialog),"%s",body);
+			allow_disabling = (response == GTK_RESPONSE_NONE);
+	}
-	g_signal_connect(dialog,"close",G_CALLBACK(gtk_widget_destroy),NULL);
-	g_signal_connect(dialog,"response",G_CALLBACK(gtk_widget_destroy),NULL);
+	// Popup settings.
+	static const struct _settings {
+		GtkMessageType type;
+		const gchar *button;
+	} settings[LIB3270_NOTIFY_USER] = {
+
+		// LIB3270_NOTIFY_INFO - Simple information dialog.
+		{
+			.type = GTK_MESSAGE_INFO,
+			.button = N_("_Ok"),
+		},
+
+		// LIB3270_NOTIFY_WARNING - Warning message.
+		{
+			.type = GTK_MESSAGE_WARNING,
+			.button = N_("_Ok"),
+		},
+
+		// LIB3270_NOTIFY_ERROR - Error message.
+		{
+			.type = GTK_MESSAGE_ERROR,
+			.button = N_("_Ok"),
+		},
+
+		// LIB3270_NOTIFY_CRITICAL - Critical error, user can abort application.
+		{
+			.type = GTK_MESSAGE_ERROR,
+			.button = N_("_Close"),
+		},
+
+		// LIB3270_NOTIFY_SECURE - Secure host dialog.
+		{
+			.type = GTK_MESSAGE_OTHER,
+			.button = N_("_Ok"),
+		}
-	gtk_widget_show_all(dialog);
+	};
- }
+	// Create dialog
+	GtkWidget * dialog =
+			gtk_message_dialog_new_with_markup(
+				GTK_WINDOW(gtk_widget_get_toplevel(widget)),
+				GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+				settings[popup->type].type,
+				GTK_BUTTONS_NONE,
+				(popup->body ? "<b><big>%s</big></b>" : "%s"),
+					popup->summary
+			);
- void v3270_popup_gerror(GtkWidget *widget, GError *error, const gchar *title, const gchar *fmt, ...) {
+	if(popup->body) {
+		gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(dialog),"<small>%s</small>",popup->body);
+	}
-	// Format message.
- 	va_list arg_ptr;
-	va_start(arg_ptr, fmt);
-	g_autofree gchar *text = g_strdup_vprintf(fmt,arg_ptr);
-	va_end(arg_ptr);
+	if(popup->title) {
+		gtk_window_set_title(GTK_WINDOW(dialog),popup->title);
+	}
-	GtkWidget *dialog = gtk_message_dialog_new(
-							GTK_WINDOW(gtk_widget_get_toplevel(widget)),
-							GTK_DIALOG_DESTROY_WITH_PARENT,
-							GTK_MESSAGE_ERROR,
-							GTK_BUTTONS_OK,
-							"%s",text
-						);
+	if(wait) {
-	if(title)
-		gtk_window_set_title(GTK_WINDOW(dialog), title);
-	else
-		gtk_window_set_title(GTK_WINDOW(dialog), (title ? title : _("Operation failed")));
+		GtkWidget * dont_ask = NULL;
-	if(error)
-		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),"%s",error->message);
+		if(allow_disabling) {
+			// Set check button
+			dont_ask = gtk_check_button_new_with_label(_("Don't ask again"));
-	g_signal_connect(dialog,"close",G_CALLBACK(gtk_widget_destroy),NULL);
-	g_signal_connect(dialog,"response",G_CALLBACK(gtk_widget_destroy),NULL);
+			gtk_widget_set_can_focus(dont_ask,FALSE);
+			gtk_widget_set_can_default(dont_ask,FALSE);
-	gtk_widget_show_all(dialog);
+#if GTK_CHECK_VERSION(3,20,0)
+			gtk_widget_set_focus_on_click(dont_ask,FALSE);
+#endif // GTK 3,20,0
- }
+			gtk_widget_set_valign(dont_ask, GTK_ALIGN_BASELINE);
+			gtk_widget_set_halign(dont_ask, GTK_ALIGN_START);
- GtkResponseType v3270_popup_toggleable_dialog(GtkWidget *widget, V3270_TOGGLEABLE_DIALOG id, const gchar *title, const gchar *summary, const gchar *body, const gchar *first_button_text, ...) {
+			gtk_box_pack_start(
+				GTK_BOX(gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog))),
+				dont_ask,
+				TRUE,
+				TRUE,
+				0
+			);
+		}
-	GtkResponseType response = GTK_V3270(widget)->responses[id];
+		// Wait for response.
+		if(popup->label) {
-	if(response == GTK_RESPONSE_NONE) {
-		GtkWidget * dialog =
-			gtk_message_dialog_new(
-				GTK_WINDOW(gtk_widget_get_toplevel(widget)),
-				GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-				GTK_MESSAGE_INFO,
-				GTK_BUTTONS_NONE,
-				"%s",
-				summary
+			gtk_dialog_add_button(GTK_DIALOG(dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
+			gtk_dialog_add_button(GTK_DIALOG(dialog), popup->label, GTK_RESPONSE_APPLY);
+			gtk_dialog_set_default_response(
+				GTK_DIALOG(dialog),
+				(popup->type == LIB3270_NOTIFY_SECURE ? GTK_RESPONSE_CANCEL : GTK_RESPONSE_APPLY)
 			);
-		if(body)
-			gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(dialog),"%s",body);
+		} else {
-		gtk_window_set_title(GTK_WINDOW(dialog),title);
+			gtk_dialog_add_button(GTK_DIALOG(dialog), g_dgettext(GETTEXT_PACKAGE,settings[popup->type].button), GTK_RESPONSE_OK);
-		// Set check button
-		GtkWidget * dont_ask = gtk_check_button_new_with_label(_("Don't ask again"));
+		}
-		gtk_widget_set_can_focus(dont_ask,FALSE);
-		gtk_widget_set_can_default(dont_ask,FALSE);
-#if GTK_CHECK_VERSION(3,20,0)
-		gtk_widget_set_focus_on_click(dont_ask,FALSE);
-#endif // GTK 3,20,0
+		gtk_widget_show_all(dialog);
+		GtkResponseType rc = gtk_dialog_run(GTK_DIALOG(dialog));
-		gtk_widget_set_valign(dont_ask, GTK_ALIGN_BASELINE);
-		gtk_widget_set_halign(dont_ask, GTK_ALIGN_START);
+		if(dont_ask && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dont_ask)) && rc != GTK_RESPONSE_DELETE_EVENT && rc != GTK_RESPONSE_NONE) {
-		gtk_box_pack_start(
-			GTK_BOX(gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog))),
-			dont_ask,
-			TRUE,
-			TRUE,
-			0
-		);
+			gboolean saved = FALSE;
-		if(first_button_text) {
-            // From https://github.com/GNOME/gtk/blob/master/gtk/gtkdialog.c
-			va_list args;
-			const gchar* text;
-			gint response_id;
+			v3270_signal_emit(
+				widget,
+				V3270_SIGNAL_SAVE_POPUP_RESPONSE,
+				popup->name,
+				rc,
+				&saved
+			);
-			va_start(args, first_button_text);
+			debug("response was %s",saved ? "saved" : "not saved");
-			text = first_button_text;
-			while(text) {
-				response_id = va_arg(args, gint);
+		}
-				gtk_dialog_add_button(GTK_DIALOG(dialog), text, response_id);
+		gtk_widget_destroy(dialog);
+		return rc;
-				if(response_id == GTK_RESPONSE_APPLY || response_id == GTK_RESPONSE_OK || response_id == GTK_RESPONSE_YES)
-					gtk_dialog_set_default_response(GTK_DIALOG(dialog),response_id);
+	}
-				text = va_arg(args, gchar*);
-			}
+	// Unnamed dialog, no need for wait.
+	g_signal_connect(dialog,"close",G_CALLBACK(gtk_widget_destroy),NULL);
+	g_signal_connect(dialog,"response",G_CALLBACK(gtk_widget_destroy),NULL);
-			va_end (args);
-		}
+	gtk_dialog_add_button(GTK_DIALOG(dialog), settings[popup->type].button, GTK_RESPONSE_OK);
-		gtk_widget_show_all(dialog);
-		response = gtk_dialog_run(GTK_DIALOG(dialog));
+	gtk_widget_show_all(dialog);
-		if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dont_ask))) {
+	return GTK_RESPONSE_NONE;
-			GTK_V3270(widget)->responses[id] = response;
-			g_object_notify_by_pspec(G_OBJECT(widget), GTK_V3270_GET_CLASS(widget)->responses[id]);
-			v3270_emit_save_settings(widget);
+ }
-			debug(
-				"Property %s is now %d",
-					g_param_spec_get_name(GTK_V3270_GET_CLASS(widget)->responses[id]),
-					GTK_V3270(widget)->responses[id]
-			);
+ void v3270_error_popup(GtkWidget *widget, const gchar *title, const gchar *summary, const gchar *body) {
-		}
+	LIB3270_POPUP popup = {
+		.type = LIB3270_NOTIFY_ERROR,
+		.title = title,
+		.summary = summary,
+		.body = body
+	};
-		gtk_widget_destroy(dialog);
-	}
+	v3270_popup_dialog_show(widget, &popup, FALSE);
+
+ }
+
+ void v3270_popup_gerror(GtkWidget *widget, GError *error, const gchar *title, const gchar *fmt, ...) {
+
+	// Format message.
+ 	va_list arg_ptr;
+	va_start(arg_ptr, fmt);
+	g_autofree gchar *summary = g_strdup_vprintf(fmt,arg_ptr);
+	va_end(arg_ptr);
-	return response;
+	LIB3270_POPUP popup = {
+		.type = LIB3270_NOTIFY_ERROR,
+		.title = title,
+		.summary = summary,
+		.body = error->message
+	};
+
+	v3270_popup_dialog_show(widget, &popup, FALSE);
  }
+
@@ -91,22 +91,6 @@
 #ifdef WIN32
 static void icon_press(GtkEntry G_GNUC_UNUSED(*entry), G_GNUC_UNUSED GtkEntryIconPosition icon_pos, G_GNUC_UNUSED GdkEvent *event, V3270SaveDialog *widget)
 {
-	/*
-
-	GtkFileChooserNative * dialog =
-			gtk_file_chooser_native_new(
-				_( "Select destination file"),
-				GTK_WINDOW(widget),
-				GTK_FILE_CHOOSER_ACTION_SAVE,
-				_("Select"),
-				_("Cancel")
-			);
-
-	gint rc = gtk_native_dialog_run (GTK_NATIVE_DIALOG(dialog));
-
-	debug("rc=%d",rc);
-	*/
-
 	g_autofree gchar *filename =
 						v3270_select_file(
 								GTK_WIDGET(widget),
@@ -125,9 +109,6 @@ static void icon_press(GtkEntry G_GNUC_UNUSED(*entry), G_GNUC_UNUSED GtkEntryIco
 static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_pos, G_GNUC_UNUSED GdkEvent *event, V3270SaveDialog *widget)
 {
-	//gint format = gtk_combo_box_get_active(GTK_COMBO_BOX(widget->format));
-	//g_autofree gchar * extension = g_strconcat("*",formats[format].extension,NULL);
-
 	GtkWidget * dialog =
 		gtk_file_chooser_dialog_new(
 				_( "Select destination file"),
@@ -156,6 +137,83 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
  }
 #endif // _WIN32
+
+ static void filename_changed(GtkEntry *entry, GtkComboBox *formats)
+ {
+ 	const gchar * text = gtk_entry_get_text(entry);
+
+ 	if(!(text && *text))
+		return;
+
+	const gchar * extension = strrchr(text,'.');
+	if(!extension)
+		return;
+
+	extension++;
+	const gchar	* format = gtk_combo_box_get_active_id(formats);
+	if(*format == '.')
+		format++;
+
+	if(g_ascii_strcasecmp(extension,format) == 0)
+		return;
+
+	gint column = gtk_combo_box_get_id_column(formats);
+	GtkTreeModel * model = gtk_combo_box_get_model(formats);
+	GtkTreeIter iter;
+
+	debug("id_column=%d",column);
+
+	if(gtk_tree_model_get_iter_first(model,&iter))
+	{
+		do
+		{
+			g_autofree gchar *id = NULL;
+			gtk_tree_model_get(model, &iter, column, &id, -1);
+
+			if(g_ascii_strcasecmp(extension,id + (*id == '.' ? 1 : 0)) == 0)
+			{
+				gtk_combo_box_set_active_iter(formats,&iter);
+				break;
+			}
+
+		} while(gtk_tree_model_iter_next(model,&iter));
+	}
+
+ }
+
+ static void fileformat_changed(GtkComboBox *formats, GtkEntry *entry)
+ {
+	const gchar * text = gtk_entry_get_text(entry);
+
+ 	if(!(text && *text))
+		return;
+
+	gchar * extension = strrchr(text,'.');
+	if(!extension)
+		return;
+
+	extension++;
+	const gchar	* format = gtk_combo_box_get_active_id(formats);
+	if(*format == '.')
+		format++;
+
+	if(g_ascii_strcasecmp(extension,format) == 0)
+		return;
+
+	size_t szFilename = strlen(text) + strlen(format);
+	g_autofree gchar * filename = g_malloc0(szFilename + 1);
+
+	strncpy(filename,text,szFilename);
+	extension = strrchr(filename,'.');
+	if(extension)
+	{
+		*(++extension) = 0;
+		strncat(filename, format + (*format == '.' ? 1 : 0),szFilename);
+		gtk_entry_set_text(entry,filename);
+	}
+
+ }
+
  static void V3270SaveDialog_init(V3270SaveDialog *dialog)
  {
  	//     0--------1---------------------2-------3--------------------4
@@ -195,16 +253,10 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 		gtk_grid_attach(grid,widget,0,0,1,1);
 		gtk_label_set_mnemonic_widget(GTK_LABEL(widget),dialog->filename);
-//#ifdef WIN32
-//		widget = gtk_button_new_from_icon_name("document-open",GTK_ICON_SIZE_BUTTON);
-//		g_signal_connect(G_OBJECT(widget),"clicked",G_CALLBACK(select_file),dialog);
-//		gtk_grid_attach(grid,widget,4,0,1,1);
-//#else
-		gtk_entry_set_icon_from_icon_name(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,"document-open");
+		gtk_entry_set_icon_from_icon_name(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,"document-save-as");
 		gtk_entry_set_icon_activatable(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,TRUE);
 		gtk_entry_set_icon_tooltip_text(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,_("Select file"));
 		g_signal_connect(G_OBJECT(dialog->filename),"icon-press",G_CALLBACK(icon_press),dialog);
-//#endif // WIN32
 		gtk_entry_set_width_chars(GTK_ENTRY(dialog->filename),60);
 		gtk_entry_set_max_length(GTK_ENTRY(dialog->filename),PATH_MAX);
@@ -240,7 +292,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 		{
 			gtk_combo_box_text_insert(
 				GTK_COMBO_BOX_TEXT(dialog->format),
-				ix,
+				-1,
 				formats[ix].extension,
 				g_dgettext(GETTEXT_PACKAGE,formats[ix].name)
 			);
@@ -248,6 +300,29 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 		gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->format),0);
+		// Image formats.
+		GSList *img_formats = gdk_pixbuf_get_formats();
+		GSList *img_format;
+
+		for(img_format = img_formats;img_format;img_format = g_slist_next(img_format))
+		{
+			GdkPixbufFormat * pixFormat = (GdkPixbufFormat *) img_format->data;
+
+			if (gdk_pixbuf_format_is_writable(pixFormat))
+			{
+				gtk_combo_box_text_insert(
+					GTK_COMBO_BOX_TEXT(dialog->format),
+					-1,
+					gdk_pixbuf_format_get_name(pixFormat),
+					gdk_pixbuf_format_get_description(pixFormat)
+				);
+			}
+
+		}
+
+		g_signal_connect(dialog->filename,"changed",G_CALLBACK(filename_changed),dialog->format);
+		g_signal_connect(dialog->format,"changed",G_CALLBACK(fileformat_changed),dialog->filename);
+
 	}
@@ -335,20 +410,38 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 	return GTK_WIDGET(dialog);
  }
- void v3270_save_dialog_apply(GtkWidget *widget, GError **error)
+ static const gchar * get_filename(V3270SaveDialog * dialog)
  {
- 	V3270SaveDialog * dialog = V3270_SAVE_DIALOG(widget);
+	const gchar * filename	= gtk_entry_get_text(GTK_ENTRY(dialog->filename));
+	gint		  response 	= GTK_RESPONSE_OK;
- 	if(!v3270_is_connected(dialog->terminal))
+	if(g_file_test(filename,G_FILE_TEST_EXISTS))
 	{
-		*error = g_error_new(g_quark_from_static_string(PACKAGE_NAME),ENOTCONN,"%s",strerror(ENOTCONN));
-		return;
+		GtkWidget * confirmation =
+						gtk_message_dialog_new_with_markup(
+								GTK_WINDOW(dialog),
+								GTK_DIALOG_DESTROY_WITH_PARENT,
+								GTK_MESSAGE_QUESTION,GTK_BUTTONS_OK_CANCEL,
+								_("The file \"%s\" already exists. Replace it?"),
+								filename
+							);
+
+		response = gtk_dialog_run(GTK_DIALOG(confirmation));
+		gtk_widget_destroy(confirmation);
 	}
+	return (response == GTK_RESPONSE_OK ? filename : NULL);
+
+ }
+
+ static void save_as_text(V3270SaveDialog * dialog, size_t index, GError **error)
+ {
 	// Get selection
 	GList 		* dynamic	= NULL;
 	const GList * selection = NULL;
+	debug("%s(%d)",__FUNCTION__,dialog->mode);
+
 	switch(dialog->mode)
 	{
 	case LIB3270_CONTENT_ALL:
@@ -371,6 +464,8 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 		return;
 	}
+	debug("Selection=%p",selection);
+
 	if(!selection)
 	{
 		*error = g_error_new(g_quark_from_static_string(PACKAGE_NAME),ENOTCONN,"%s",strerror(ENODATA));
@@ -382,7 +477,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 		debug("Encoding: %s",encoding);
-		switch(gtk_combo_box_get_active(GTK_COMBO_BOX(dialog->format)))
+		switch(index)
 		{
 		case 0: // "Plain text"
 			text = v3270_get_selection_as_text(GTK_V3270(dialog->terminal), selection, encoding, dialog->mode == LIB3270_CONTENT_ALL);
@@ -402,25 +497,9 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 		if(text)
 		{
-			const gchar * filename	= gtk_entry_get_text(GTK_ENTRY(dialog->filename));
-			gint		  response 	= GTK_RESPONSE_OK;
+			const gchar * filename = get_filename(dialog);
-			if(g_file_test(filename,G_FILE_TEST_EXISTS))
-			{
-				GtkWidget * confirmation =
-								gtk_message_dialog_new_with_markup(
-										GTK_WINDOW(widget),
-										GTK_DIALOG_DESTROY_WITH_PARENT,
-										GTK_MESSAGE_QUESTION,GTK_BUTTONS_OK_CANCEL,
-										_("The file \"%s\" already exists. Replace it?"),
-										filename
-									);
-
-				response = gtk_dialog_run(GTK_DIALOG(confirmation));
-				gtk_widget_destroy(confirmation);
-			}
-
-			if(response == GTK_RESPONSE_OK)
+			if(filename)
 			{
 				g_file_set_contents(
 					gtk_entry_get_text(GTK_ENTRY(dialog->filename)),
@@ -445,6 +524,93 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 	#pragma GCC diagnostic pop
  }
+ static void save_as_image(V3270SaveDialog * dialog, const gchar *format, GError **error)
+ {
+	debug("%s(%d)",__FUNCTION__,dialog->mode);
+
+	GdkPixbuf * pixbuf = NULL;
+
+	switch(dialog->mode)
+	{
+	case LIB3270_CONTENT_ALL:
+		debug("%s","LIB3270_CONTENT_ALL");
+		pixbuf = v3270_get_as_pixbuf(dialog->terminal);
+		break;
+
+	case LIB3270_CONTENT_COPY:
+		{
+			debug("%s","LIB3270_CONTENT_COPY");
+			const GList * selection = v3270_get_selection_blocks(dialog->terminal);
+			pixbuf = v3270_get_selection_as_pixbuf(GTK_V3270(dialog->terminal), selection, FALSE);
+		}
+		break;
+
+	case LIB3270_CONTENT_SELECTED:
+		{
+			debug("%s","LIB3270_CONTENT_SELECTED");
+			GList * selection = g_list_append_lib3270_selection(NULL, v3270_get_session(dialog->terminal),FALSE);
+			debug("Selection=%p",selection);
+			pixbuf = v3270_get_selection_as_pixbuf(GTK_V3270(dialog->terminal), selection, FALSE);
+			g_list_free_full(selection,(GDestroyNotify) lib3270_free);
+		}
+		break;
+
+	default:
+		*error = g_error_new(g_quark_from_static_string(PACKAGE_NAME),ENOTCONN,_( "Unexpected mode %d" ),(int) dialog->mode);
+		return;
+	}
+
+	debug("pixbuff=%p",pixbuf);
+
+	if(pixbuf)
+	{
+		const gchar * filename = get_filename(dialog);
+
+		debug("Filename=%p",filename);
+		if(filename)
+		{
+			gdk_pixbuf_save(pixbuf,filename,format,error,NULL);
+		}
+
+		g_object_unref(pixbuf);
+	}
+	else
+	{
+		*error = g_error_new(g_quark_from_static_string(PACKAGE_NAME),-1,_( "Error saving image" ));
+	}
+
+ }
+
+ void v3270_save_dialog_apply(GtkWidget *widget, GError **error)
+ {
+ 	size_t ix;
+ 	V3270SaveDialog * dialog = V3270_SAVE_DIALOG(widget);
+
+ 	if(!v3270_is_connected(dialog->terminal))
+	{
+		*error = g_error_new(g_quark_from_static_string(PACKAGE_NAME),ENOTCONN,"%s",strerror(ENOTCONN));
+		return;
+	}
+
+	// Get type ID
+	const gchar	* format = gtk_combo_box_get_active_id(GTK_COMBO_BOX(dialog->format));
+
+	// Check for text formats.
+	for(ix=0;ix<G_N_ELEMENTS(formats);ix++)
+	{
+		if(!strcmp(formats[ix].extension,format))
+		{
+			// Is text format, save it
+			save_as_text(dialog, ix, error);
+			return;
+		}
+
+	}
+
+	save_as_image(dialog, format, error);
+
+ }
+
  void v3270_save_dialog_run(GtkWidget *widget)
  {
 	if(gtk_dialog_run(GTK_DIALOG(widget)) == GTK_RESPONSE_APPLY)
@@ -140,6 +140,11 @@
 	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(widget->store),1,GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID);
 	GtkWidget * view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(widget->store));
+
+	gtk_tree_view_set_enable_search(GTK_TREE_VIEW(view),TRUE);
+	gtk_tree_view_set_search_column(GTK_TREE_VIEW(view),1);
+
+
 	g_signal_connect(G_OBJECT(widget),"realize",G_CALLBACK(realize),view);
 	gtk_widget_set_tooltip_markup(view,_("Keyboard accelerators"));
@@ -163,11 +163,22 @@
 		.label = N_("Smart copy"),
 		.tooltip = N_("When set the first copy operation after the selection will set the clipboard contents and the next ones will append"),
 		.left = 1,
+		.top = 4,
+		.width = 1,
+		.height = 1,
+		.grid = COPY_SETTINGS
+	},
+
+	{
+		.label = N_("Image copy"),
+		.tooltip = N_("When set allow image formats on clipboard"),
+		.left = 1,
 		.top = 3,
 		.width = 1,
 		.height = 1,
 		.grid = COPY_SETTINGS
 	}
+
  };
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
@@ -472,6 +483,7 @@ static void load(GtkWidget *w, GtkWidget *t) {
 	gtk_toggle_button_set_active(widget->input.checkboxes[0],(terminal->selection.options & V3270_SELECTION_NON_BREAKABLE_SPACE) != 0);
 	gtk_toggle_button_set_active(widget->input.checkboxes[1],(terminal->selection.options & V3270_SELECTION_SCREEN_PASTE) != 0);
 	gtk_toggle_button_set_active(widget->input.checkboxes[2],(terminal->selection.options & V3270_SELECTION_SMART_COPY) != 0);
+	gtk_toggle_button_set_active(widget->input.checkboxes[3],(terminal->selection.options & V3270_SELECTION_PIXBUFF) != 0);
 	//
 	// Set font combo-box
@@ -559,6 +571,12 @@ static void apply(GtkWidget *w, GtkWidget *t) {
 			terminal->selection.options &= ~V3270_SELECTION_SMART_COPY;
 		}
+		if(gtk_toggle_button_get_active(widget->input.checkboxes[3])) {
+			terminal->selection.options |= V3270_SELECTION_PIXBUFF;
+		} else {
+			terminal->selection.options &= ~V3270_SELECTION_PIXBUFF;
+		}
+
 		// Get font settings
 		switch(get_active_id(widget,0)) {
 		case '0':
@@ -52,21 +52,21 @@
  {
  	{
  		.left = 2,
- 		.top = 3,
- 		.width = 1,
+ 		.top = 2,
+ 		.width = 2,
  		.grid = CONNECTION,
  		.id = LIB3270_TOGGLE_CONNECT_ON_STARTUP,
  	},
  	{
- 		.left = 3,
- 		.top = 3,
+ 		.left = 4,
+ 		.top = 2,
  		.width = 1,
  		.grid = CONNECTION,
 		.id = LIB3270_TOGGLE_RECONNECT,
  	},
  	{
- 		.left = 4,
- 		.top = 3,
+ 		.left = 5,
+ 		.top = 2,
  		.width = 1,
  		.grid = CONNECTION,
 		.id = LIB3270_TOGGLE_KEEP_ALIVE,
@@ -208,7 +208,7 @@
  	{
  		.left = 0,
  		.top = 0,
- 		.width = 4,
+ 		.width = 5,
  		.height = 1,
  		.grid = CONNECTION,
@@ -260,7 +260,7 @@
  	{
  		.left = 2,
  		.top = 1,
- 		.width = 2,
+ 		.width = 3,
  		.height = 1,
  		.grid = CONNECTION,
@@ -279,7 +279,7 @@
 	struct
 	{
 		GtkEntry			* entry[G_N_ELEMENTS(entryfields)];		///< @brief Entry fields for host & service name.
-		GtkToggleButton		* ssl;									///< @brief SSL Connection?
+		GtkComboBox			* ssl;									///< @brief SSL Connection?
 		GtkComboBox			* combos[G_N_ELEMENTS(combos)];			///< @brief Combo-boxes.
 		GtkComboBox			* charset;								///< @brief Charset combo box.
 		GtkToggleButton		* toggles[G_N_ELEMENTS(toggleList)];	///< @brief Toggle checks.
@@ -540,12 +540,41 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget)
 	}
-	// SSL checkbox
+	// SSL input
 	{
+		GtkWidget *label = gtk_label_new_with_mnemonic(_( "_Security" ));
+		gtk_widget_set_halign(label,GTK_ALIGN_END);
+		gtk_grid_attach(GTK_GRID(grids[CONNECTION]),label,0,3,1,1);
+
+		GtkTreeModel * model = (GtkTreeModel *) gtk_list_store_new(1,G_TYPE_STRING);
+
+		widget->input.ssl = GTK_COMBO_BOX(gtk_combo_box_new_with_model(model));
+
+		GtkCellRenderer * text_renderer	= gtk_cell_renderer_text_new();
+		gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(widget->input.ssl), text_renderer, TRUE);
+		gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(widget->input.ssl), text_renderer, "text", 0, NULL);
+
+		static const gchar * levels[] =
+		{
+			N_("Unsecure"),
+			N_("SSL/TLS")
+		};
+
+		size_t level;
+		for(level = 0; level < G_N_ELEMENTS(levels); level++)
+		{
+			GtkTreeIter iter;
+			gtk_list_store_append((GtkListStore *) model, &iter);
+			gtk_list_store_set((GtkListStore *) model, &iter, 0, levels[level], -1);
+		};
+
+		/*
 		widget->input.ssl = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_mnemonic(_( "_Secure connection." )));
 		gtk_widget_set_tooltip_text(GTK_WIDGET(widget->input.ssl),_( "Check for SSL secure connection." ));
 		gtk_widget_set_halign(GTK_WIDGET(widget->input.ssl),GTK_ALIGN_START);
-		gtk_grid_attach(GTK_GRID(grids[CONNECTION]),GTK_WIDGET(widget->input.ssl),1,3,1,1);
+		*/
+
+		gtk_grid_attach(GTK_GRID(grids[CONNECTION]),GTK_WIDGET(widget->input.ssl),1,3,2,1);
 	}
 	// Toggle checkboxes
@@ -699,7 +728,7 @@ static void apply(GtkWidget *w, GtkWidget *terminal)
 	{
 		g_autofree gchar * url =
 			g_strconcat(
-							(gtk_toggle_button_get_active(widget->input.ssl) ? "tn3270s://" : "tn3270://"),
+							(gtk_combo_box_get_active(widget->input.ssl) > 0 ? "tn3270s://" : "tn3270://"),
 							gtk_entry_get_text(widget->input.entry[ENTRY_HOSTNAME]),
 							":",
 							gtk_entry_get_text(widget->input.entry[ENTRY_SRVCNAME]),
@@ -778,9 +807,9 @@ static void load(GtkWidget *w, GtkWidget *terminal)
     {
         g_autofree gchar * url = g_strdup(u);
-        debug("URL=[%s]",url);
-		gtk_toggle_button_set_active(widget->input.ssl,g_str_has_prefix(u,"tn3270s"));
+		gtk_combo_box_set_active(widget->input.ssl,(g_str_has_prefix(u,"tn3270s") ? 1 : 0));
+//		gtk_toggle_button_set_active(widget->input.ssl,g_str_has_prefix(u,"tn3270s"));
         gchar *hostname = strstr(url,"://");
         if(!hostname)
@@ -45,7 +45,8 @@
 		CLIPBOARD_TYPE_TEXT,
 		CLIPBOARD_TYPE_CSV,
 		CLIPBOARD_TYPE_HTML,
-		CLIPBOARD_TYPE_V3270_FORMATTED
+		CLIPBOARD_TYPE_V3270_FORMATTED,
+		CLIPBOARD_TYPE_PIXBUFF
 	};
 	/// @brief Column from selection.
@@ -91,6 +92,7 @@
 	/// @brief Get contents.
 	G_GNUC_INTERNAL gchar		* v3270_get_selection_as_text(v3270 * terminal, const GList *selection, const gchar *encoding, gboolean all);
+	G_GNUC_INTERNAL GdkPixbuf	* v3270_get_selection_as_pixbuf(v3270 * terminal, const GList *selection, gboolean all);
 	G_GNUC_INTERNAL gchar		* v3270_get_selection_as_table(v3270 * terminal, const GList *selection, const gchar *delimiter, const gchar *encoding, gboolean all);
 	G_GNUC_INTERNAL gchar		* v3270_get_selection_as_html_div(v3270 * terminal, const GList *selection, const gchar *encoding, gboolean all, const V3270SelectionOption options);
 	G_GNUC_INTERNAL gchar		* v3270_get_selection_as_html_table(v3270 * terminal, const GList *selection, const gchar *encoding, gboolean all, const V3270SelectionOption options);
@@ -44,6 +44,7 @@
  #include <lib3270/log.h>
  #include <v3270.h>
  #include <v3270/toggle.h>
+ #include <lib3270/popup.h>
  G_BEGIN_DECLS
@@ -82,7 +83,6 @@
  	V3270_SIGNAL_KEYPRESS,
  	V3270_SIGNAL_MODEL_CHANGED,
  	V3270_SIGNAL_CHANGED,
- 	V3270_SIGNAL_MESSAGE,
  	V3270_SIGNAL_FIELD,
  	V3270_SIGNAL_SESSION_CHANGED,
@@ -114,7 +114,9 @@
  	//
  	// Settings signals (Mostly fired by V3270Settings dialogs).
  	//
- 	V3270_SIGNAL_SAVE_SETTINGS,		///< @brief Notify main application to save all widget settings.
+ 	V3270_SIGNAL_SAVE_SETTINGS,			///< @brief Notify main application to save all widget settings.
+ 	V3270_SIGNAL_LOAD_POPUP_RESPONSE,	///< @brief Load popup response (GTK_RESPONSE_NONE to show popup).
+ 	V3270_SIGNAL_SAVE_POPUP_RESPONSE,	///< @brief Save popup response.
  	V3270_SIGNAL_LAST
  };
@@ -133,6 +135,8 @@
  G_GNUC_INTERNAL GtkWidget		* v3270_dialog_create_grid(GtkAlign align);
  G_GNUC_INTERNAL GtkWidget		* v3270_dialog_create_frame(GtkWidget * child, const gchar *title);
+ G_GNUC_INTERNAL GtkResponseType v3270_popup_dialog_show(GtkWidget *widget, const LIB3270_POPUP *popup, gboolean wait);
+
  G_GNUC_INTERNAL void			  v3270_signal_emit(gpointer instance, enum V3270_SIGNAL signal_id, ...);
  G_GNUC_INTERNAL void			  v3270_dialog_close(GtkDialog *dialog, gpointer user_data);
@@ -181,6 +185,7 @@
  	unsigned short keycode;
  } V3270PFKeyAccelerator;
+ /*
  typedef enum v3270_toggleable_dialog
  {
 	V3270_TOGGLEABLE_DIALOG_PASTE_FAILED,
@@ -189,6 +194,7 @@
  } V3270_TOGGLEABLE_DIALOG;
  G_GNUC_INTERNAL GtkResponseType v3270_popup_toggleable_dialog(GtkWidget *widget, V3270_TOGGLEABLE_DIALOG id, const gchar *title, const gchar *summary, const gchar *body, const gchar *first_button_text, ...) G_GNUC_NULL_TERMINATED;
+ */
 #if GTK_CHECK_VERSION(3,12,0)
  G_GNUC_INTERNAL GtkHeaderBar	* v3270_dialog_get_header_bar(GtkWidget * widget);
@@ -33,6 +33,7 @@
 G_BEGIN_DECLS
+/*
  /// @brief V3270 Properties saved to the configuration file.
  typedef enum
  {
@@ -56,6 +57,7 @@ G_BEGIN_DECLS
  } V3270_SETTING;
  G_GNUC_INTERNAL void v3270_notify_setting(GtkWidget *widget, V3270_SETTING id);
+*/
  struct _v3270Class
  {
@@ -69,7 +71,7 @@ G_BEGIN_DECLS
 		GParamSpec * toggle[LIB3270_TOGGLE_COUNT];		// Toggle properties.
 		// Properties saved to the configuration file.
-		GParamSpec * settings[V3270_SETTING_COUNT];
+		const gchar **persistent;
 		// Signal related properties
 		GParamSpec * online;
@@ -78,6 +80,7 @@ G_BEGIN_DECLS
 		GParamSpec * session_name;
 		GParamSpec * trace;
 		GParamSpec * has_copy;
+		GParamSpec * has_timer;
 		struct
 		{
@@ -86,14 +89,11 @@ G_BEGIN_DECLS
 			guint integer;
 			guint uint;
 			guint str;
-			guint responses;
+//			guint responses;
 		} type;
     } properties;
-    // Predefined responses.
-   	GParamSpec * responses[V3270_TOGGLEABLE_DIALOG_CUSTOM];
-
     // Cursors
 	GdkCursor * cursors[LIB3270_POINTER_COUNT];
@@ -104,7 +104,8 @@ G_BEGIN_DECLS
 	void (*activate)(GtkWidget *widget);
 	void (*toggle_changed)(v3270 *widget,LIB3270_TOGGLE_ID toggle_id,gboolean toggle_state,const gchar *toggle_name);
 	void (*message_changed)(v3270 *widget, LIB3270_MESSAGE id);
-	void (*popup_message)(GtkWidget *widget, LIB3270_NOTIFY id , const gchar *title, const gchar *message, const gchar *text);
+	guint (*load_popup_response)(v3270 *widget, const gchar *popup_name, guint response);
+	gboolean (*save_popup_response)(v3270 *widget, const gchar *popup_name, guint response);
  };
@@ -127,6 +128,7 @@ G_BEGIN_DECLS
  	V3270_SELECTION_SCREEN_PASTE		= 0x08,	///< @brief Enable screen paste.
  	V3270_SELECTION_SMART_COPY			= 0x10,	///< @brief Enable copy/append based on current selection state.
  	V3270_SELECTION_DIALOG_STATE		= 0x20,	///< @brief Used for settings dialog.
+ 	V3270_SELECTION_PIXBUFF				= 0x40,	///< @brief Allow pixbuf formats.
  } V3270SelectionOption;
@@ -160,7 +162,7 @@ G_BEGIN_DECLS
 	int copying			: 1;	/// @brief Copy with center mouse button
     /// @brief Action properties.
-   	GtkResponseType			  responses[V3270_TOGGLEABLE_DIALOG_CUSTOM];
+//   	GtkResponseType			  responses[V3270_TOGGLEABLE_DIALOG_CUSTOM];
 	GSource					* timer;
 	GtkIMContext			* input_method;
@@ -256,6 +258,7 @@ G_BEGIN_DECLS
  };
  G_GNUC_INTERNAL void v3270_activate(GtkWidget *widget);
+ G_GNUC_INTERNAL GdkPixbuf * v3270_get_as_pixbuf(GtkWidget *widget);
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
@@ -215,13 +215,10 @@
  LIB3270_EXPORT GtkIMContext	* v3270_get_im_context(GtkWidget *widget);
  LIB3270_EXPORT const gchar		* v3270_get_default_font_name();
- LIB3270_EXPORT void			  v3270_popup_message(GtkWidget *widget, LIB3270_NOTIFY type, const gchar *title, const gchar *message, const gchar *text);
-
  LIB3270_EXPORT const gchar		* v3270_get_session_name(GtkWidget *widget);
  LIB3270_EXPORT void			  v3270_set_session_name(GtkWidget *widget, const gchar *name);
  LIB3270_EXPORT gchar			* v3270_get_session_title(GtkWidget *widget);
-// LIB3270_EXPORT gchar			* v3270_get_title(GtkWidget *widget);
  LIB3270_EXPORT gchar			* v3270_set_title(GtkWidget *widget, const gchar *title);
  LIB3270_EXPORT int				  v3270_set_script(GtkWidget *widget, const gchar id);
@@ -48,7 +48,7 @@
  LIB3270_EXPORT void v3270_to_key_file(GtkWidget *widget, GKeyFile *key_file, const gchar *group_name);
  /// @brief Emit the "save-settings" signal.
- LIB3270_EXPORT void v3270_emit_save_settings(GtkWidget *widget);
+ LIB3270_EXPORT void v3270_emit_save_settings(GtkWidget *widget, const gchar *property_name);
 #ifdef _WIN32
@@ -104,6 +104,20 @@ static void clipboard_get(G_GNUC_UNUSED  GtkClipboard *clipboard, GtkSelectionDa
 		}
 		break;
+	case CLIPBOARD_TYPE_PIXBUFF:
+		{
+			GdkPixbuf * pixbuff = v3270_get_selection_as_pixbuf(terminal, terminal->selection.blocks, FALSE);
+
+			debug("%s: pixbuff=%p (blocks=%p)",__FUNCTION__,pixbuff,terminal->selection.blocks);
+
+			if(pixbuff)
+			{
+				gtk_selection_data_set_pixbuf(selection,pixbuff);
+				g_object_unref(pixbuff);
+			}
+		}
+		break;
+
 	default:
 		g_warning("Unexpected clipboard type %d\n",target);
 	}
@@ -143,6 +157,11 @@ void v3270_update_system_clipboard(GtkWidget *widget)
 	}
+	if(terminal->selection.options & V3270_SELECTION_PIXBUFF)
+	{
+		gtk_target_list_add_image_targets(list,CLIPBOARD_TYPE_PIXBUFF,TRUE);
+	}
+
 	int				  n_targets;
 	GtkTargetEntry	* targets = gtk_target_table_new_from_list(list, &n_targets);
@@ -30,6 +30,7 @@
  #include <clipboard.h>
  #include <lib3270/toggle.h>
  #include <v3270/dialogs.h>
+ #include <lib3270/popup.h>
 /*--[ Implement ]------------------------------------------------------------------------------------*/
@@ -108,17 +109,16 @@ static void formatted_received(GtkClipboard *clipboard, GtkSelectionData *select
 	if(!v3270_set_from_data_block(terminal, selection))
 	{
 		debug("%s: Can't paste data",__FUNCTION__);
-		if(
-			v3270_popup_toggleable_dialog(
-				widget,
-				V3270_TOGGLEABLE_DIALOG_PASTE_FAILED,
-				_("Can't paste"),
-				_("Unable to paste formatted data."),
-				_("None of the screens in the clipboard match with the current one."),
-				_("_Cancel"), GTK_RESPONSE_CANCEL,
-				_("_Paste as text"), GTK_RESPONSE_APPLY,
-				NULL
-			) == GTK_RESPONSE_APPLY)
+
+		LIB3270_POPUP popup = {
+			.name = "cantpaste",
+			.title = _("Can't paste"),
+			.summary = _("Unable to paste formatted data."),
+			.body = _("None of the screens in the clipboard match with the current one."),
+			.label = _("_Paste as text")
+		};
+
+		if(v3270_popup_dialog_show(widget,&popup,1) == GTK_RESPONSE_APPLY)
 		{
 			gtk_clipboard_request_text(
 				clipboard,
@@ -127,51 +127,8 @@ static void formatted_received(GtkClipboard *clipboard, GtkSelectionData *select
 			);
 		}
-		/*
-		GtkResponseType response = GTK_V3270(terminal)->responses[V3270_TOGGLEABLE_DIALOG_PASTE_FAILED];
-
-		if(response == GTK_RESPONSE_NONE)
-		{
-			// No predefined response, ask.
-			GtkWidget * dialog =
-						gtk_message_dialog_new(
-							GTK_WINDOW(gtk_widget_get_toplevel(widget)),
-							GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-							GTK_MESSAGE_INFO,
-							GTK_BUTTONS_NONE,
-							_("Unable to paste formatted data")
-						);
-
-
-			gtk_window_set_title(GTK_WINDOW(dialog),_("Can't paste"));
-
-			gtk_dialog_add_buttons(
-				GTK_DIALOG (dialog),
-				_("_Cancel"), GTK_RESPONSE_CANCEL,
-				_("_Paste as text"), GTK_RESPONSE_APPLY,
-				NULL
-			);
-
-			gtk_dialog_set_default_response(GTK_DIALOG (dialog),response);
-
-			gint response = gtk_dialog_run(GTK_DIALOG(dialog));
-
-			gtk_widget_destroy(dialog);
-		}
-
-		if(response == GTK_RESPONSE_APPLY)
-		{
-			gtk_clipboard_request_text(
-						clipboard,
-						(GtkClipboardTextReceivedFunc) text_received,
-						(gpointer) widget
-			);
-		}
-
-		*/
 		return;
-
 	}
 }
@@ -0,0 +1,153 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como - e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ */
+
+ #include <clipboard.h>
+ #include <lib3270/selection.h>
+ #include <v3270/dialogs.h>
+
+/*--[ Implement ]------------------------------------------------------------------------------------*/
+
+GdkPixbuf * v3270_get_selection_as_pixbuf(v3270 * terminal, const GList *selections, gboolean all)
+{
+	const GList *selection;
+
+	// Get image size
+	size_t rows = 0, from_col = 1000, to_col = 0;
+
+	for(selection = selections; selection; selection = g_list_next(selection))
+	{
+		lib3270_selection * block = ((lib3270_selection *) selection->data);
+		unsigned int row, src = 0;
+
+		for(row=0; row < block->bounds.height; row++)
+		{
+			size_t hasSelection = FALSE;
+			unsigned int col;
+
+			for(col=0; col<block->bounds.width; col++)
+			{
+				if( (block->contents[src].attribute.visual & LIB3270_ATTR_SELECTED) || all )
+				{
+					hasSelection = TRUE;
+					if(col < from_col)
+						from_col = col;
+					if(col > to_col)
+						to_col = col;
+				}
+				src++;
+			}
+
+			if(hasSelection)
+			{
+				rows++;
+			}
+
+		}
+
+	}
+
+	debug("Selection rows=%u cols=%u",(unsigned int) rows, (unsigned int) (to_col - from_col));
+
+	if(!(rows || (from_col > to_col)))
+		return NULL;
+
+	gint width	= ((to_col - from_col)+1) * terminal->font.width;
+	gint height	= rows * terminal->font.spacing.value;
+
+	debug("%s: width=%d height=%d",__FUNCTION__,width,height);
+
+	cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+
+	cairo_t *cr = cairo_create(surface);
+#ifdef DEBUG
+	gdk_cairo_set_source_rgba(cr,terminal->color+V3270_COLOR_BLUE);
+#else
+	gdk_cairo_set_source_rgba(cr,terminal->color+V3270_COLOR_BACKGROUND);
+#endif // DEBUG
+	cairo_rectangle(cr, 0, 0, width, height);
+	cairo_fill(cr);
+	cairo_stroke(cr);
+
+	// Draw contents
+	GdkRectangle rect;
+	memset(&rect,0,sizeof(rect));
+	rect.width	= terminal->font.width;
+	rect.height	= terminal->font.spacing.value;
+
+	cairo_set_scaled_font(cr,terminal->font.scaled);
+
+	for(selection = selections; selection; selection = g_list_next(selection))
+	{
+		lib3270_selection * block = ((lib3270_selection *) selection->data);
+		unsigned int row, col, src = 0;
+
+		for(row=0; row < block->bounds.height; row++)
+		{
+			size_t hasSelection = FALSE;
+			rect.x = 0;
+
+			src += from_col;
+			for(col=from_col; col<block->bounds.width; col++)
+			{
+				if( (block->contents[src].attribute.visual & LIB3270_ATTR_SELECTED) || all )
+				{
+					hasSelection = TRUE;
+
+					v3270_draw_element(
+						cr,
+						block->contents[src].chr,
+						block->contents[src].attribute.visual & ~LIB3270_ATTR_SELECTED,
+						terminal->host,
+						&terminal->font,
+						&rect,
+						terminal->color
+					);
+
+				}
+				src++;
+				rect.x += rect.width;
+			}
+
+			if(hasSelection)
+			{
+				rect.y += terminal->font.spacing.value;
+			}
+
+		}
+	}
+
+	cairo_destroy(cr);
+
+	GdkPixbuf * pixbuf = gdk_pixbuf_get_from_surface(surface,0,0,width,height);
+
+	cairo_surface_destroy(surface);
+
+	return pixbuf;
+
+}
@@ -151,7 +151,7 @@ void v3270_selection_set_font_family(GtkWidget *widget, const gchar *name) {
 		terminal->selection.font_family	= g_strdup(name);
 	}
-	v3270_emit_save_settings(widget);
+	v3270_emit_save_settings(widget,NULL);
 }
@@ -181,7 +181,7 @@ void v3270_selection_set_color_scheme(GtkWidget *widget, const gchar *name) {
 		terminal->selection.color.scheme = g_strdup(name);
 	}
-	v3270_emit_save_settings(widget);
+	v3270_emit_save_settings(widget,NULL);
 }
@@ -104,6 +104,20 @@ static void clipboard_get(G_GNUC_UNUSED  GtkClipboard *clipboard, GtkSelectionDa
 		}
 		break;
+	case CLIPBOARD_TYPE_PIXBUFF:
+		{
+			GdkPixbuf * pixbuff = v3270_get_selection_as_pixbuf(terminal, terminal->selection.blocks, FALSE);
+
+			debug("%s: pixbuff=%p (blocks=%p)",__FUNCTION__,pixbuff,terminal->selection.blocks);
+
+			if(pixbuff)
+			{
+				gtk_selection_data_set_pixbuf(selection,pixbuff);
+				g_object_unref(pixbuff);
+			}
+		}
+		break;
+
 	default:
 		g_warning("Unexpected clipboard type %d\n",target);
 	}
@@ -143,6 +157,11 @@ void v3270_update_system_clipboard(GtkWidget *widget)
 	}
+	if(terminal->selection.options & V3270_SELECTION_PIXBUFF)
+	{
+		gtk_target_list_add_image_targets(list,CLIPBOARD_TYPE_PIXBUFF,TRUE);
+	}
+
 	int				  n_targets;
 	GtkTargetEntry	* targets = gtk_target_table_new_from_list(list, &n_targets);
@@ -246,7 +246,7 @@
  }
  static gboolean bg_notify_enabled(GObject *action) {
- 	debug("%s(%s,%s,%d)",__FUNCTION__,g_action_get_name(G_ACTION(action)),(g_action_get_enabled(G_ACTION(action)) ? "enabled" : "disabled"),(int) v3270_action_get_group(G_ACTION(action)));
+// 	debug("%s(%s,%s,%d)",__FUNCTION__,g_action_get_name(G_ACTION(action)),(g_action_get_enabled(G_ACTION(action)) ? "enabled" : "disabled"),(int) v3270_action_get_group(G_ACTION(action)));
 	g_object_notify(action, "enabled");
 	return FALSE;
  }
@@ -56,7 +56,7 @@
 		// Standard Clipboard actions
 		{
-			.flags = V3270_COPY_SMART,
+			.flags = (V3270_ACTION_FLAGS) V3270_COPY_SMART,
 			.name = "copy",
 			.keys = "<Primary>c",
 			.group = LIB3270_ACTION_GROUP_SELECTION,
@@ -70,7 +70,7 @@
 		{
 			.name = "copy-append",
 			.keys = "<Alt>c",
-			.flags = V3270_COPY_APPEND,
+			.flags = (V3270_ACTION_FLAGS) V3270_COPY_APPEND,
 			.group = LIB3270_ACTION_GROUP_SELECTION,
 			.label = N_( "Add to copy" ),
 			.summary = N_("Append selection to clipboard"),
@@ -81,7 +81,7 @@
 		{
 			.name = "copy-text",
 			.keys = "<Primary><Shift>c",
-			.flags = V3270_COPY_TEXT,
+			.flags = (V3270_ACTION_FLAGS) V3270_COPY_TEXT,
 			.group = LIB3270_ACTION_GROUP_SELECTION,
 			.icon = "edit-copy",
 			.label = N_( "Copy" ),
@@ -92,7 +92,7 @@
 		{
 			.name = "copy-table",
 			.keys = "<Shift><Alt>c",
-			.flags = V3270_COPY_TABLE,
+			.flags = (V3270_ACTION_FLAGS) V3270_COPY_TABLE,
 			.group = LIB3270_ACTION_GROUP_SELECTION,
 			.icon = "edit-copy",
 			.label = N_( "Copy as table" ),
@@ -234,7 +234,7 @@
 		},
 		{
-			.flags = LIB3270_CONTENT_ALL,
+			.flags = (V3270_ACTION_FLAGS) LIB3270_CONTENT_ALL,
 			.group = LIB3270_ACTION_GROUP_ONLINE,
 			.name = "save-all",
 			.label = N_("Save all"),
@@ -245,7 +245,7 @@
 		},
 		{
-			.flags = LIB3270_CONTENT_SELECTED,
+			.flags = (V3270_ACTION_FLAGS) LIB3270_CONTENT_SELECTED,
 			.group = LIB3270_ACTION_GROUP_SELECTION,
 			.name = "save-selected",
 			.label = N_("Save selected"),
@@ -256,7 +256,7 @@
 		},
 		{
-			.flags = LIB3270_CONTENT_COPY,
+			.flags = (V3270_ACTION_FLAGS) LIB3270_CONTENT_COPY,
 			.group = LIB3270_ACTION_GROUP_COPY,
 			.name = "save-copy",
 			.label = N_("Save copy"),
@@ -281,7 +281,7 @@
 		},
 		{
-			.flags = LIB3270_CONTENT_ALL,
+			.flags = (V3270_ACTION_FLAGS) LIB3270_CONTENT_ALL,
 			.group = LIB3270_ACTION_GROUP_ONLINE,
 			.name = "print-all",
 			.icon = "document-print",
@@ -292,7 +292,7 @@
 		},
 		{
-			.flags = LIB3270_CONTENT_SELECTED,
+			.flags = (V3270_ACTION_FLAGS) LIB3270_CONTENT_SELECTED,
 			.group = LIB3270_ACTION_GROUP_SELECTION,
 			.name = "print-selected",
 			.icon = "document-print",
@@ -303,7 +303,7 @@
 		},
 		{
-			.flags = LIB3270_CONTENT_COPY,
+			.flags = (V3270_ACTION_FLAGS) LIB3270_CONTENT_COPY,
 			.group = LIB3270_ACTION_GROUP_COPY,
 			.name = "print-copy",
 			.icon = "document-print",
@@ -112,7 +112,7 @@
  	return G_VARIANT_TYPE_BOOLEAN;
  }
- static gboolean get_enabled(GAction *action, GtkWidget *terminal) {
+ static gboolean get_enabled(GAction G_GNUC_UNUSED(*action), GtkWidget G_GNUC_UNUSED(*terminal)) {
  	return TRUE;
  }
@@ -126,7 +126,7 @@
  }
- void Lib3270ToggleAction_init(Lib3270ToggleAction *action) {
+ void Lib3270ToggleAction_init(Lib3270ToggleAction G_GNUC_UNUSED(*action)) {
  }
  GAction * g_action_new_from_toggle(const LIB3270_TOGGLE * definition) {
@@ -43,19 +43,41 @@
  #include <lib3270.h>
  #include <lib3270/session.h>
  #include <lib3270/log.h>
+ #include <lib3270/popup.h>
  #include <errno.h>
+ #include <v3270/settings.h>
 /*--[ Implement ]------------------------------------------------------------------------------------*/
-static void set_timer(H3270 *session, unsigned char on)
+struct has_timer
 {
-	GtkWidget *widget = GTK_WIDGET(lib3270_get_user_data(session));
+	H3270			* hSession;
+	unsigned char	  on;
+};
+
+static gboolean bg_has_timer(struct has_timer *data)
+{
+	GtkWidget *widget = GTK_WIDGET(lib3270_get_user_data(data->hSession));
-	if(on)
+	if(data->on)
 		v3270_start_timer(widget);
 	else
 		v3270_stop_timer(widget);
+	g_free(data);
+
+	return FALSE;
+}
+
+static void set_timer(H3270 *session, unsigned char on)
+{
+	struct has_timer *data = g_malloc0(sizeof(struct has_timer));
+
+	data->hSession = session;
+	data->on = on;
+
+	g_idle_add((GSourceFunc) bg_has_timer, data);
+
 }
 static void update_toggle(H3270 *session, LIB3270_TOGGLE_ID id, unsigned char value, G_GNUC_UNUSED LIB3270_TOGGLE_TYPE reason, const char *name)
@@ -91,7 +113,8 @@ static gboolean	v3270_update_url(v3270 *terminal)
 {
 	GtkWidget * widget = GTK_WIDGET(terminal);
 	debug("url=%s",v3270_get_url(widget));
-	v3270_notify_setting(widget,V3270_SETTING_URL);
+
+	v3270_emit_save_settings(widget,"url");
 	v3270_signal_emit(widget, V3270_SIGNAL_SESSION_CHANGED);
 	return FALSE;
 }
@@ -180,9 +203,7 @@ static void update_model(H3270 *session, const char *name, int model, G_GNUC_UNU
 {
 	GtkWidget * widget = GTK_WIDGET(lib3270_get_user_data(session));
-	debug("%s: terminal=%p pspec=%p",__FUNCTION__,widget,GTK_V3270_GET_CLASS(widget)->properties.settings[V3270_SETTING_MODEL_NUMBER]);
-	g_object_notify_by_pspec(G_OBJECT(widget), GTK_V3270_GET_CLASS(widget)->properties.settings[V3270_SETTING_MODEL_NUMBER]);
-
+//	g_object_notify_by_pspec(G_OBJECT(widget), GTK_V3270_GET_CLASS(widget)->properties.settings[V3270_SETTING_MODEL_NUMBER]);
 	v3270_signal_emit(widget,V3270_SIGNAL_MODEL_CHANGED, (guint) model, name);
 }
@@ -255,18 +276,20 @@ static void update_selection(H3270 *session, G_GNUC_UNUSED int start, G_GNUC_UNU
 }
-static void message(H3270 *session, LIB3270_NOTIFY id , const char *title, const char *message, const char *text)
+/*
+static void message(H3270 *session, LIB3270_NOTIFY type , const char *title, const char *message, const char *text)
 {
-	v3270_signal_emit(
-		GTK_WIDGET(lib3270_get_user_data(session)),
-		V3270_SIGNAL_MESSAGE,
-		(int) id,
-		(gchar *) title,
-		(gchar *) message,
-		(gchar *) text
-	);
+	LIB3270_POPUP popup = {
+		.type = type,
+		.title = title,
+		.summary = message,
+		.body = text
+	};
+
+	v3270_popup_dialog_show(GTK_WIDGET(lib3270_get_user_data(session)),&popup,0);
 }
+*/
 static int print(H3270 *session, LIB3270_CONTENT_OPTION mode)
 {
@@ -303,27 +326,26 @@ static int load(H3270 *session, const char *filename)
 	return 0;
 }
+/*
 static void popup_handler(H3270 *session, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, va_list args)
 {
- 	GtkWidget *terminal = (GtkWidget *) lib3270_get_user_data(session);
+	LIB3270_POPUP popup = {
+		.type = type,
+		.title = title,
+		.summary = msg
+	};
- 	if(terminal && GTK_IS_V3270(terminal))
-	{
+	g_autofree gchar * body = NULL;
-		if(fmt)
-		{
-			gchar *text = g_strdup_vprintf(fmt,args);
-			v3270_popup_message(GTK_WIDGET(terminal),type,title,msg,text);
-			g_free(text);
-		}
-		else
-		{
-			v3270_popup_message(GTK_WIDGET(terminal),type,title,msg,NULL);
-		}
+	if(fmt) {
+		body = g_strdup_vprintf(fmt,args);
+		popup.body = body;
+	}
- 	}
+	v3270_popup_dialog_show(GTK_WIDGET(lib3270_get_user_data(session)),&popup,0);
  }
+ */
  static gboolean bg_update_ssl(H3270 *session)
  {
@@ -362,6 +384,7 @@ static void popup_handler(H3270 *session, LIB3270_NOTIFY type, const char *title
 	g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,(GSourceFunc) bg_update_oia, data, g_free);
  }
+ /*
  static int popup_ssl_error(H3270 *session, int rc, const char *title, const char *summary, const char *body)
  {
  	GtkWidget *terminal = (GtkWidget *) lib3270_get_user_data(session);
@@ -411,17 +434,47 @@ static void popup_handler(H3270 *session, LIB3270_NOTIFY type, const char *title
 	return -1;
  }
+ */
+
+ static int popup(H3270 *hSession, const LIB3270_POPUP *popup, unsigned char wait) {
+
+	GtkResponseType response = v3270_popup_dialog_show(
+									GTK_WIDGET(lib3270_get_user_data(hSession)),
+									popup,
+									wait != 0);
+
+	if(response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY)
+		return 0;
+
+	return errno = ECANCELED;
+
+ }
  void v3270_install_callbacks(v3270 *widget)
  {
 	struct lib3270_session_callbacks *cbk;
-	lib3270_set_popup_handler(widget->host, popup_handler);
-
-	cbk = lib3270_get_session_callbacks(widget->host,sizeof(struct lib3270_session_callbacks));
+	cbk = lib3270_get_session_callbacks(widget->host,G_STRINGIFY(LIB3270_REVISION),sizeof(struct lib3270_session_callbacks));
 	if(!cbk)
 	{
-		g_error( _( "Invalid callback table, possible version mismatch in lib3270") );
+		if(g_ascii_strcasecmp(G_STRINGIFY(LIB3270_REVISION),lib3270_get_revision()))
+		{
+			g_error(
+				_("Invalid callback table, the release %s of lib%s can't be used (expecting revision %s)"),
+				lib3270_get_revision(),
+				G_STRINGIFY(LIB3270_NAME),
+				G_STRINGIFY(LIB3270_REVISION)
+			);
+		}
+		else
+		{
+			g_error(
+				_("Unexpected callback table, the release %s of lib%s is invalid"),
+				lib3270_get_revision(),
+				G_STRINGIFY(LIB3270_NAME)
+			);
+		}
+
 		return;
 	}
@@ -445,12 +498,11 @@ static void popup_handler(H3270 *session, LIB3270_NOTIFY type, const char *title
 	cbk->update_model		= update_model;
 	cbk->changed			= changed;
 	cbk->ctlr_done			= ctlr_done;
-	cbk->message			= message;
 	cbk->update_ssl			= update_ssl;
 	cbk->print				= print;
 	cbk->save				= save;
 	cbk->load				= load;
-	cbk->popup_ssl_error	= popup_ssl_error;
+	cbk->popup				= popup;
 }
@@ -40,6 +40,7 @@
  #include <lib3270/charset.h>
  #include <lib3270/log.h>
  #include <v3270/dialogs.h>
+ #include <v3270/settings.h>
  #define ERROR_DOMAIN g_quark_from_static_string(PACKAGE_NAME)
@@ -337,8 +338,7 @@
 	g_free(cfg.host);
 	g_free(cfg.display);
-	debug("%s=%p",__FUNCTION__,GTK_V3270_GET_CLASS(widget)->properties.settings[V3270_SETTING_REMAP_FILE]);
-	v3270_notify_setting(widget,V3270_SETTING_REMAP_FILE);
+	v3270_emit_save_settings(widget,"remap_file");
  }
@@ -36,40 +36,92 @@
 /*--[ Implement ]------------------------------------------------------------------------------------*/
-const gchar * v3270_get_default_colors() {
-
-	return	"#000000,"			// V3270_COLOR_BACKGROUND
-			"#7890F0,"			// V3270_COLOR_BLUE
-			"#FF0000,"			// V3270_COLOR_RED
-			"#FF00FF,"			// V3270_COLOR_PINK
-			"#00FF00,"			// V3270_COLOR_GREEN
-			"#00FFFF,"			// V3270_COLOR_TURQUOISE
-			"#FFFF00,"			// V3270_COLOR_YELLOW
-			"#FFFFFF,"			// V3270_COLOR_WHITE
-			"#000000,"			// V3270_COLOR_BLACK
-			"#000080,"			// V3270_COLOR_DARK_BLUE
-			"#FFA200,"			// V3270_COLOR_ORANGE
-			"#800080,"			// V3270_COLOR_PURPLE
-			"#008000,"			// V3270_COLOR_DARK_GREEN
-			"#008080,"			// V3270_COLOR_DARK_TURQUOISE
-			"#A0A000,"			// V3270_COLOR_MUSTARD
-			"#C0C0C0,"			// V3270_COLOR_GRAY
-
-			"#00FF00,"			// V3270_COLOR_FIELD_DEFAULT
-			"#FF0000,"			// V3270_COLOR_FIELD_INTENSIFIED
-			"#00FFFF,"			// V3270_COLOR_FIELD_PROTECTED
-			"#FFFFFF,"			// V3270_COLOR_FIELD_PROTECTED_INTENSIFIED
-
-			"#404040,"			// V3270_COLOR_SELECTED_BG
-			"#FFFFFF,"			// V3270_COLOR_SELECTED_FG,
-
-			"#00FF00," 			// V3270_COLOR_CROSS_HAIR
-
-			"#000000,"	 		// V3270_COLOR_OIA_BACKGROUND
-			"#00FF00,"			// V3270_COLOR_OIA
-			"#7890F0,"			// V3270_COLOR_OIA_SEPARATOR
-			"#FFFFFF,"			// V3270_COLOR_OIA_STATUS_OK
-			"#FFFF00,"			// V3270_COLOR_OIA_STATUS_WARNING
+const gchar * v3270_get_default_colors()
+{
+
+#ifdef _WIN32
+	{
+		HKEY hKey;
+		DWORD disp = 0;
+		LSTATUS	rc = RegCreateKeyEx(
+						HKEY_LOCAL_MACHINE,
+						"Software\\" LIB3270_STRINGIZE_VALUE_OF(PRODUCT_NAME),
+						0,
+						NULL,
+						REG_OPTION_NON_VOLATILE,
+						KEY_QUERY_VALUE|KEY_READ,
+						NULL,
+						&hKey,
+						&disp);
+
+		debug("%s=%d","Software\\" LIB3270_STRINGIZE_VALUE_OF(PRODUCT_NAME),rc);
+
+		if(rc == ERROR_SUCCESS)
+		{
+			static char * default_colors = NULL;
+			DWORD cbData = 4096;
+
+			if(!default_colors)
+			{
+				default_colors = (char *) malloc(cbData+1);
+			}
+			else
+			{
+				default_colors = (char *) realloc(default_colors,cbData+1);
+			}
+
+			DWORD dwRet = RegQueryValueEx(hKey,"colors",NULL,NULL,(LPBYTE) default_colors, &cbData);
+
+			debug("dwRet=%d",dwRet);
+
+			RegCloseKey(hKey);
+
+			if(dwRet == ERROR_SUCCESS)
+			{
+				default_colors = (char *) realloc(default_colors,cbData+1);
+                default_colors[cbData] = 0;
+
+                return default_colors;
+			}
+
+			free(default_colors);
+			default_colors = NULL;
+		}
+	}
+#endif // _WIN32
+
+	return	"#000000;"			// V3270_COLOR_BACKGROUND
+			"#7890F0;"			// V3270_COLOR_BLUE
+			"#FF0000;"			// V3270_COLOR_RED
+			"#FF00FF;"			// V3270_COLOR_PINK
+			"#00FF00;"			// V3270_COLOR_GREEN
+			"#00FFFF;"			// V3270_COLOR_TURQUOISE
+			"#FFFF00;"			// V3270_COLOR_YELLOW
+			"#FFFFFF;"			// V3270_COLOR_WHITE
+			"#000000;"			// V3270_COLOR_BLACK
+			"#000080;"			// V3270_COLOR_DARK_BLUE
+			"#FFA200;"			// V3270_COLOR_ORANGE
+			"#800080;"			// V3270_COLOR_PURPLE
+			"#008000;"			// V3270_COLOR_DARK_GREEN
+			"#008080;"			// V3270_COLOR_DARK_TURQUOISE
+			"#A0A000;"			// V3270_COLOR_MUSTARD
+			"#C0C0C0;"			// V3270_COLOR_GRAY
+
+			"#00FF00;"			// V3270_COLOR_FIELD_DEFAULT
+			"#FF0000;"			// V3270_COLOR_FIELD_INTENSIFIED
+			"#00FFFF;"			// V3270_COLOR_FIELD_PROTECTED
+			"#FFFFFF;"			// V3270_COLOR_FIELD_PROTECTED_INTENSIFIED
+
+			"#404040;"			// V3270_COLOR_SELECTED_BG
+			"#FFFFFF;"			// V3270_COLOR_SELECTED_FG,
+
+			"#00FF00;" 			// V3270_COLOR_CROSS_HAIR
+
+			"#000000;"	 		// V3270_COLOR_OIA_BACKGROUND
+			"#00FF00;"			// V3270_COLOR_OIA
+			"#7890F0;"			// V3270_COLOR_OIA_SEPARATOR
+			"#FFFFFF;"			// V3270_COLOR_OIA_STATUS_OK
+			"#FFFF00;"			// V3270_COLOR_OIA_STATUS_WARNING
 			"#FFFF00";			// V3270_COLOR_OIA_STATUS_INVALID
 }
@@ -83,7 +135,7 @@ LIB3270_EXPORT void v3270_set_colors(GtkWidget *widget, const gchar *colors)
 	}
 	v3270_set_color_table(GTK_V3270(widget)->color,colors);
-	v3270_emit_save_settings(widget);
+	v3270_emit_save_settings(widget,NULL);
 	v3270_reload(widget);
 }
@@ -524,6 +524,29 @@ LIB3270_EXPORT void v3270_reload(GtkWidget *widget)
 }
+GdkPixbuf * v3270_get_as_pixbuf(GtkWidget *widget)
+{
+	v3270 * terminal = GTK_V3270(widget);
+
+	if(!(gtk_widget_get_realized(widget) && terminal->drawing))
+		return NULL;
+
+	gint width	= gtk_widget_get_allocated_width(widget);
+	gint height	= gtk_widget_get_allocated_height(widget);
+
+	cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+
+	cairo_t *cr = cairo_create(surface);
+	v3270_redraw(terminal, cr, width, height);
+	cairo_destroy (cr);
+
+	GdkPixbuf * pixbuf = gdk_pixbuf_get_from_surface(surface,0,0,width,height);
+
+	cairo_surface_destroy (surface);
+
+	return pixbuf;
+}
+
 void v3270_update_char(H3270 *session, int addr, unsigned char chr, unsigned short attr, unsigned char cursor)
 {
 	v3270					* terminal = GTK_V3270(lib3270_get_user_data(session));
@@ -827,6 +827,7 @@ struct timer_info
 static void release_timer(struct timer_info *info)
 {
 	info->terminal->timer = NULL;
+	g_object_notify_by_pspec(G_OBJECT(info->terminal),GTK_V3270_GET_CLASS(info->terminal)->properties.has_timer);
 	if(info->terminal->surface)
 	{
@@ -1051,6 +1052,8 @@ void v3270_start_timer(GtkWidget *widget)
 	terminal->timer = g_timeout_source_new(100);
 	g_source_set_callback(terminal->timer,(GSourceFunc) update_timer, info, (GDestroyNotify) release_timer);
+	g_object_notify_by_pspec(G_OBJECT(terminal),GTK_V3270_GET_CLASS(widget)->properties.has_timer);
+
 	g_source_attach(terminal->timer,NULL);
 	g_source_unref(terminal->timer);
@@ -47,11 +47,65 @@ static const gchar * invalid_font_messages[] = {
 const gchar * v3270_get_default_font_name()
 {
 #if defined(_WIN32)
-	return "Lucida Console";
+	{
+		HKEY hKey;
+		DWORD disp = 0;
+		LSTATUS	rc = RegCreateKeyEx(
+						HKEY_LOCAL_MACHINE,
+						"Software\\" LIB3270_STRINGIZE_VALUE_OF(PRODUCT_NAME),
+						0,
+						NULL,
+						REG_OPTION_NON_VOLATILE,
+						KEY_QUERY_VALUE|KEY_READ,
+						NULL,
+						&hKey,
+						&disp);
+
+		debug("%s=%d","Software\\" LIB3270_STRINGIZE_VALUE_OF(PRODUCT_NAME),rc);
+
+		if(rc == ERROR_SUCCESS)
+		{
+			static char * default_font_name = NULL;
+			DWORD cbData = 4096;
+
+			if(!default_font_name)
+			{
+				default_font_name = (char *) malloc(cbData+1);
+			}
+			else
+			{
+				default_font_name = (char *) realloc(default_font_name,cbData+1);
+			}
+
+			DWORD dwRet = RegQueryValueEx(hKey,"font-family",NULL,NULL,(LPBYTE) default_font_name, &cbData);
+
+			debug("dwRet=%d",dwRet);
+
+			RegCloseKey(hKey);
+
+			if(dwRet == ERROR_SUCCESS)
+			{
+				default_font_name = (char *) realloc(default_font_name,cbData+1);
+                default_font_name[cbData] = 0;
+                return default_font_name;
+			}
+
+			free(default_font_name);
+			default_font_name = NULL;
+		}
+	}
+
+	// TODO: Search for a valid font-family
+	return "Courier New";
+
 #elif defined(__APPLE__)
+
 	return "Courier New";
+
 #else
+
 	return "monospace";
+
 #endif // _WIN32
 }
@@ -108,10 +162,7 @@ LIB3270_EXPORT void v3270_set_font_family(GtkWidget *widget, const gchar *name)
 		terminal->font.family = g_strdup(name);
 		terminal->font.weight = lib3270_get_toggle(terminal->host,LIB3270_TOGGLE_BOLD) ? CAIRO_FONT_WEIGHT_BOLD : CAIRO_FONT_WEIGHT_NORMAL;
-		v3270_emit_save_settings(widget);
-
-		debug("%s: %p",__FUNCTION__,GTK_V3270_GET_CLASS(widget)->properties.settings[V3270_SETTING_FONT_FAMILY]);
-		v3270_notify_setting(widget,V3270_SETTING_FONT_FAMILY);
+		v3270_emit_save_settings(widget,"font_family");
 		if(gtk_widget_get_realized(widget) && gtk_widget_get_has_window(widget))
 		{
@@ -123,13 +174,6 @@ LIB3270_EXPORT void v3270_set_font_family(GtkWidget *widget, const gchar *name)
 }
-void v3270_notify_setting(GtkWidget *widget, V3270_SETTING id)
-{
-	debug("%s(%u)",__FUNCTION__,(unsigned int) id);
-	g_object_notify_by_pspec(G_OBJECT(widget), GTK_V3270_GET_CLASS(widget)->properties.settings[id]);
-	v3270_emit_save_settings(widget);
-}
-
 LIB3270_EXPORT const gchar * v3270_get_font_family(GtkWidget *widget)
 {
 	g_return_val_if_fail(GTK_IS_V3270(widget),NULL);
@@ -37,7 +37,7 @@ static void				* static_AddSource(H3270 *session, int fd, LIB3270_IO_FLAG flag, 
 static void	  			  static_RemoveSource(H3270 *session, void *id);
 static void      		  static_SetSourceState(H3270 *session, void *id, int enabled);
-static void 			* static_AddTimer(H3270 *session, unsigned long interval_ms, int (*proc)(H3270 *session));
+static void 			* static_AddTimer(H3270 *session, unsigned long interval_ms, int (*proc)(H3270 *session, void *userdata), void *userdata);
 static void 			  static_RemoveTimer(H3270 *session, void * timer);
 static int				  static_Sleep(H3270 *hSession, int seconds);
 static int 				  static_RunPendingEvents(H3270 *hSession, int wait);
@@ -48,7 +48,7 @@ static int 				  static_RunPendingEvents(H3270 *hSession, int wait);
  {
 	unsigned char remove;
 	void	* userdata;
-	int		(*call)(H3270 *session);
+	int		(*call)(H3270 *session, void *userdata);
 	H3270 	* session;
  } TIMER;
@@ -74,17 +74,18 @@ static void static_SetSourceState(G_GNUC_UNUSED H3270 *session, void *id, int en
 static gboolean do_timer(TIMER *t)
 {
 	if(!t->remove)
-		return t->call(t->session) != 0;
+		return t->call(t->session,t->userdata);
 	return FALSE;
 }
-static void * static_AddTimer(H3270 *session, unsigned long interval, int (*call)(H3270 *session))
+static void * static_AddTimer(H3270 *session, unsigned long interval, int (*call)(H3270 *session, void *userdata), void *userdata)
 {
 	TIMER *t = g_malloc0(sizeof(TIMER));
 	t->call		= call;
 	t->session	= session;
+	t->userdata	= userdata;
 	g_timeout_add_full(G_PRIORITY_DEFAULT, (guint) interval, (GSourceFunc) do_timer, t, g_free);
@@ -308,13 +308,17 @@
 	for(ix = 0; ix < G_N_ELEMENTS(klass->properties.toggle); ix++)
 		save_by_pspec(widget,klass->properties.toggle[ix],key_file,group_name);
-	// Save V3270 Responses
-	for(ix = 0; ix < G_N_ELEMENTS(terminal->responses); ix++)
-		save_by_pspec(widget,klass->responses[ix],key_file,group_name);
-
 	// Save V3270 properties
-	for(ix = 0; ix < V3270_SETTING_COUNT; ix++)
-		save_by_pspec(widget,klass->properties.settings[ix],key_file,group_name);
+	for(ix = 0; klass->properties.persistent[ix];ix++)
+	{
+		save_by_pspec(
+			widget,
+			g_object_class_find_property(G_OBJECT_CLASS(klass),klass->properties.persistent[ix]),
+			key_file,
+			group_name
+		);
+
+	}
  }
@@ -360,13 +364,17 @@
 	for(ix = 0; ix < G_N_ELEMENTS(klass->properties.toggle); ix++)
 		load_by_pspec(widget,klass->properties.toggle[ix],key_file,group_name);
-	// Load V3270 Responses
-	for(ix = 0; ix < G_N_ELEMENTS(terminal->responses); ix++)
-		load_by_pspec(widget,klass->responses[ix],key_file,group_name);
-
 	// Load V3270 properties
-	for(ix = 0; ix < V3270_SETTING_COUNT; ix++)
-		load_by_pspec(widget,klass->properties.settings[ix],key_file,group_name);
+	for(ix = 0; klass->properties.persistent[ix];ix++)
+	{
+		load_by_pspec(
+			widget,
+			g_object_class_find_property(G_OBJECT_CLASS(klass),klass->properties.persistent[ix]),
+			key_file,
+			group_name
+		);
+
+	}
 	g_object_thaw_notify(G_OBJECT(widget));
 	terminal->freeze = 0;
@@ -6,6 +6,8 @@ VOID:POINTER
 VOID:VOID,POINTER,POINTER
 VOID:VOID,UINT,POINTER
 BOOLEAN:UINT,ENUM
+UINT:POINTER
+BOOLEAN:POINTER,UINT
 VOID:VOID,BOOLEAN
 BOOLEAN:VOID,BOOLEAN,BOOLEAN,POINTER
 VOID:VOID,UINT,UINT
@@ -39,11 +39,13 @@
 // 	debug("%s(%u,%s)",__FUNCTION__,prop_id,g_param_spec_get_name(pspec));
+	/*
  	if(prop_id >= klass->properties.type.responses)
 	{
 		g_value_set_int(value,(int) window->responses[prop_id - klass->properties.type.responses]);
 	}
- 	else if(prop_id >= klass->properties.type.str)
+ 	else */
+	if(prop_id >= klass->properties.type.str)
 	{
 		const LIB3270_STRING_PROPERTY * prop = (lib3270_get_string_properties_list()+(prop_id - klass->properties.type.str));
 //		debug("%s.%s.%s",__FUNCTION__,"string",prop->name);
@@ -146,6 +148,11 @@
 		case V3270_PROPERTY_HAS_COPY:
 			g_value_set_boolean(value,window->selection.blocks != NULL);
 			break;
+
+		case V3270_PROPERTY_HAS_TIMER:
+			g_value_set_boolean(value,window->timer != NULL);
+			break;
+
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -43,15 +43,7 @@
  	} properties[] = {
  		{ "connected",				&klass->properties.online									},
  		{ "associated-lu",			&klass->properties.associated_lu							},
- 		{ "url",					&klass->properties.settings[V3270_SETTING_URL]				},
- 		{ "model-number",			&klass->properties.settings[V3270_SETTING_MODEL_NUMBER]		},
  		{ "has-selection",			&klass->properties.selection								},
- 		{ "oversize",				&klass->properties.settings[V3270_SETTING_OVERSIZE]			},
- 		{ "host-charset",			&klass->properties.settings[V3270_SETTING_HOST_CHARSET]		},
- 		{ "unlock-delay",			&klass->properties.settings[V3270_SETTING_UNLOCK_DELAY]		},
- 		{ "color-type",				&klass->properties.settings[V3270_SETTING_COLOR_TYPE]		},
- 		{ "host-type",				&klass->properties.settings[V3270_SETTING_HOST_TYPE]		},
- 		{ "crl-preferred-protocol",	&klass->properties.settings[V3270_SETTING_CRL_PROTOCOL]		},
  	};
  	size_t ix;
@@ -83,7 +75,7 @@
 	// Setup internal properties.
 	// Font family
-	klass->properties.settings[V3270_SETTING_FONT_FAMILY] =
+	spec =
 		g_param_spec_string(
 			"font_family",
 			"font_family",
@@ -95,7 +87,7 @@
 	g_object_class_install_property(
 		gobject_class,
 		V3270_PROPERTY_FONT_FAMILY,
-		klass->properties.settings[V3270_SETTING_FONT_FAMILY]
+		spec
 	);
 	// Session name.
@@ -114,7 +106,7 @@
 	);
 	// Auto disconnect
-	klass->properties.settings[V3270_SETTING_AUTO_DISCONNECT] =
+	spec =
 		g_param_spec_uint(
 			"auto_disconnect",
 			"auto_disconnect",
@@ -128,7 +120,7 @@
 	g_object_class_install_property(
 		gobject_class,
 		V3270_PROPERTY_AUTO_DISCONNECT,
-		klass->properties.settings[V3270_SETTING_AUTO_DISCONNECT]
+		spec
 	);
 	// Clipboard
@@ -147,7 +139,7 @@
 	);
 	// Remap file
-	klass->properties.settings[V3270_SETTING_REMAP_FILE] =
+	spec =
 		g_param_spec_string(
 			"remap_file",
 			"remap_file",
@@ -159,11 +151,11 @@
 	g_object_class_install_property(
 		gobject_class,
 		V3270_PROPERTY_REMAP_FILE,
-		klass->properties.settings[V3270_SETTING_REMAP_FILE]
+		spec
 	);
 	// Dynamic font spacing
-	klass->properties.settings[V3270_SETTING_DYNAMIC_SPACING] =
+	spec =
 		g_param_spec_boolean(
 			"dynamic_font_spacing",
 			"dynamic_font_spacing",
@@ -175,11 +167,11 @@
 	g_object_class_install_property(
 		gobject_class,
 		V3270_PROPERTY_DYNAMIC_SPACING,
-		klass->properties.settings[V3270_SETTING_DYNAMIC_SPACING]
+		spec
 	);
 	// Lu names
-	klass->properties.settings[V3270_SETTING_LU_NAMES] =
+	spec =
 		g_param_spec_string(
 			"lu_names",
 			"lu_names",
@@ -191,7 +183,7 @@
 	g_object_class_install_property(
 		gobject_class,
 		V3270_PROPERTY_LU_NAMES,
-		klass->properties.settings[V3270_SETTING_LU_NAMES]
+		spec
 	);
 	// Trace
@@ -209,7 +201,7 @@
 	);
 	// Colors
-	klass->properties.settings[V3270_SETTING_TERMINAL_COLORS] =
+	spec =
 		g_param_spec_string(
 			"colors",
 			"colors",
@@ -221,11 +213,11 @@
 	g_object_class_install_property(
 		gobject_class,
 		V3270_PROPERTY_TERMINAL_COLORS,
-		klass->properties.settings[V3270_SETTING_TERMINAL_COLORS]
+		spec
 	);
 	// Clipboard options
-	klass->properties.settings[V3270_SETTING_SELECTION_OPTIONS] =
+	spec =
 		g_param_spec_uint(
 			"selection_flags",
 			"selection_flags",
@@ -239,10 +231,9 @@
 	g_object_class_install_property(
 		gobject_class,
 		V3270_PROPERTY_SELECTION_OPTIONS,
-		klass->properties.settings[V3270_SETTING_SELECTION_OPTIONS]
+		spec
 	);
-
 	klass->properties.has_copy =
 		g_param_spec_boolean(
 			"has_copy",
@@ -258,6 +249,20 @@
 		klass->properties.has_copy
 	);
+	klass->properties.has_timer =
+		g_param_spec_boolean(
+			"has_timer",
+			"has_timer",
+			_( "True if the timer indicator is active" ),
+			FALSE,
+			G_PARAM_READABLE
+		);
+
+	g_object_class_install_property(
+		gobject_class,
+		V3270_PROPERTY_HAS_TIMER,
+		klass->properties.has_timer
+	);
 	//
 	// Create dynamic properties
@@ -385,6 +390,7 @@
 	//
 	// Create action properties.
 	//
+	/*
 	klass->properties.type.responses = klass->properties.count;
 	static const struct
@@ -422,7 +428,7 @@
 		}
 	}
-
+	*/
  }
@@ -59,8 +59,9 @@
 	V3270_PROPERTY_TERMINAL_COLORS		= 10,	///< @brief Terminal colors.
 	V3270_PROPERTY_SELECTION_OPTIONS	= 11,
 	V3270_PROPERTY_HAS_COPY				= 12,	///< @brief Terminal has copy.
+	V3270_PROPERTY_HAS_TIMER			= 13,	///< @brief Timer indicator state.
-	V3270_PROPERTY_DYNAMIC				= 13	///< @brief Id of the first LIB3270 internal property.
+	V3270_PROPERTY_DYNAMIC				= 14	///< @brief Id of the first LIB3270 internal property.
  };
  G_GNUC_INTERNAL void v3270_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
@@ -29,6 +29,7 @@
  #include "private.h"
  #include <v3270/trace.h>
+ #include <v3270/settings.h>
 /*--[ Implement ]------------------------------------------------------------------------------------*/
@@ -256,7 +257,7 @@ LIB3270_EXPORT void v3270_set_auto_disconnect(GtkWidget *widget, guint minutes)
 	if(terminal->activity.disconnect != minutes)
 	{
 		terminal->activity.disconnect = minutes;
- 		v3270_notify_setting(widget,V3270_SETTING_AUTO_DISCONNECT);
+ 		v3270_emit_save_settings(widget,"auto_disconnect");
 	}
 }
@@ -273,7 +274,7 @@ LIB3270_EXPORT void	v3270_set_dynamic_font_spacing(GtkWidget *widget, gboolean s
 		terminal->font.spacing.dynamic = state;
 		v3270_reconfigure(terminal);
 		gtk_widget_queue_draw(widget);
- 		v3270_notify_setting(widget,V3270_SETTING_DYNAMIC_SPACING);
+		v3270_emit_save_settings(widget,"dynamic_font_spacing");
 	}
 }
@@ -282,6 +283,6 @@ LIB3270_EXPORT void v3270_set_lunames(GtkWidget *widget, const gchar *lunames)
 {
 	g_return_if_fail(GTK_IS_V3270(widget));
 	lib3270_set_lunames(GTK_V3270(widget)->host,(lunames && *lunames ? lunames : NULL));
-	v3270_notify_setting(widget,V3270_SETTING_LU_NAMES);
+	v3270_emit_save_settings(widget,"lu_names");
 }
@@ -58,6 +58,26 @@
  *
  */
+/// @brief Persistent properties (load/save from session file).
+static const gchar *persistent_properties[] = {
+		"url",
+		"model-number",
+		"oversize",
+		"host-charset",
+		"unlock-delay",
+		"color-type",
+		"host-type",
+		"crl-preferred-protocol",
+		"remap_file",
+		"dynamic_font_spacing",
+		"lu_names",
+		"font_family",
+		"auto_disconnect",
+		"colors",
+		"selection_flags",
+		NULL
+};
+
 /*--[ Widget definition ]----------------------------------------------------------------------------*/
  G_DEFINE_TYPE(v3270, v3270, GTK_TYPE_WIDGET);
@@ -201,12 +221,14 @@ static void finalize(GObject *object) {
 	G_OBJECT_CLASS(v3270_parent_class)->finalize(object);
  }
-static void v3270_class_init(v3270Class *klass)
-{
+ static void v3270_class_init(v3270Class *klass)
+ {
 	GObjectClass	* gobject_class	= G_OBJECT_CLASS(klass);
 	GtkWidgetClass	* widget_class	= GTK_WIDGET_CLASS(klass);
 	GtkBindingSet	* binding		= gtk_binding_set_by_class(klass);
+	klass->properties.persistent = persistent_properties;
+
 	// Setup widget key bindings
 	gtk_binding_entry_skip(binding,GDK_F10,0);
@@ -242,11 +264,11 @@ static void v3270_class_init(v3270Class *klass)
 	klass->activate									= v3270_activate;
 	klass->toggle_changed 							= v3270_toggle_changed;
 	klass->message_changed 							= v3270_update_message;
-	klass->popup_message							= v3270_popup_message;
 	// Register I/O Handlers
 	v3270_register_io_handlers(klass);
+
 	// Cursors
 	{
 #ifdef WIN32
@@ -428,15 +450,6 @@ static void v3270_class_init(v3270Class *klass)
 						v3270_VOID__VOID_UINT_UINT,
 						G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
-	v3270_widget_signal[V3270_SIGNAL_MESSAGE] =
-		g_signal_new(	I_("popup_message"),
-						G_OBJECT_CLASS_TYPE (gobject_class),
-						G_SIGNAL_RUN_FIRST,
-						G_STRUCT_OFFSET (v3270Class, popup_message),
-						NULL, NULL,
-						v3270_VOID__VOID_UINT_POINTER_POINTER_POINTER,
-						G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-
 	v3270_widget_signal[V3270_SIGNAL_FIELD] =
 		g_signal_new(	I_("field_clicked"),
 						G_OBJECT_CLASS_TYPE (gobject_class),
@@ -474,6 +487,24 @@ static void v3270_class_init(v3270Class *klass)
 						v3270_VOID__VOID,
 						G_TYPE_NONE, 0);
+	v3270_widget_signal[V3270_SIGNAL_LOAD_POPUP_RESPONSE] =
+		g_signal_new(	I_("load-popup-response"),
+						G_OBJECT_CLASS_TYPE (gobject_class),
+						G_SIGNAL_RUN_LAST,
+						0,
+						NULL, NULL,
+						v3270_UINT__POINTER,
+						G_TYPE_UINT, 1, G_TYPE_POINTER);
+
+	v3270_widget_signal[V3270_SIGNAL_SAVE_POPUP_RESPONSE] =
+		g_signal_new(	I_("save-popup-response"),
+						G_OBJECT_CLASS_TYPE (gobject_class),
+						G_SIGNAL_RUN_LAST,
+						0,
+						NULL, NULL,
+						v3270_BOOLEAN__POINTER_UINT,
+						G_TYPE_BOOLEAN, 2, G_TYPE_POINTER, G_TYPE_UINT);
+
 	v3270_init_properties(gobject_class);
 }
@@ -492,7 +523,7 @@ static void release_activity_timer(v3270 *widget)
 static void v3270_init(v3270 *widget)
 {
-	size_t ix;
+	// size_t ix;
 	widget->host = lib3270_session_new(NULL);
 	lib3270_set_user_data(widget->host,widget);
@@ -534,8 +565,10 @@ static void v3270_init(v3270 *widget)
 	v3270_font_info_init(&widget->font);
 	v3270_set_color_table(widget->color,v3270_get_default_colors());
+	/*
 	for(ix = 0; ix < G_N_ELEMENTS(widget->responses); ix++)
 		widget->responses[ix] = GTK_RESPONSE_NONE;
+	*/
 	// Init accelerators
 	v3270_init_accelerators(widget);
@@ -813,8 +846,11 @@ static gboolean bg_emit_save_settings(v3270 *terminal)
  	return FALSE;
 }
-LIB3270_EXPORT void v3270_emit_save_settings(GtkWidget *widget)
+LIB3270_EXPORT void v3270_emit_save_settings(GtkWidget *widget, const gchar *property_name)
 {
+	if(property_name)
+		g_object_notify(G_OBJECT(widget),property_name);
+
 	debug("%s(Freeze is %s)",__FUNCTION__,GTK_V3270(widget)->freeze ? "ON" : "OFF");
 	if(widget && GTK_IS_V3270(widget) && !GTK_V3270(widget)->freeze)
 	{
@@ -40,9 +40,13 @@
 BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwcallpurpose, LPVOID G_GNUC_UNUSED(lpvResvd))
 {
+    debug("%s starts",__FUNCTION__);
+
+	/*
     switch(dwcallpurpose)
     {
     case DLL_PROCESS_ATTACH:
+		debug("%s: DLL_PROCESS_ATTACH",__FUNCTION__);
     	{
 			char lpFilename[4096];
@@ -58,14 +62,16 @@ BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwcallpurpose, LPVOID G_GNUC_UNUSED(
 			bindtextdomain(GETTEXT_PACKAGE,lpFilename);
 			bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-
     	}
 		break;
 	case DLL_PROCESS_DETACH:
+		debug("%s: DLL_PROCESS_DETACH",__FUNCTION__);
 		break;
     }
+	*/
+    debug("%s ends",__FUNCTION__);
     return TRUE;
 }
@@ -263,10 +263,6 @@
 	for(ix = 0; ix < G_N_ELEMENTS(klass->properties.toggle); ix++)
 		save_by_pspec(widget,klass->properties.toggle[ix],hKey);
-	// Save V3270 Responses
-	for(ix = 0; ix < G_N_ELEMENTS(terminal->responses); ix++)
-		save_by_pspec(widget,klass->responses[ix],hKey);
-
 	// Save V3270 properties
 	for(ix = 0; ix < V3270_SETTING_COUNT; ix++)
 		save_by_pspec(widget,klass->properties.settings[ix],hKey);
@@ -328,10 +324,6 @@
 	for(ix = 0; ix < G_N_ELEMENTS(klass->properties.toggle); ix++)
 		load_by_pspec(widget,klass->properties.toggle[ix],hKey);
-	// Load V3270 Responses
-	for(ix = 0; ix < G_N_ELEMENTS(terminal->responses); ix++)
-		load_by_pspec(widget,klass->responses[ix],hKey);
-
 	// Load V3270 properties
 	for(ix = 0; ix < V3270_SETTING_COUNT; ix++)
 		load_by_pspec(widget,klass->properties.settings[ix],hKey);
@@ -71,35 +71,6 @@
  }
  */
-#ifdef _WIN32
-
- static int get_registry(HKEY *hKey,REGSAM samDesired)
- {
- 	DWORD	disp;
-
-	if(RegCreateKeyEx(HKEY_CURRENT_USER,"software\\v3270",0,NULL,REG_OPTION_NON_VOLATILE,samDesired,NULL,hKey,&disp) != ERROR_SUCCESS)
-	{
-		g_warning("Can't open registry");
-		return -1;
-	}
-
-	return 0;
-
- }
-
- static void save_settings(GtkWidget *terminal, GtkWidget *window)
- {
- 	HKEY hKey = 0;
-
-	if(get_registry(&hKey,KEY_SET_VALUE))
-		return;
-
-	v3270_to_registry(terminal,hKey,"terminal");
-	RegCloseKey(hKey);
- }
-
-#else
-
  static GKeyFile * get_key_file()
  {
 	GKeyFile * key_file = g_key_file_new();
@@ -109,7 +80,7 @@
  static void save_settings(GtkWidget *terminal, GtkWidget *window)
  {
- 	debug("%s: Saving settings for windows %p",__FUNCTION__,window);
+ 	debug("%s: Saving settings for window %p",__FUNCTION__,window);
  	GKeyFile * key_file = get_key_file();
@@ -122,8 +93,6 @@
  }
-#endif // _WIN32
-
  static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) {
 	GtkWidget	* window	= gtk_application_window_new(app);
@@ -132,7 +101,7 @@
 	GtkWidget	* notebook	= gtk_notebook_new();
 	// Hack to speed up the tests.
-	lib3270_disable_crl_download(v3270_get_session(terminal));
+	lib3270_ssl_set_crl_download(v3270_get_session(terminal),0);
 	gtk_box_pack_start(GTK_BOX(vBox),create_toolbar(terminal),FALSE,TRUE,0);
 	gtk_box_pack_start(GTK_BOX(vBox),notebook,TRUE,TRUE,0);
@@ -147,32 +116,12 @@
 		gtk_notebook_append_page(GTK_NOTEBOOK(notebook),terminal,gtk_label_new("Terminal"));
-#ifdef _WIN32
-		v3270_set_font_family(terminal,"Lucida Console");
-#endif // _WIN32
-
-		v3270_selection_set_font_family(terminal,"monospace");
-
 		// Load settings before connecting the signals.
-#ifdef _WIN32
-		{
- 			HKEY hKey = 0;
-
-			if(!get_registry(&hKey,KEY_SET_VALUE))
-			{
-				v3270_load_registry(terminal,hKey,"terminal");
-				RegCloseKey(hKey);
-			}
-
-		}
-#else
 		debug("%s: Loading settings...",__FUNCTION__);
 		GKeyFile * key_file = get_key_file();
 		v3270_load_key_file(terminal,key_file,NULL);
 		v3270_accelerator_map_load_key_file(terminal,key_file,NULL);
-
 		g_key_file_free(key_file);
-#endif // _WIN32
 	}
@@ -37,6 +37,7 @@
  #include <v3270/selection.h>
  #include <v3270/trace.h>
  #include <lib3270/log.h>
+ #include <lib3270/popup.h>
  #include <stdlib.h>
  #pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -103,9 +104,13 @@
 	lib3270_disconnect(v3270_get_session(terminal));
  }
- static void save_all_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal)
+ static void save_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal)
  {
- 	lib3270_save_all(v3270_get_session(terminal),NULL);
+ 	H3270 *hSession = v3270_get_session(terminal);
+ 	if(lib3270_get_has_selection(hSession))
+		lib3270_save_selected(hSession,NULL);
+	else
+		lib3270_save_all(hSession,NULL);
  }
  static void load_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal)
@@ -159,6 +164,7 @@
 	*/
+	/*
 	{
 		//
 		// Test V3270 FT Dialog
@@ -176,7 +182,24 @@
 		gtk_widget_show_all(dialog);
 	}
+	*/
+
+ }
+
+ static void popup_clicked(GtkButton *button, GtkWidget *terminal)
+ {
+
+	/*
+		static const LIB3270_POPUP popup = {
+		.name = "sample_popup",
+		.type = LIB3270_NOTIFY_INFO,
+		.summary = "This is the summary of message",
+		.body = "This it the body of the message, can be used for a bigger explanation"
+	};
+
+	lib3270_popup(v3270_get_session(terminal), &popup, 1);
+	*/
  }
@@ -226,8 +249,9 @@
 		{ "gtk-harddisk",				G_CALLBACK(ft_clicked),				"Open file transfer dialog"		},
 		{ "gtk-copy",					G_CALLBACK(copy_clicked),			"Copy data"						},
 		{ "gtk-paste",					G_CALLBACK(paste_clicked),			"Paste data"					},
-		{ "document-save",				G_CALLBACK(save_all_clicked),		"Save screen"					},
+		{ "document-save",				G_CALLBACK(save_clicked),			"Save screen or selection"		},
 		{ "document-open",				G_CALLBACK(load_clicked),			"Paste file"					},
+		{ "dialog-information",			G_CALLBACK(popup_clicked),			"Show test popup"				},
 		{ "applications-system",		G_CALLBACK(preferences_clicked),	"Session properties"			},
@@ -217,6 +217,9 @@
 		<Unit filename="src/selection/linux/paste.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="src/selection/pixbuf.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="src/selection/selection.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -358,6 +361,7 @@
 		<Unit filename="src/terminal/linux/iosource.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="src/terminal/marshal" />
 		<Unit filename="src/terminal/marshal.h" />
 		<Unit filename="src/terminal/mouse.c">
 			<Option compilerVar="CC" />
@@ -417,9 +421,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
 			<lib_finder disable_auto="1" />
 		</Extensions>
 	</Project>
	@@ -91,22 +91,6 @@		@@ -91,22 +91,6 @@
91	#ifdef WIN32	91	#ifdef WIN32
92	static void icon_press(GtkEntry G_GNUC_UNUSED(entry), G_GNUC_UNUSED GtkEntryIconPosition icon_pos, G_GNUC_UNUSED GdkEvent event, V3270SaveDialog *widget)	92	static void icon_press(GtkEntry G_GNUC_UNUSED(entry), G_GNUC_UNUSED GtkEntryIconPosition icon_pos, G_GNUC_UNUSED GdkEvent event, V3270SaveDialog *widget)
93	{	93	{
94	- /*
95	-
96	- GtkFileChooserNative * dialog =
97	- gtk_file_chooser_native_new(
98	- _( "Select destination file"),
99	- GTK_WINDOW(widget),
100	- GTK_FILE_CHOOSER_ACTION_SAVE,
101	- _("Select"),
102	- _("Cancel")
103	- );
104	-
105	- gint rc = gtk_native_dialog_run (GTK_NATIVE_DIALOG(dialog));
106	-
107	- debug("rc=%d",rc);
108	- */
109	-
110	g_autofree gchar *filename =	94	g_autofree gchar *filename =
111	v3270_select_file(	95	v3270_select_file(
112	GTK_WIDGET(widget),	96	GTK_WIDGET(widget),
	@@ -125,9 +109,6 @@ static void icon_press(GtkEntry G_GNUC_UNUSED(*entry), G_GNUC_UNUSED GtkEntryIco		@@ -125,9 +109,6 @@ static void icon_press(GtkEntry G_GNUC_UNUSED(*entry), G_GNUC_UNUSED GtkEntryIco
125	static void icon_press(GtkEntry entry, G_GNUC_UNUSED GtkEntryIconPosition icon_pos, G_GNUC_UNUSED GdkEvent event, V3270SaveDialog *widget)	109	static void icon_press(GtkEntry entry, G_GNUC_UNUSED GtkEntryIconPosition icon_pos, G_GNUC_UNUSED GdkEvent event, V3270SaveDialog *widget)
126	{	110	{
127		111
128	- //gint format = gtk_combo_box_get_active(GTK_COMBO_BOX(widget->format));
129	- //g_autofree gchar * extension = g_strconcat("*",formats[format].extension,NULL);
130	-
131	GtkWidget * dialog =	112	GtkWidget * dialog =
132	gtk_file_chooser_dialog_new(	113	gtk_file_chooser_dialog_new(
133	_( "Select destination file"),	114	_( "Select destination file"),
	@@ -156,6 +137,83 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_		@@ -156,6 +137,83 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
156	}	137	}
157	#endif // _WIN32	138	#endif // _WIN32
158		139
		140	+
		141	+ static void filename_changed(GtkEntry entry, GtkComboBox formats)
		142	+ {
		143	+ const gchar * text = gtk_entry_get_text(entry);
		144	+
		145	+ if(!(text && *text))
		146	+ return;
		147	+
		148	+ const gchar * extension = strrchr(text,'.');
		149	+ if(!extension)
		150	+ return;
		151	+
		152	+ extension++;
		153	+ const gchar * format = gtk_combo_box_get_active_id(formats);
		154	+ if(*format == '.')
		155	+ format++;
		156	+
		157	+ if(g_ascii_strcasecmp(extension,format) == 0)
		158	+ return;
		159	+
		160	+ gint column = gtk_combo_box_get_id_column(formats);
		161	+ GtkTreeModel * model = gtk_combo_box_get_model(formats);
		162	+ GtkTreeIter iter;
		163	+
		164	+ debug("id_column=%d",column);
		165	+
		166	+ if(gtk_tree_model_get_iter_first(model,&iter))
		167	+ {
		168	+ do
		169	+ {
		170	+ g_autofree gchar *id = NULL;
		171	+ gtk_tree_model_get(model, &iter, column, &id, -1);
		172	+
		173	+ if(g_ascii_strcasecmp(extension,id + (*id == '.' ? 1 : 0)) == 0)
		174	+ {
		175	+ gtk_combo_box_set_active_iter(formats,&iter);
		176	+ break;
		177	+ }
		178	+
		179	+ } while(gtk_tree_model_iter_next(model,&iter));
		180	+ }
		181	+
		182	+ }
		183	+
		184	+ static void fileformat_changed(GtkComboBox formats, GtkEntry entry)
		185	+ {
		186	+ const gchar * text = gtk_entry_get_text(entry);
		187	+
		188	+ if(!(text && *text))
		189	+ return;
		190	+
		191	+ gchar * extension = strrchr(text,'.');
		192	+ if(!extension)
		193	+ return;
		194	+
		195	+ extension++;
		196	+ const gchar * format = gtk_combo_box_get_active_id(formats);
		197	+ if(*format == '.')
		198	+ format++;
		199	+
		200	+ if(g_ascii_strcasecmp(extension,format) == 0)
		201	+ return;
		202	+
		203	+ size_t szFilename = strlen(text) + strlen(format);
		204	+ g_autofree gchar * filename = g_malloc0(szFilename + 1);
		205	+
		206	+ strncpy(filename,text,szFilename);
		207	+ extension = strrchr(filename,'.');
		208	+ if(extension)
		209	+ {
		210	+ *(++extension) = 0;
		211	+ strncat(filename, format + (*format == '.' ? 1 : 0),szFilename);
		212	+ gtk_entry_set_text(entry,filename);
		213	+ }
		214	+
		215	+ }
		216	+
159	static void V3270SaveDialog_init(V3270SaveDialog *dialog)	217	static void V3270SaveDialog_init(V3270SaveDialog *dialog)
160	{	218	{
161	// 0--------1---------------------2-------3--------------------4	219	// 0--------1---------------------2-------3--------------------4
	@@ -195,16 +253,10 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_		@@ -195,16 +253,10 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
195	gtk_grid_attach(grid,widget,0,0,1,1);	253	gtk_grid_attach(grid,widget,0,0,1,1);
196	gtk_label_set_mnemonic_widget(GTK_LABEL(widget),dialog->filename);	254	gtk_label_set_mnemonic_widget(GTK_LABEL(widget),dialog->filename);
197		255
198	-//#ifdef WIN32
199	-// widget = gtk_button_new_from_icon_name("document-open",GTK_ICON_SIZE_BUTTON);
200	-// g_signal_connect(G_OBJECT(widget),"clicked",G_CALLBACK(select_file),dialog);
201	-// gtk_grid_attach(grid,widget,4,0,1,1);
202	-//#else
203	- gtk_entry_set_icon_from_icon_name(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,"document-open");	256	+ gtk_entry_set_icon_from_icon_name(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,"document-save-as");
204	gtk_entry_set_icon_activatable(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,TRUE);	257	gtk_entry_set_icon_activatable(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,TRUE);
205	gtk_entry_set_icon_tooltip_text(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,_("Select file"));	258	gtk_entry_set_icon_tooltip_text(GTK_ENTRY(dialog->filename),GTK_ENTRY_ICON_SECONDARY,_("Select file"));
206	g_signal_connect(G_OBJECT(dialog->filename),"icon-press",G_CALLBACK(icon_press),dialog);	259	g_signal_connect(G_OBJECT(dialog->filename),"icon-press",G_CALLBACK(icon_press),dialog);
207	-//#endif // WIN32
208		260
209	gtk_entry_set_width_chars(GTK_ENTRY(dialog->filename),60);	261	gtk_entry_set_width_chars(GTK_ENTRY(dialog->filename),60);
210	gtk_entry_set_max_length(GTK_ENTRY(dialog->filename),PATH_MAX);	262	gtk_entry_set_max_length(GTK_ENTRY(dialog->filename),PATH_MAX);
	@@ -240,7 +292,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_		@@ -240,7 +292,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
240	{	292	{
241	gtk_combo_box_text_insert(	293	gtk_combo_box_text_insert(
242	GTK_COMBO_BOX_TEXT(dialog->format),	294	GTK_COMBO_BOX_TEXT(dialog->format),
243	- ix,	295	+ -1,
244	formats[ix].extension,	296	formats[ix].extension,
245	g_dgettext(GETTEXT_PACKAGE,formats[ix].name)	297	g_dgettext(GETTEXT_PACKAGE,formats[ix].name)
246	);	298	);
	@@ -248,6 +300,29 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_		@@ -248,6 +300,29 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
248		300
249	gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->format),0);	301	gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->format),0);
250		302
		303	+ // Image formats.
		304	+ GSList *img_formats = gdk_pixbuf_get_formats();
		305	+ GSList *img_format;
		306	+
		307	+ for(img_format = img_formats;img_format;img_format = g_slist_next(img_format))
		308	+ {
		309	+ GdkPixbufFormat * pixFormat = (GdkPixbufFormat *) img_format->data;
		310	+
		311	+ if (gdk_pixbuf_format_is_writable(pixFormat))
		312	+ {
		313	+ gtk_combo_box_text_insert(
		314	+ GTK_COMBO_BOX_TEXT(dialog->format),
		315	+ -1,
		316	+ gdk_pixbuf_format_get_name(pixFormat),
		317	+ gdk_pixbuf_format_get_description(pixFormat)
		318	+ );
		319	+ }
		320	+
		321	+ }
		322	+
		323	+ g_signal_connect(dialog->filename,"changed",G_CALLBACK(filename_changed),dialog->format);
		324	+ g_signal_connect(dialog->format,"changed",G_CALLBACK(fileformat_changed),dialog->filename);
		325	+
251	}	326	}
252		327
253		328
	@@ -335,20 +410,38 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_		@@ -335,20 +410,38 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
335	return GTK_WIDGET(dialog);	410	return GTK_WIDGET(dialog);
336	}	411	}
337		412
338	- void v3270_save_dialog_apply(GtkWidget widget, GError *error)	413	+ static const gchar * get_filename(V3270SaveDialog * dialog)
339	{	414	{
340	- V3270SaveDialog * dialog = V3270_SAVE_DIALOG(widget);	415	+ const gchar * filename = gtk_entry_get_text(GTK_ENTRY(dialog->filename));
		416	+ gint response = GTK_RESPONSE_OK;
341		417
342	- if(!v3270_is_connected(dialog->terminal))	418	+ if(g_file_test(filename,G_FILE_TEST_EXISTS))
343	{	419	{
344	- *error = g_error_new(g_quark_from_static_string(PACKAGE_NAME),ENOTCONN,"%s",strerror(ENOTCONN));
345	- return;	420	+ GtkWidget * confirmation =
		421	+ gtk_message_dialog_new_with_markup(
		422	+ GTK_WINDOW(dialog),
		423	+ GTK_DIALOG_DESTROY_WITH_PARENT,
		424	+ GTK_MESSAGE_QUESTION,GTK_BUTTONS_OK_CANCEL,
		425	+ _("The file \"%s\" already exists. Replace it?"),
		426	+ filename
		427	+ );
		428	+
		429	+ response = gtk_dialog_run(GTK_DIALOG(confirmation));
		430	+ gtk_widget_destroy(confirmation);
346	}	431	}
347		432
		433	+ return (response == GTK_RESPONSE_OK ? filename : NULL);
		434	+
		435	+ }
		436	+
		437	+ static void save_as_text(V3270SaveDialog * dialog, size_t index, GError **error)
		438	+ {
348	// Get selection	439	// Get selection
349	GList * dynamic = NULL;	440	GList * dynamic = NULL;
350	const GList * selection = NULL;	441	const GList * selection = NULL;
351		442
		443	+ debug("%s(%d)",__FUNCTION__,dialog->mode);
		444	+
352	switch(dialog->mode)	445	switch(dialog->mode)
353	{	446	{
354	case LIB3270_CONTENT_ALL:	447	case LIB3270_CONTENT_ALL:
	@@ -371,6 +464,8 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_		@@ -371,6 +464,8 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
371	return;	464	return;
372	}	465	}
373		466
		467	+ debug("Selection=%p",selection);
		468	+
374	if(!selection)	469	if(!selection)
375	{	470	{
376	*error = g_error_new(g_quark_from_static_string(PACKAGE_NAME),ENOTCONN,"%s",strerror(ENODATA));	471	*error = g_error_new(g_quark_from_static_string(PACKAGE_NAME),ENOTCONN,"%s",strerror(ENODATA));
	@@ -382,7 +477,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_		@@ -382,7 +477,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
382		477
383	debug("Encoding: %s",encoding);	478	debug("Encoding: %s",encoding);
384		479
385	- switch(gtk_combo_box_get_active(GTK_COMBO_BOX(dialog->format)))	480	+ switch(index)
386	{	481	{
387	case 0: // "Plain text"	482	case 0: // "Plain text"
388	text = v3270_get_selection_as_text(GTK_V3270(dialog->terminal), selection, encoding, dialog->mode == LIB3270_CONTENT_ALL);	483	text = v3270_get_selection_as_text(GTK_V3270(dialog->terminal), selection, encoding, dialog->mode == LIB3270_CONTENT_ALL);
	@@ -402,25 +497,9 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_		@@ -402,25 +497,9 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
402		497
403	if(text)	498	if(text)
404	{	499	{
405	- const gchar * filename = gtk_entry_get_text(GTK_ENTRY(dialog->filename));
406	- gint response = GTK_RESPONSE_OK;	500	+ const gchar * filename = get_filename(dialog);
407		501
408	- if(g_file_test(filename,G_FILE_TEST_EXISTS))
409	- {
410	- GtkWidget * confirmation =
411	- gtk_message_dialog_new_with_markup(
412	- GTK_WINDOW(widget),
413	- GTK_DIALOG_DESTROY_WITH_PARENT,
414	- GTK_MESSAGE_QUESTION,GTK_BUTTONS_OK_CANCEL,
415	- _("The file \"%s\" already exists. Replace it?"),
416	- filename
417	- );
418	-
419	- response = gtk_dialog_run(GTK_DIALOG(confirmation));
420	- gtk_widget_destroy(confirmation);
421	- }
422	-
423	- if(response == GTK_RESPONSE_OK)	502	+ if(filename)
424	{	503	{
425	g_file_set_contents(	504	g_file_set_contents(
426	gtk_entry_get_text(GTK_ENTRY(dialog->filename)),	505	gtk_entry_get_text(GTK_ENTRY(dialog->filename)),
	@@ -445,6 +524,93 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_		@@ -445,6 +524,93 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
445	#pragma GCC diagnostic pop	524	#pragma GCC diagnostic pop
446	}	525	}
447		526
		527	+ static void save_as_image(V3270SaveDialog * dialog, const gchar format, GError *error)
		528	+ {
		529	+ debug("%s(%d)",__FUNCTION__,dialog->mode);
		530	+
		531	+ GdkPixbuf * pixbuf = NULL;
		532	+
		533	+ switch(dialog->mode)
		534	+ {
		535	+ case LIB3270_CONTENT_ALL:
		536	+ debug("%s","LIB3270_CONTENT_ALL");
		537	+ pixbuf = v3270_get_as_pixbuf(dialog->terminal);
		538	+ break;
		539	+
		540	+ case LIB3270_CONTENT_COPY:
		541	+ {
		542	+ debug("%s","LIB3270_CONTENT_COPY");
		543	+ const GList * selection = v3270_get_selection_blocks(dialog->terminal);
		544	+ pixbuf = v3270_get_selection_as_pixbuf(GTK_V3270(dialog->terminal), selection, FALSE);
		545	+ }
		546	+ break;
		547	+
		548	+ case LIB3270_CONTENT_SELECTED:
		549	+ {
		550	+ debug("%s","LIB3270_CONTENT_SELECTED");
		551	+ GList * selection = g_list_append_lib3270_selection(NULL, v3270_get_session(dialog->terminal),FALSE);
		552	+ debug("Selection=%p",selection);
		553	+ pixbuf = v3270_get_selection_as_pixbuf(GTK_V3270(dialog->terminal), selection, FALSE);
		554	+ g_list_free_full(selection,(GDestroyNotify) lib3270_free);
		555	+ }
		556	+ break;
		557	+
		558	+ default:
		559	+ *error = g_error_new(g_quark_from_static_string(PACKAGE_NAME),ENOTCONN,_( "Unexpected mode %d" ),(int) dialog->mode);
		560	+ return;
		561	+ }
		562	+
		563	+ debug("pixbuff=%p",pixbuf);
		564	+
		565	+ if(pixbuf)
		566	+ {
		567	+ const gchar * filename = get_filename(dialog);
		568	+
		569	+ debug("Filename=%p",filename);
		570	+ if(filename)
		571	+ {
		572	+ gdk_pixbuf_save(pixbuf,filename,format,error,NULL);
		573	+ }
		574	+
		575	+ g_object_unref(pixbuf);
		576	+ }
		577	+ else
		578	+ {
		579	+ *error = g_error_new(g_quark_from_static_string(PACKAGE_NAME),-1,_( "Error saving image" ));
		580	+ }
		581	+
		582	+ }
		583	+
		584	+ void v3270_save_dialog_apply(GtkWidget widget, GError *error)
		585	+ {
		586	+ size_t ix;
		587	+ V3270SaveDialog * dialog = V3270_SAVE_DIALOG(widget);
		588	+
		589	+ if(!v3270_is_connected(dialog->terminal))
		590	+ {
		591	+ *error = g_error_new(g_quark_from_static_string(PACKAGE_NAME),ENOTCONN,"%s",strerror(ENOTCONN));
		592	+ return;
		593	+ }
		594	+
		595	+ // Get type ID
		596	+ const gchar * format = gtk_combo_box_get_active_id(GTK_COMBO_BOX(dialog->format));
		597	+
		598	+ // Check for text formats.
		599	+ for(ix=0;ix<G_N_ELEMENTS(formats);ix++)
		600	+ {
		601	+ if(!strcmp(formats[ix].extension,format))
		602	+ {
		603	+ // Is text format, save it
		604	+ save_as_text(dialog, ix, error);
		605	+ return;
		606	+ }
		607	+
		608	+ }
		609	+
		610	+ save_as_image(dialog, format, error);
		611	+
		612	+ }
		613	+
448	void v3270_save_dialog_run(GtkWidget *widget)	614	void v3270_save_dialog_run(GtkWidget *widget)
449	{	615	{
450	if(gtk_dialog_run(GTK_DIALOG(widget)) == GTK_RESPONSE_APPLY)	616	if(gtk_dialog_run(GTK_DIALOG(widget)) == GTK_RESPONSE_APPLY)
	@@ -48,7 +48,7 @@		@@ -48,7 +48,7 @@
48	LIB3270_EXPORT void v3270_to_key_file(GtkWidget widget, GKeyFile key_file, const gchar *group_name);	48	LIB3270_EXPORT void v3270_to_key_file(GtkWidget widget, GKeyFile key_file, const gchar *group_name);
49		49
50	/// @brief Emit the "save-settings" signal.	50	/// @brief Emit the "save-settings" signal.
51	- LIB3270_EXPORT void v3270_emit_save_settings(GtkWidget *widget);	51	+ LIB3270_EXPORT void v3270_emit_save_settings(GtkWidget widget, const gchar property_name);
52		52
53	#ifdef _WIN32	53	#ifdef _WIN32
54		54
	@@ -104,6 +104,20 @@ static void clipboard_get(G_GNUC_UNUSED GtkClipboard *clipboard, GtkSelectionDa		@@ -104,6 +104,20 @@ static void clipboard_get(G_GNUC_UNUSED GtkClipboard *clipboard, GtkSelectionDa
104	}	104	}
105	break;	105	break;
106		106
		107	+ case CLIPBOARD_TYPE_PIXBUFF:
		108	+ {
		109	+ GdkPixbuf * pixbuff = v3270_get_selection_as_pixbuf(terminal, terminal->selection.blocks, FALSE);
		110	+
		111	+ debug("%s: pixbuff=%p (blocks=%p)",__FUNCTION__,pixbuff,terminal->selection.blocks);
		112	+
		113	+ if(pixbuff)
		114	+ {
		115	+ gtk_selection_data_set_pixbuf(selection,pixbuff);
		116	+ g_object_unref(pixbuff);
		117	+ }
		118	+ }
		119	+ break;
		120	+
107	default:	121	default:
108	g_warning("Unexpected clipboard type %d\n",target);	122	g_warning("Unexpected clipboard type %d\n",target);
109	}	123	}
	@@ -143,6 +157,11 @@ void v3270_update_system_clipboard(GtkWidget *widget)		@@ -143,6 +157,11 @@ void v3270_update_system_clipboard(GtkWidget *widget)
143		157
144	}	158	}
145		159
		160	+ if(terminal->selection.options & V3270_SELECTION_PIXBUFF)
		161	+ {
		162	+ gtk_target_list_add_image_targets(list,CLIPBOARD_TYPE_PIXBUFF,TRUE);
		163	+ }
		164	+
146	int n_targets;	165	int n_targets;
147	GtkTargetEntry * targets = gtk_target_table_new_from_list(list, &n_targets);	166	GtkTargetEntry * targets = gtk_target_table_new_from_list(list, &n_targets);
148		167
	@@ -30,6 +30,7 @@		@@ -30,6 +30,7 @@
30	#include <clipboard.h>	30	#include <clipboard.h>
31	#include <lib3270/toggle.h>	31	#include <lib3270/toggle.h>
32	#include <v3270/dialogs.h>	32	#include <v3270/dialogs.h>
		33	+ #include <lib3270/popup.h>
33		34
34	/--[ Implement ]------------------------------------------------------------------------------------/	35	/--[ Implement ]------------------------------------------------------------------------------------/
35		36
	@@ -108,17 +109,16 @@ static void formatted_received(GtkClipboard clipboard, GtkSelectionData select		@@ -108,17 +109,16 @@ static void formatted_received(GtkClipboard clipboard, GtkSelectionData select
108	if(!v3270_set_from_data_block(terminal, selection))	109	if(!v3270_set_from_data_block(terminal, selection))
109	{	110	{
110	debug("%s: Can't paste data",__FUNCTION__);	111	debug("%s: Can't paste data",__FUNCTION__);
111	- if(
112	- v3270_popup_toggleable_dialog(
113	- widget,
114	- V3270_TOGGLEABLE_DIALOG_PASTE_FAILED,
115	- _("Can't paste"),
116	- _("Unable to paste formatted data."),
117	- _("None of the screens in the clipboard match with the current one."),
118	- _("_Cancel"), GTK_RESPONSE_CANCEL,
119	- _("_Paste as text"), GTK_RESPONSE_APPLY,
120	- NULL
121	- ) == GTK_RESPONSE_APPLY)	112	+
		113	+ LIB3270_POPUP popup = {
		114	+ .name = "cantpaste",
		115	+ .title = _("Can't paste"),
		116	+ .summary = _("Unable to paste formatted data."),
		117	+ .body = _("None of the screens in the clipboard match with the current one."),
		118	+ .label = _("_Paste as text")
		119	+ };
		120	+
		121	+ if(v3270_popup_dialog_show(widget,&popup,1) == GTK_RESPONSE_APPLY)
122	{	122	{
123	gtk_clipboard_request_text(	123	gtk_clipboard_request_text(
124	clipboard,	124	clipboard,
	@@ -127,51 +127,8 @@ static void formatted_received(GtkClipboard clipboard, GtkSelectionData select		@@ -127,51 +127,8 @@ static void formatted_received(GtkClipboard clipboard, GtkSelectionData select
127	);	127	);
128	}	128	}
129		129
130	- /*
131	- GtkResponseType response = GTK_V3270(terminal)->responses[V3270_TOGGLEABLE_DIALOG_PASTE_FAILED];
132	-
133	- if(response == GTK_RESPONSE_NONE)
134	- {
135	- // No predefined response, ask.
136	- GtkWidget * dialog =
137	- gtk_message_dialog_new(
138	- GTK_WINDOW(gtk_widget_get_toplevel(widget)),
139	- GTK_DIALOG_MODAL\|GTK_DIALOG_DESTROY_WITH_PARENT,
140	- GTK_MESSAGE_INFO,
141	- GTK_BUTTONS_NONE,
142	- _("Unable to paste formatted data")
143	- );
144	-
145	-
146	- gtk_window_set_title(GTK_WINDOW(dialog),_("Can't paste"));
147	-
148	- gtk_dialog_add_buttons(
149	- GTK_DIALOG (dialog),
150	- _("_Cancel"), GTK_RESPONSE_CANCEL,
151	- _("_Paste as text"), GTK_RESPONSE_APPLY,
152	- NULL
153	- );
154	-
155	- gtk_dialog_set_default_response(GTK_DIALOG (dialog),response);
156	-
157	- gint response = gtk_dialog_run(GTK_DIALOG(dialog));
158	-
159	- gtk_widget_destroy(dialog);
160	- }
161	-
162	- if(response == GTK_RESPONSE_APPLY)
163	- {
164	- gtk_clipboard_request_text(
165	- clipboard,
166	- (GtkClipboardTextReceivedFunc) text_received,
167	- (gpointer) widget
168	- );
169	- }
170	-
171	- */
172	return;	130	return;
173		131
174	-
175	}	132	}
176		133
177	}	134	}
@@ -0,0 +1,153 @@		@@ -0,0 +1,153 @@
	1	+/*
	2	+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
	3	+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
	4	+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
	5	+ *
	6	+ * Copyright (C) <2008> <Banco do Brasil S.A.>
	7	+ *
	8	+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
	9	+ * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
	10	+ * Free Software Foundation.
	11	+ *
	12	+ * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
	13	+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
	14	+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
	15	+ * obter mais detalhes.
	16	+ *
	17	+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
	18	+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
	19	+ * St, Fifth Floor, Boston, MA 02110-1301 USA
	20	+ *
	21	+ * Este programa está nomeado como - e possui - linhas de código.
	22	+ *
	23	+ * Contatos:
	24	+ *
	25	+ * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
	26	+ * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
	27	+ *
	28	+ */
	29	+
	30	+ #include <clipboard.h>
	31	+ #include <lib3270/selection.h>
	32	+ #include <v3270/dialogs.h>
	33	+
	34	+/--[ Implement ]------------------------------------------------------------------------------------/
	35	+
	36	+GdkPixbuf * v3270_get_selection_as_pixbuf(v3270 * terminal, const GList *selections, gboolean all)
	37	+{
	38	+ const GList *selection;
	39	+
	40	+ // Get image size
	41	+ size_t rows = 0, from_col = 1000, to_col = 0;
	42	+
	43	+ for(selection = selections; selection; selection = g_list_next(selection))
	44	+ {
	45	+ lib3270_selection * block = ((lib3270_selection *) selection->data);
	46	+ unsigned int row, src = 0;
	47	+
	48	+ for(row=0; row < block->bounds.height; row++)
	49	+ {
	50	+ size_t hasSelection = FALSE;
	51	+ unsigned int col;
	52	+
	53	+ for(col=0; col<block->bounds.width; col++)
	54	+ {
	55	+ if( (block->contents[src].attribute.visual & LIB3270_ATTR_SELECTED) \|\| all )
	56	+ {
	57	+ hasSelection = TRUE;
	58	+ if(col < from_col)
	59	+ from_col = col;
	60	+ if(col > to_col)
	61	+ to_col = col;
	62	+ }
	63	+ src++;
	64	+ }
	65	+
	66	+ if(hasSelection)
	67	+ {
	68	+ rows++;
	69	+ }
	70	+
	71	+ }
	72	+
	73	+ }
	74	+
	75	+ debug("Selection rows=%u cols=%u",(unsigned int) rows, (unsigned int) (to_col - from_col));
	76	+
	77	+ if(!(rows \|\| (from_col > to_col)))
	78	+ return NULL;
	79	+
	80	+ gint width = ((to_col - from_col)+1) * terminal->font.width;
	81	+ gint height = rows * terminal->font.spacing.value;
	82	+
	83	+ debug("%s: width=%d height=%d",__FUNCTION__,width,height);
	84	+
	85	+ cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
	86	+
	87	+ cairo_t *cr = cairo_create(surface);
	88	+#ifdef DEBUG
	89	+ gdk_cairo_set_source_rgba(cr,terminal->color+V3270_COLOR_BLUE);
	90	+#else
	91	+ gdk_cairo_set_source_rgba(cr,terminal->color+V3270_COLOR_BACKGROUND);
	92	+#endif // DEBUG
	93	+ cairo_rectangle(cr, 0, 0, width, height);
	94	+ cairo_fill(cr);
	95	+ cairo_stroke(cr);
	96	+
	97	+ // Draw contents
	98	+ GdkRectangle rect;
	99	+ memset(&rect,0,sizeof(rect));
	100	+ rect.width = terminal->font.width;
	101	+ rect.height = terminal->font.spacing.value;
	102	+
	103	+ cairo_set_scaled_font(cr,terminal->font.scaled);
	104	+
	105	+ for(selection = selections; selection; selection = g_list_next(selection))
	106	+ {
	107	+ lib3270_selection * block = ((lib3270_selection *) selection->data);
	108	+ unsigned int row, col, src = 0;
	109	+
	110	+ for(row=0; row < block->bounds.height; row++)
	111	+ {
	112	+ size_t hasSelection = FALSE;
	113	+ rect.x = 0;
	114	+
	115	+ src += from_col;
	116	+ for(col=from_col; col<block->bounds.width; col++)
	117	+ {
	118	+ if( (block->contents[src].attribute.visual & LIB3270_ATTR_SELECTED) \|\| all )
	119	+ {
	120	+ hasSelection = TRUE;
	121	+
	122	+ v3270_draw_element(
	123	+ cr,
	124	+ block->contents[src].chr,
	125	+ block->contents[src].attribute.visual & ~LIB3270_ATTR_SELECTED,
	126	+ terminal->host,
	127	+ &terminal->font,
	128	+ &rect,
	129	+ terminal->color
	130	+ );
	131	+
	132	+ }
	133	+ src++;
	134	+ rect.x += rect.width;
	135	+ }
	136	+
	137	+ if(hasSelection)
	138	+ {
	139	+ rect.y += terminal->font.spacing.value;
	140	+ }
	141	+
	142	+ }
	143	+ }
	144	+
	145	+ cairo_destroy(cr);
	146	+
	147	+ GdkPixbuf * pixbuf = gdk_pixbuf_get_from_surface(surface,0,0,width,height);
	148	+
	149	+ cairo_surface_destroy(surface);
	150	+
	151	+ return pixbuf;
	152	+
	153	+}
	@@ -151,7 +151,7 @@ void v3270_selection_set_font_family(GtkWidget widget, const gchar name) {		@@ -151,7 +151,7 @@ void v3270_selection_set_font_family(GtkWidget widget, const gchar name) {
151	terminal->selection.font_family = g_strdup(name);	151	terminal->selection.font_family = g_strdup(name);
152	}	152	}
153		153
154	- v3270_emit_save_settings(widget);	154	+ v3270_emit_save_settings(widget,NULL);
155		155
156	}	156	}
157		157
	@@ -181,7 +181,7 @@ void v3270_selection_set_color_scheme(GtkWidget widget, const gchar name) {		@@ -181,7 +181,7 @@ void v3270_selection_set_color_scheme(GtkWidget widget, const gchar name) {
181	terminal->selection.color.scheme = g_strdup(name);	181	terminal->selection.color.scheme = g_strdup(name);
182	}	182	}
183		183
184	- v3270_emit_save_settings(widget);	184	+ v3270_emit_save_settings(widget,NULL);
185		185
186	}	186	}
187		187
	@@ -246,7 +246,7 @@		@@ -246,7 +246,7 @@
246	}	246	}
247		247
248	static gboolean bg_notify_enabled(GObject *action) {	248	static gboolean bg_notify_enabled(GObject *action) {
249	- debug("%s(%s,%s,%d)",__FUNCTION__,g_action_get_name(G_ACTION(action)),(g_action_get_enabled(G_ACTION(action)) ? "enabled" : "disabled"),(int) v3270_action_get_group(G_ACTION(action)));	249	+// debug("%s(%s,%s,%d)",__FUNCTION__,g_action_get_name(G_ACTION(action)),(g_action_get_enabled(G_ACTION(action)) ? "enabled" : "disabled"),(int) v3270_action_get_group(G_ACTION(action)));
250	g_object_notify(action, "enabled");	250	g_object_notify(action, "enabled");
251	return FALSE;	251	return FALSE;
252	}	252	}
	@@ -56,7 +56,7 @@		@@ -56,7 +56,7 @@
56		56
57	// Standard Clipboard actions	57	// Standard Clipboard actions
58	{	58	{
59	- .flags = V3270_COPY_SMART,	59	+ .flags = (V3270_ACTION_FLAGS) V3270_COPY_SMART,
60	.name = "copy",	60	.name = "copy",
61	.keys = "<Primary>c",	61	.keys = "<Primary>c",
62	.group = LIB3270_ACTION_GROUP_SELECTION,	62	.group = LIB3270_ACTION_GROUP_SELECTION,
	@@ -70,7 +70,7 @@		@@ -70,7 +70,7 @@
70	{	70	{
71	.name = "copy-append",	71	.name = "copy-append",
72	.keys = "<Alt>c",	72	.keys = "<Alt>c",
73	- .flags = V3270_COPY_APPEND,	73	+ .flags = (V3270_ACTION_FLAGS) V3270_COPY_APPEND,
74	.group = LIB3270_ACTION_GROUP_SELECTION,	74	.group = LIB3270_ACTION_GROUP_SELECTION,
75	.label = N_( "Add to copy" ),	75	.label = N_( "Add to copy" ),
76	.summary = N_("Append selection to clipboard"),	76	.summary = N_("Append selection to clipboard"),
	@@ -81,7 +81,7 @@		@@ -81,7 +81,7 @@
81	{	81	{
82	.name = "copy-text",	82	.name = "copy-text",
83	.keys = "<Primary><Shift>c",	83	.keys = "<Primary><Shift>c",
84	- .flags = V3270_COPY_TEXT,	84	+ .flags = (V3270_ACTION_FLAGS) V3270_COPY_TEXT,
85	.group = LIB3270_ACTION_GROUP_SELECTION,	85	.group = LIB3270_ACTION_GROUP_SELECTION,
86	.icon = "edit-copy",	86	.icon = "edit-copy",
87	.label = N_( "Copy" ),	87	.label = N_( "Copy" ),
	@@ -92,7 +92,7 @@		@@ -92,7 +92,7 @@
92	{	92	{
93	.name = "copy-table",	93	.name = "copy-table",
94	.keys = "<Shift><Alt>c",	94	.keys = "<Shift><Alt>c",
95	- .flags = V3270_COPY_TABLE,	95	+ .flags = (V3270_ACTION_FLAGS) V3270_COPY_TABLE,
96	.group = LIB3270_ACTION_GROUP_SELECTION,	96	.group = LIB3270_ACTION_GROUP_SELECTION,
97	.icon = "edit-copy",	97	.icon = "edit-copy",
98	.label = N_( "Copy as table" ),	98	.label = N_( "Copy as table" ),
	@@ -234,7 +234,7 @@		@@ -234,7 +234,7 @@
234	},	234	},
235		235
236	{	236	{
237	- .flags = LIB3270_CONTENT_ALL,	237	+ .flags = (V3270_ACTION_FLAGS) LIB3270_CONTENT_ALL,
238	.group = LIB3270_ACTION_GROUP_ONLINE,	238	.group = LIB3270_ACTION_GROUP_ONLINE,
239	.name = "save-all",	239	.name = "save-all",
240	.label = N_("Save all"),	240	.label = N_("Save all"),
	@@ -245,7 +245,7 @@		@@ -245,7 +245,7 @@
245	},	245	},
246		246
247	{	247	{
248	- .flags = LIB3270_CONTENT_SELECTED,	248	+ .flags = (V3270_ACTION_FLAGS) LIB3270_CONTENT_SELECTED,
249	.group = LIB3270_ACTION_GROUP_SELECTION,	249	.group = LIB3270_ACTION_GROUP_SELECTION,
250	.name = "save-selected",	250	.name = "save-selected",
251	.label = N_("Save selected"),	251	.label = N_("Save selected"),
	@@ -256,7 +256,7 @@		@@ -256,7 +256,7 @@
256	},	256	},
257		257
258	{	258	{
259	- .flags = LIB3270_CONTENT_COPY,	259	+ .flags = (V3270_ACTION_FLAGS) LIB3270_CONTENT_COPY,
260	.group = LIB3270_ACTION_GROUP_COPY,	260	.group = LIB3270_ACTION_GROUP_COPY,
261	.name = "save-copy",	261	.name = "save-copy",
262	.label = N_("Save copy"),	262	.label = N_("Save copy"),
	@@ -281,7 +281,7 @@		@@ -281,7 +281,7 @@
281	},	281	},
282		282
283	{	283	{
284	- .flags = LIB3270_CONTENT_ALL,	284	+ .flags = (V3270_ACTION_FLAGS) LIB3270_CONTENT_ALL,
285	.group = LIB3270_ACTION_GROUP_ONLINE,	285	.group = LIB3270_ACTION_GROUP_ONLINE,
286	.name = "print-all",	286	.name = "print-all",
287	.icon = "document-print",	287	.icon = "document-print",
	@@ -292,7 +292,7 @@		@@ -292,7 +292,7 @@
292	},	292	},
293		293
294	{	294	{
295	- .flags = LIB3270_CONTENT_SELECTED,	295	+ .flags = (V3270_ACTION_FLAGS) LIB3270_CONTENT_SELECTED,
296	.group = LIB3270_ACTION_GROUP_SELECTION,	296	.group = LIB3270_ACTION_GROUP_SELECTION,
297	.name = "print-selected",	297	.name = "print-selected",
298	.icon = "document-print",	298	.icon = "document-print",
	@@ -303,7 +303,7 @@		@@ -303,7 +303,7 @@
303	},	303	},
304		304
305	{	305	{
306	- .flags = LIB3270_CONTENT_COPY,	306	+ .flags = (V3270_ACTION_FLAGS) LIB3270_CONTENT_COPY,
307	.group = LIB3270_ACTION_GROUP_COPY,	307	.group = LIB3270_ACTION_GROUP_COPY,
308	.name = "print-copy",	308	.name = "print-copy",
309	.icon = "document-print",	309	.icon = "document-print",
	@@ -112,7 +112,7 @@		@@ -112,7 +112,7 @@
112	return G_VARIANT_TYPE_BOOLEAN;	112	return G_VARIANT_TYPE_BOOLEAN;
113	}	113	}
114		114
115	- static gboolean get_enabled(GAction action, GtkWidget terminal) {	115	+ static gboolean get_enabled(GAction G_GNUC_UNUSED(action), GtkWidget G_GNUC_UNUSED(terminal)) {
116	return TRUE;	116	return TRUE;
117	}	117	}
118		118
	@@ -126,7 +126,7 @@		@@ -126,7 +126,7 @@
126		126
127	}	127	}
128		128
129	- void Lib3270ToggleAction_init(Lib3270ToggleAction *action) {	129	+ void Lib3270ToggleAction_init(Lib3270ToggleAction G_GNUC_UNUSED(*action)) {
130	}	130	}
131		131
132	GAction * g_action_new_from_toggle(const LIB3270_TOGGLE * definition) {	132	GAction * g_action_new_from_toggle(const LIB3270_TOGGLE * definition) {
	@@ -36,40 +36,92 @@		@@ -36,40 +36,92 @@
36		36
37	/--[ Implement ]------------------------------------------------------------------------------------/	37	/--[ Implement ]------------------------------------------------------------------------------------/
38		38
39	-const gchar * v3270_get_default_colors() {
40	-
41	- return "#000000," // V3270_COLOR_BACKGROUND
42	- "#7890F0," // V3270_COLOR_BLUE
43	- "#FF0000," // V3270_COLOR_RED
44	- "#FF00FF," // V3270_COLOR_PINK
45	- "#00FF00," // V3270_COLOR_GREEN
46	- "#00FFFF," // V3270_COLOR_TURQUOISE
47	- "#FFFF00," // V3270_COLOR_YELLOW
48	- "#FFFFFF," // V3270_COLOR_WHITE
49	- "#000000," // V3270_COLOR_BLACK
50	- "#000080," // V3270_COLOR_DARK_BLUE
51	- "#FFA200," // V3270_COLOR_ORANGE
52	- "#800080," // V3270_COLOR_PURPLE
53	- "#008000," // V3270_COLOR_DARK_GREEN
54	- "#008080," // V3270_COLOR_DARK_TURQUOISE
55	- "#A0A000," // V3270_COLOR_MUSTARD
56	- "#C0C0C0," // V3270_COLOR_GRAY
57	-
58	- "#00FF00," // V3270_COLOR_FIELD_DEFAULT
59	- "#FF0000," // V3270_COLOR_FIELD_INTENSIFIED
60	- "#00FFFF," // V3270_COLOR_FIELD_PROTECTED
61	- "#FFFFFF," // V3270_COLOR_FIELD_PROTECTED_INTENSIFIED
62	-
63	- "#404040," // V3270_COLOR_SELECTED_BG
64	- "#FFFFFF," // V3270_COLOR_SELECTED_FG,
65	-
66	- "#00FF00," // V3270_COLOR_CROSS_HAIR
67	-
68	- "#000000," // V3270_COLOR_OIA_BACKGROUND
69	- "#00FF00," // V3270_COLOR_OIA
70	- "#7890F0," // V3270_COLOR_OIA_SEPARATOR
71	- "#FFFFFF," // V3270_COLOR_OIA_STATUS_OK
72	- "#FFFF00," // V3270_COLOR_OIA_STATUS_WARNING	39	+const gchar * v3270_get_default_colors()
		40	+{
		41	+
		42	+#ifdef _WIN32
		43	+ {
		44	+ HKEY hKey;
		45	+ DWORD disp = 0;
		46	+ LSTATUS rc = RegCreateKeyEx(
		47	+ HKEY_LOCAL_MACHINE,
		48	+ "Software\\" LIB3270_STRINGIZE_VALUE_OF(PRODUCT_NAME),
		49	+ 0,
		50	+ NULL,
		51	+ REG_OPTION_NON_VOLATILE,
		52	+ KEY_QUERY_VALUE\|KEY_READ,
		53	+ NULL,
		54	+ &hKey,
		55	+ &disp);
		56	+
		57	+ debug("%s=%d","Software\\" LIB3270_STRINGIZE_VALUE_OF(PRODUCT_NAME),rc);
		58	+
		59	+ if(rc == ERROR_SUCCESS)
		60	+ {
		61	+ static char * default_colors = NULL;
		62	+ DWORD cbData = 4096;
		63	+
		64	+ if(!default_colors)
		65	+ {
		66	+ default_colors = (char *) malloc(cbData+1);
		67	+ }
		68	+ else
		69	+ {
		70	+ default_colors = (char *) realloc(default_colors,cbData+1);
		71	+ }
		72	+
		73	+ DWORD dwRet = RegQueryValueEx(hKey,"colors",NULL,NULL,(LPBYTE) default_colors, &cbData);
		74	+
		75	+ debug("dwRet=%d",dwRet);
		76	+
		77	+ RegCloseKey(hKey);
		78	+
		79	+ if(dwRet == ERROR_SUCCESS)
		80	+ {
		81	+ default_colors = (char *) realloc(default_colors,cbData+1);
		82	+ default_colors[cbData] = 0;
		83	+
		84	+ return default_colors;
		85	+ }
		86	+
		87	+ free(default_colors);
		88	+ default_colors = NULL;
		89	+ }
		90	+ }
		91	+#endif // _WIN32
		92	+
		93	+ return "#000000;" // V3270_COLOR_BACKGROUND
		94	+ "#7890F0;" // V3270_COLOR_BLUE
		95	+ "#FF0000;" // V3270_COLOR_RED
		96	+ "#FF00FF;" // V3270_COLOR_PINK
		97	+ "#00FF00;" // V3270_COLOR_GREEN
		98	+ "#00FFFF;" // V3270_COLOR_TURQUOISE
		99	+ "#FFFF00;" // V3270_COLOR_YELLOW
		100	+ "#FFFFFF;" // V3270_COLOR_WHITE
		101	+ "#000000;" // V3270_COLOR_BLACK
		102	+ "#000080;" // V3270_COLOR_DARK_BLUE
		103	+ "#FFA200;" // V3270_COLOR_ORANGE
		104	+ "#800080;" // V3270_COLOR_PURPLE
		105	+ "#008000;" // V3270_COLOR_DARK_GREEN
		106	+ "#008080;" // V3270_COLOR_DARK_TURQUOISE
		107	+ "#A0A000;" // V3270_COLOR_MUSTARD
		108	+ "#C0C0C0;" // V3270_COLOR_GRAY
		109	+
		110	+ "#00FF00;" // V3270_COLOR_FIELD_DEFAULT
		111	+ "#FF0000;" // V3270_COLOR_FIELD_INTENSIFIED
		112	+ "#00FFFF;" // V3270_COLOR_FIELD_PROTECTED
		113	+ "#FFFFFF;" // V3270_COLOR_FIELD_PROTECTED_INTENSIFIED
		114	+
		115	+ "#404040;" // V3270_COLOR_SELECTED_BG
		116	+ "#FFFFFF;" // V3270_COLOR_SELECTED_FG,
		117	+
		118	+ "#00FF00;" // V3270_COLOR_CROSS_HAIR
		119	+
		120	+ "#000000;" // V3270_COLOR_OIA_BACKGROUND
		121	+ "#00FF00;" // V3270_COLOR_OIA
		122	+ "#7890F0;" // V3270_COLOR_OIA_SEPARATOR
		123	+ "#FFFFFF;" // V3270_COLOR_OIA_STATUS_OK
		124	+ "#FFFF00;" // V3270_COLOR_OIA_STATUS_WARNING
73	"#FFFF00"; // V3270_COLOR_OIA_STATUS_INVALID	125	"#FFFF00"; // V3270_COLOR_OIA_STATUS_INVALID
74	}	126	}
75		127
	@@ -83,7 +135,7 @@ LIB3270_EXPORT void v3270_set_colors(GtkWidget widget, const gchar colors)		@@ -83,7 +135,7 @@ LIB3270_EXPORT void v3270_set_colors(GtkWidget widget, const gchar colors)
83	}	135	}
84		136
85	v3270_set_color_table(GTK_V3270(widget)->color,colors);	137	v3270_set_color_table(GTK_V3270(widget)->color,colors);
86	- v3270_emit_save_settings(widget);	138	+ v3270_emit_save_settings(widget,NULL);
87	v3270_reload(widget);	139	v3270_reload(widget);
88		140
89	}	141	}