From 4b78d97d941ad31cff11cc467bdffa7d9f7fc8a5 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Fri, 30 Mar 2012 12:02:09 +0000
Subject: [PATCH] Reativando opção de cores no diálogo de impressao

---
 colors.conf                  |  10 ++++++++++
 memchk.sh                    |   3 +++
 pw3270.cbp                   | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------
 src/gtk/colors.c             |  16 +++-------------
 src/gtk/globals.h            |   1 +
 src/gtk/print.c              | 109 +++++++++++++++++++++++++++----------------------------------------------------------------------------------
 src/gtk/v3270/v3270.h        |   1 +
 src/gtk/v3270/widget.c       |  18 ++++++++++++++++++
 src/gtk/valgrind.suppression |  15 +++++++++++++++
 9 files changed, 228 insertions(+), 245 deletions(-)
 create mode 100755 memchk.sh

diff --git a/colors.conf b/colors.conf
index 39e9525..542dc0a 100644
--- a/colors.conf
+++ b/colors.conf
@@ -24,6 +24,16 @@
 # erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
 #
 
+[default]
+label=PW3270 default
+
+base=#000000,#7890F0,#FF0000,#FF00FF,#00FF00,#00FFFF,#FFFF00,#FFFFFF,#000000,#000080,#FFA200,#800080,#008000,#008080,#A0A000,#C0C0C0
+field=#00FF00,#FF0000,#00FFFF,#FFFFFF
+selection=#404040,#ffffff
+OIA=#000000,#00FF00,#7890F0,#FFFFFF,#FF0000
+
+cross-hair=#00FF00
+
 [X3270]
 label=X3270
 
diff --git a/memchk.sh b/memchk.sh
new file mode 100755
index 0000000..057bedf
--- /dev/null
+++ b/memchk.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+G_DEBUG=gc-friendly G_SLICE=always-malloc valgrind --leak-check=full --suppressions=src/gtk/valgrind.suppression --gen-suppressions=all .bin/Debug/pw3270
+
diff --git a/pw3270.cbp b/pw3270.cbp
index 0791ef3..de7b6d9 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -9,8 +9,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin\Debug\pw3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj\Debug\" />
+				<Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option use_console_runner="0" />
@@ -20,8 +20,8 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output=".bin\Release\pw3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj\Release\" />
+				<Option output=".bin/Release/pw3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj/Release/" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -35,7 +35,7 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" />
-			<Add directory="src\include" />
+			<Add directory="src/include" />
 		</Compiler>
 		<Linker>
 			<Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
@@ -45,283 +45,283 @@
 		<Unit filename="colors.conf" />
 		<Unit filename="configure.ac" />
 		<Unit filename="pw3270.spec.in" />
-		<Unit filename="src\gtk\Makefile.in" />
-		<Unit filename="src\gtk\actions.c">
+		<Unit filename="src/gtk/Makefile.in" />
+		<Unit filename="src/gtk/actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\colors.c">
+		<Unit filename="src/gtk/colors.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\common\common.h" />
-		<Unit filename="src\gtk\common\config.c">
+		<Unit filename="src/gtk/common/common.h" />
+		<Unit filename="src/gtk/common/config.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\dialog.c">
+		<Unit filename="src/gtk/dialog.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\fonts.c">
+		<Unit filename="src/gtk/fonts.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\globals.h" />
-		<Unit filename="src\gtk\main.c">
+		<Unit filename="src/gtk/globals.h" />
+		<Unit filename="src/gtk/main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\mainwindow.c">
+		<Unit filename="src/gtk/mainwindow.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\print.c">
+		<Unit filename="src/gtk/print.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\Makefile.in" />
-		<Unit filename="src\gtk\uiparser\accelerator.c">
+		<Unit filename="src/gtk/uiparser/Makefile.in" />
+		<Unit filename="src/gtk/uiparser/accelerator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\action.c">
+		<Unit filename="src/gtk/uiparser/action.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\menu.c">
+		<Unit filename="src/gtk/uiparser/menu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\menubar.c">
+		<Unit filename="src/gtk/uiparser/menubar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\menuitem.c">
+		<Unit filename="src/gtk/uiparser/menuitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\parsefile.c">
+		<Unit filename="src/gtk/uiparser/parsefile.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\parser.c">
+		<Unit filename="src/gtk/uiparser/parser.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\parser.h" />
-		<Unit filename="src\gtk\uiparser\popup.c">
+		<Unit filename="src/gtk/uiparser/parser.h" />
+		<Unit filename="src/gtk/uiparser/popup.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\private.h" />
-		<Unit filename="src\gtk\uiparser\script.c">
+		<Unit filename="src/gtk/uiparser/private.h" />
+		<Unit filename="src/gtk/uiparser/script.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\separator.c">
+		<Unit filename="src/gtk/uiparser/separator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\sources.mak" />
-		<Unit filename="src\gtk\uiparser\toolbar.c">
+		<Unit filename="src/gtk/uiparser/sources.mak" />
+		<Unit filename="src/gtk/uiparser/toolbar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\uiparser\toolitem.c">
+		<Unit filename="src/gtk/uiparser/toolitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\clipboard.c">
+		<Unit filename="src/gtk/v3270/clipboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\draw.c">
+		<Unit filename="src/gtk/v3270/draw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\genmarshal" />
-		<Unit filename="src\gtk\v3270\iocallback.c">
+		<Unit filename="src/gtk/v3270/genmarshal" />
+		<Unit filename="src/gtk/v3270/iocallback.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\keyboard.c">
+		<Unit filename="src/gtk/v3270/keyboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\mouse.c">
+		<Unit filename="src/gtk/v3270/mouse.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\oia.c">
+		<Unit filename="src/gtk/v3270/oia.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\v3270\private.h" />
-		<Unit filename="src\gtk\v3270\sources.mak" />
-		<Unit filename="src\gtk\v3270\v3270.h" />
-		<Unit filename="src\gtk\v3270\widget.c">
+		<Unit filename="src/gtk/v3270/private.h" />
+		<Unit filename="src/gtk/v3270/sources.mak" />
+		<Unit filename="src/gtk/v3270/v3270.h" />
+		<Unit filename="src/gtk/v3270/widget.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\gtk\valgrind.suppression" />
-		<Unit filename="src\include\lib3270.h" />
-		<Unit filename="src\include\lib3270\action_table.h" />
-		<Unit filename="src\include\lib3270\actions.h" />
-		<Unit filename="src\include\lib3270\config.h.in" />
-		<Unit filename="src\include\lib3270\log.h" />
-		<Unit filename="src\include\lib3270\popup.h" />
-		<Unit filename="src\include\lib3270\selection.h" />
-		<Unit filename="src\include\lib3270\session.h" />
-		<Unit filename="src\include\pw3270.h" />
-		<Unit filename="src\include\rules.mak.in" />
-		<Unit filename="src\lib3270\3270ds.h" />
-		<Unit filename="src\lib3270\Makefile.in" />
-		<Unit filename="src\lib3270\X11keysym.h" />
-		<Unit filename="src\lib3270\XtGlue.c">
+		<Unit filename="src/gtk/valgrind.suppression" />
+		<Unit filename="src/include/lib3270.h" />
+		<Unit filename="src/include/lib3270/action_table.h" />
+		<Unit filename="src/include/lib3270/actions.h" />
+		<Unit filename="src/include/lib3270/config.h.in" />
+		<Unit filename="src/include/lib3270/log.h" />
+		<Unit filename="src/include/lib3270/popup.h" />
+		<Unit filename="src/include/lib3270/selection.h" />
+		<Unit filename="src/include/lib3270/session.h" />
+		<Unit filename="src/include/pw3270.h" />
+		<Unit filename="src/include/rules.mak.in" />
+		<Unit filename="src/lib3270/3270ds.h" />
+		<Unit filename="src/lib3270/Makefile.in" />
+		<Unit filename="src/lib3270/X11keysym.h" />
+		<Unit filename="src/lib3270/XtGlue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\actions.c">
+		<Unit filename="src/lib3270/actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\actionsc.h" />
-		<Unit filename="src\lib3270\ansi.c">
+		<Unit filename="src/lib3270/actionsc.h" />
+		<Unit filename="src/lib3270/ansi.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\ansic.h" />
-		<Unit filename="src\lib3270\api.h" />
-		<Unit filename="src\lib3270\apl.c">
+		<Unit filename="src/lib3270/ansic.h" />
+		<Unit filename="src/lib3270/api.h" />
+		<Unit filename="src/lib3270/apl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\aplc.h" />
-		<Unit filename="src\lib3270\appres.h" />
-		<Unit filename="src\lib3270\arpa_telnet.h" />
-		<Unit filename="src\lib3270\cg.h" />
-		<Unit filename="src\lib3270\charset.c">
+		<Unit filename="src/lib3270/aplc.h" />
+		<Unit filename="src/lib3270/appres.h" />
+		<Unit filename="src/lib3270/arpa_telnet.h" />
+		<Unit filename="src/lib3270/cg.h" />
+		<Unit filename="src/lib3270/charset.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\charsetc.h" />
-		<Unit filename="src\lib3270\childc.h" />
-		<Unit filename="src\lib3270\ctlr.c">
+		<Unit filename="src/lib3270/charsetc.h" />
+		<Unit filename="src/lib3270/childc.h" />
+		<Unit filename="src/lib3270/ctlr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\ctlr.h" />
-		<Unit filename="src\lib3270\ctlrc.h" />
-		<Unit filename="src\lib3270\dialogc.h" />
-		<Unit filename="src\lib3270\fallbacks.c">
+		<Unit filename="src/lib3270/ctlr.h" />
+		<Unit filename="src/lib3270/ctlrc.h" />
+		<Unit filename="src/lib3270/dialogc.h" />
+		<Unit filename="src/lib3270/fallbacks.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\ft.c">
+		<Unit filename="src/lib3270/ft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\ft_cut.c">
+		<Unit filename="src/lib3270/ft_cut.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\ft_cut_ds.h" />
-		<Unit filename="src\lib3270\ft_cutc.h" />
-		<Unit filename="src\lib3270\ft_dft.c">
+		<Unit filename="src/lib3270/ft_cut_ds.h" />
+		<Unit filename="src/lib3270/ft_cutc.h" />
+		<Unit filename="src/lib3270/ft_dft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\ft_dft_ds.h" />
-		<Unit filename="src\lib3270\ft_dftc.h" />
-		<Unit filename="src\lib3270\ftc.h" />
-		<Unit filename="src\lib3270\globals.h" />
-		<Unit filename="src\lib3270\glue.c">
+		<Unit filename="src/lib3270/ft_dft_ds.h" />
+		<Unit filename="src/lib3270/ft_dftc.h" />
+		<Unit filename="src/lib3270/ftc.h" />
+		<Unit filename="src/lib3270/globals.h" />
+		<Unit filename="src/lib3270/glue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\gluec.h" />
-		<Unit filename="src\lib3270\host.c">
+		<Unit filename="src/lib3270/gluec.h" />
+		<Unit filename="src/lib3270/host.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\hostc.h" />
-		<Unit filename="src\lib3270\icmdc.h" />
-		<Unit filename="src\lib3270\init.c">
+		<Unit filename="src/lib3270/hostc.h" />
+		<Unit filename="src/lib3270/icmdc.h" />
+		<Unit filename="src/lib3270/init.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\keypadc.h" />
-		<Unit filename="src\lib3270\kybd.c">
+		<Unit filename="src/lib3270/keypadc.h" />
+		<Unit filename="src/lib3270/kybd.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\kybdc.h" />
-		<Unit filename="src\lib3270\localdefs.h" />
-		<Unit filename="src\lib3270\log.c">
+		<Unit filename="src/lib3270/kybdc.h" />
+		<Unit filename="src/lib3270/localdefs.h" />
+		<Unit filename="src/lib3270/log.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\macros.c">
+		<Unit filename="src/lib3270/macros.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\mkfb.c">
+		<Unit filename="src/lib3270/mkfb.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\objects.h" />
-		<Unit filename="src\lib3270\paste.c">
+		<Unit filename="src/lib3270/objects.h" />
+		<Unit filename="src/lib3270/paste.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\popupsc.h" />
-		<Unit filename="src\lib3270\print.c">
+		<Unit filename="src/lib3270/popupsc.h" />
+		<Unit filename="src/lib3270/print.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\printc.h" />
-		<Unit filename="src\lib3270\printer.c">
+		<Unit filename="src/lib3270/printc.h" />
+		<Unit filename="src/lib3270/printer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\printerc.h" />
-		<Unit filename="src\lib3270\proxy.c">
+		<Unit filename="src/lib3270/printerc.h" />
+		<Unit filename="src/lib3270/proxy.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\proxyc.h" />
-		<Unit filename="src\lib3270\resolver.c">
+		<Unit filename="src/lib3270/proxyc.h" />
+		<Unit filename="src/lib3270/resolver.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\resolverc.h" />
-		<Unit filename="src\lib3270\resources.c">
+		<Unit filename="src/lib3270/resolverc.h" />
+		<Unit filename="src/lib3270/resources.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\resources.h" />
-		<Unit filename="src\lib3270\rpq.c">
+		<Unit filename="src/lib3270/resources.h" />
+		<Unit filename="src/lib3270/rpq.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\savec.h" />
-		<Unit filename="src\lib3270\screen.c">
+		<Unit filename="src/lib3270/savec.h" />
+		<Unit filename="src/lib3270/screen.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\screen.h" />
-		<Unit filename="src\lib3270\screenc.h" />
-		<Unit filename="src\lib3270\scrollc.h" />
-		<Unit filename="src\lib3270\see.c">
+		<Unit filename="src/lib3270/screen.h" />
+		<Unit filename="src/lib3270/screenc.h" />
+		<Unit filename="src/lib3270/scrollc.h" />
+		<Unit filename="src/lib3270/see.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\seec.h" />
-		<Unit filename="src\lib3270\selection.c">
+		<Unit filename="src/lib3270/seec.h" />
+		<Unit filename="src/lib3270/selection.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\sf.c">
+		<Unit filename="src/lib3270/sf.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\sfc.h" />
-		<Unit filename="src\lib3270\shlobj_missing.h" />
-		<Unit filename="src\lib3270\statusc.h" />
-		<Unit filename="src\lib3270\tables.c">
+		<Unit filename="src/lib3270/sfc.h" />
+		<Unit filename="src/lib3270/shlobj_missing.h" />
+		<Unit filename="src/lib3270/statusc.h" />
+		<Unit filename="src/lib3270/tables.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\tablesc.h" />
-		<Unit filename="src\lib3270\telnet.c">
+		<Unit filename="src/lib3270/tablesc.h" />
+		<Unit filename="src/lib3270/telnet.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\telnetc.h" />
-		<Unit filename="src\lib3270\testprogram.c">
+		<Unit filename="src/lib3270/telnetc.h" />
+		<Unit filename="src/lib3270/testprogram.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\tn3270e.h" />
-		<Unit filename="src\lib3270\toggle.h" />
-		<Unit filename="src\lib3270\toggles.c">
+		<Unit filename="src/lib3270/tn3270e.h" />
+		<Unit filename="src/lib3270/toggle.h" />
+		<Unit filename="src/lib3270/toggles.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\togglesc.h" />
-		<Unit filename="src\lib3270\trace_ds.c">
+		<Unit filename="src/lib3270/togglesc.h" />
+		<Unit filename="src/lib3270/trace_ds.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\trace_dsc.h" />
-		<Unit filename="src\lib3270\utf8.c">
+		<Unit filename="src/lib3270/trace_dsc.h" />
+		<Unit filename="src/lib3270/utf8.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\utf8c.h" />
-		<Unit filename="src\lib3270\util.c">
+		<Unit filename="src/lib3270/utf8c.h" />
+		<Unit filename="src/lib3270/util.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\utilc.h" />
-		<Unit filename="src\lib3270\version.c">
+		<Unit filename="src/lib3270/utilc.h" />
+		<Unit filename="src/lib3270/version.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\w3misc.c">
+		<Unit filename="src/lib3270/w3misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\w3miscc.h" />
-		<Unit filename="src\lib3270\widec.h" />
-		<Unit filename="src\lib3270\winvers.c">
+		<Unit filename="src/lib3270/w3miscc.h" />
+		<Unit filename="src/lib3270/widec.h" />
+		<Unit filename="src/lib3270/winvers.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\winversc.h" />
-		<Unit filename="src\lib3270\xio.c">
+		<Unit filename="src/lib3270/winversc.h" />
+		<Unit filename="src/lib3270/xio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src\lib3270\xioc.h" />
-		<Unit filename="src\lib3270\xl.h" />
-		<Unit filename="ui\00default.xml" />
-		<Unit filename="ui\99debug.xml" />
+		<Unit filename="src/lib3270/xioc.h" />
+		<Unit filename="src/lib3270/xl.h" />
+		<Unit filename="ui/00default.xml" />
+		<Unit filename="ui/99debug.xml" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/src/gtk/colors.c b/src/gtk/colors.c
index be9595f..fcc0a9c 100644
--- a/src/gtk/colors.c
+++ b/src/gtk/colors.c
@@ -32,7 +32,6 @@
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
-
 static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 {
 	#define V3270_COLOR_BASE V3270_COLOR_GRAY+1
@@ -50,18 +49,10 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 		switch(g_strv_length(str))
 		{
 		case 2:	// Only 2 colors, create monocromatic table
-			gdk_color_parse(str[0],clr);
-			gdk_color_parse(str[1],clr+1);
-
-			trace("%s color table is: monocromatic",group);
-
-			for(f=2;f<V3270_COLOR_BASE;f++)
-				clr[f] = clr[1];
-			clr[V3270_COLOR_BLACK] = *clr;
+			v3270_set_mono_color_table(clr,str[1],str[0]);
 			break;
 
 		case V3270_COLOR_BASE:	// All colors, update it
-			trace("%s color table is: complete",group);
 			for(f=0;f<V3270_COLOR_BASE;f++)
 				gdk_color_parse(str[f],clr+f);
 			break;
@@ -156,7 +147,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 
 }
 
- static void color_scheme_changed(GtkComboBox *combo,gpointer dunno)
+ static void color_scheme_changed(GtkComboBox *combo)
  {
 	GtkWidget	* terminal	= (GtkWidget *) g_object_get_data(G_OBJECT(combo),"terminal_widget");
 	GtkWidget	* colorsel	= (GtkWidget *) g_object_get_data(G_OBJECT(combo),"color_selection_widget");
@@ -181,7 +172,6 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 
 		v3270_reload(terminal);
 		gtk_widget_queue_draw(terminal);
-
 	}
 
 	if(colorsel)
@@ -251,7 +241,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 			int			  pos	= 0;
 			int			  g;
 
-			g_signal_connect(G_OBJECT(widget),"changed",G_CALLBACK(color_scheme_changed),table);
+			g_signal_connect(G_OBJECT(widget),"changed",G_CALLBACK(color_scheme_changed),0);
 
 			g_object_set_data_full(G_OBJECT(widget),"colortable",table,g_free);
 
diff --git a/src/gtk/globals.h b/src/gtk/globals.h
index 776d258..6d71dc6 100644
--- a/src/gtk/globals.h
+++ b/src/gtk/globals.h
@@ -61,6 +61,7 @@
  G_GNUC_INTERNAL GtkWidget	* create_main_window(void);
  G_GNUC_INTERNAL void		  setup_font_list(GtkWidget *widget, GtkWidget *obj);
  G_GNUC_INTERNAL void		  load_color_schemes(GtkWidget *widget, gchar *active);
+ G_GNUC_INTERNAL GtkWidget	* color_scheme_new(const GdkColor *current);
 
  // actions
  G_GNUC_INTERNAL void paste_file_action(GtkAction *action, GtkWidget *widget);
diff --git a/src/gtk/print.c b/src/gtk/print.c
index 13e5af9..c1ff83a 100644
--- a/src/gtk/print.c
+++ b/src/gtk/print.c
@@ -45,7 +45,6 @@
 	gchar					* font;
 	guint					  fontsize;
 	cairo_font_weight_t		  fontweight;
-	gchar					* colorname;
 	int						  baddr;
 	int						  rows;
 	int						  cols;
@@ -142,9 +141,6 @@
 	if(info->font)
 		g_free(info->font);
 
-	if(info->colorname)
-		g_free(info->colorname);
-
 	g_free(info);
  }
 
@@ -179,41 +175,6 @@
 	trace("Font set to \"%s\" with size %d",info->font,info->fontsize);
  }
 
-/*
- static void color_scheme_changed(GtkComboBox *widget,PRINT_INFO *info)
- {
- 	gchar *new_colors = NULL;
-
-#if GTK_CHECK_VERSION(3,0,0)
-
-	new_colors = g_strdup(gtk_combo_box_get_active_id(GTK_COMBO_BOX(widget)));
-
-#else
-
-	GValue		value	= { 0, };
-	GtkTreeIter iter;
-
-	if(!gtk_combo_box_get_active_iter(widget,&iter))
-		return;
-
-	gtk_tree_model_get_value(gtk_combo_box_get_model(widget),&iter,1,&value);
-	new_colors = g_strdup(g_value_get_string(&value));
-
-#endif
-
-	if(!info->colorname)
-		return;
-
-//	trace("%s: %s->%s",__FUNCTION__,info->colorname,new_colors);
-
-	if(*info->colorname)
-		g_free(info->colorname);
-
-	info->colorname = new_colors;
-
- }
-*/
-
  static void toggle_show_selection(GtkToggleButton *togglebutton,PRINT_INFO *info)
  {
  	gboolean active = gtk_toggle_button_get_active(togglebutton);
@@ -223,41 +184,11 @@
 
  static GObject * create_custom_widget(GtkPrintOperation *prt, PRINT_INFO *info)
  {
-	static const gchar *def_colors =	"white," // V3270_COLOR_BACKGROUND
-										"black," // V3270_COLOR_BLUE
-										"black," // V3270_COLOR_RED
-										"black," // V3270_COLOR_PINK
-										"black," // V3270_COLOR_GREEN
-										"black," // V3270_COLOR_TURQUOISE
-										"black," // V3270_COLOR_YELLOW
-										"black," // V3270_COLOR_WHITE
-										"black," // V3270_COLOR_BLACK
-										"black," // V3270_COLOR_DARK_BLUE
-										"black," // V3270_COLOR_ORANGE
-										"black," // V3270_COLOR_PURPLE
-										"black," // V3270_COLOR_DARK_GREEN
-										"black," // V3270_COLOR_DARK_TURQUOISE
-										"black," // V3270_COLOR_MUSTARD
-										"black," // V3270_COLOR_GRAY
-										"black," // V3270_COLOR_FIELD_DEFAULT
-										"black," // V3270_COLOR_FIELD_INTENSIFIED
-										"black," // V3270_COLOR_FIELD_PROTECTED
-										"black," // V3270_COLOR_FIELD_PROTECTED_INTENSIFIED
-										"black," // V3270_COLOR_SELECTED_BG
-										"white," // V3270_COLOR_SELECTED_FG
-										"black," // V3270_COLOR_SELECTED_BORDER
-										"black," // V3270_COLOR_CURSOR
-										"black," // V3270_COLOR_CROSS_HAIR
-										"white," // V3270_COLOR_OIA_BACKGROUND
-										"black," // V3270_COLOR_OIA
-										"black," // V3270_COLOR_OIA_SEPARATOR
-										"black," // V3270_COLOR_OIA_STATUS_OK
-										"black"; // V3270_COLOR_OIA_STATUS_INVALID
-
  	static const gchar	* label[]	= { N_( "Font:" ), N_( "Color scheme:" ) };
 	GtkWidget			* container = gtk_table_new(3,2,FALSE);
 	GtkWidget			* widget;
 	int					  f;
+	gchar				* ptr;
 
 	for(f=0;f<G_N_ELEMENTS(label);f++)
 	{
@@ -280,17 +211,16 @@
     g_signal_connect(G_OBJECT(widget),"font-set",G_CALLBACK(font_set),info);
 
 	// Color scheme dropdown
-#if GTK_CHECK_VERSION(3,0,0)
-	widget = gtk_combo_box_text_new();
-#else
-	widget = gtk_combo_box_new();
-#endif // GTK(3,0,0)
+	ptr = get_string_from_config("print","colors","");
+	if(*ptr)
+		v3270_set_color_table(info->color,ptr);
+	else
+		v3270_set_mono_color_table(info->color,"black","white");
+	g_free(ptr);
 
-	gtk_widget_set_sensitive(widget,FALSE);
-//	info->colorname = get_string_from_config("print","colors",def_colors);
-//	load_color_schemes(widget,info->colorname);
-//	g_signal_connect(G_OBJECT(widget),"changed",G_CALLBACK(color_scheme_changed),info);
+	widget = color_scheme_new(info->color);
 
+	g_object_set_data(G_OBJECT(container),"combo",widget);
 	gtk_table_attach(GTK_TABLE(container),widget,1,2,1,2,GTK_EXPAND|GTK_FILL,GTK_FILL,5,0);
 
 	// Selection checkbox
@@ -316,9 +246,24 @@
 
  static void custom_widget_apply(GtkPrintOperation *prt, GtkWidget *widget, PRINT_INFO *info)
  {
- 	trace("%s",__FUNCTION__);
-	set_string_to_config("print","colors",info->colorname);
-	v3270_set_color_table(info->color,info->colorname);
+ 	GtkWidget	* combo = g_object_get_data(G_OBJECT(widget),"combo");
+ 	GdkColor 	* clr	= g_object_get_data(G_OBJECT(combo),"selected");
+
+	if(clr)
+	{
+		int f;
+		GString *str = g_string_new("");
+		for(f=0;f<V3270_COLOR_COUNT;f++)
+		{
+			info->color[f] = clr[f];
+			if(f)
+				g_string_append_c(str,',');
+			g_string_append_printf(str,"%s",gdk_color_to_string(clr+f));
+		}
+		set_string_to_config("print","colors","%s",str->str);
+		g_string_free(str,TRUE);
+	}
+	g_object_unref(combo);
  }
 
  static GtkPrintOperation * begin_print_operation(GtkAction *action, GtkWidget *widget, PRINT_INFO **info)
diff --git a/src/gtk/v3270/v3270.h b/src/gtk/v3270/v3270.h
index a3c380c..0dd7b0a 100644
--- a/src/gtk/v3270/v3270.h
+++ b/src/gtk/v3270/v3270.h
@@ -219,6 +219,7 @@
  void			  v3270_set_colors(GtkWidget *widget, const gchar *);
  void 			  v3270_set_color_table(GdkColor *table, const gchar *colors);
  const GdkColor	* v3270_get_color_table(GtkWidget *widget);
+ void 			  v3270_set_mono_color_table(GdkColor *table, const gchar *fg, const gchar *bg);
  void		  	  v3270_draw_element(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 *session, guint height, GdkRectangle *rect, GdkColor *color);
  void			  v3270_set_color(GtkWidget *widget, enum V3270_COLOR id, GdkColor *color);
  GdkColor		* v3270_get_color(GtkWidget *widget, enum V3270_COLOR id);
diff --git a/src/gtk/v3270/widget.c b/src/gtk/v3270/widget.c
index 5151aa4..c6816ad 100644
--- a/src/gtk/v3270/widget.c
+++ b/src/gtk/v3270/widget.c
@@ -874,6 +874,24 @@ const GdkColor * v3270_get_color_table(GtkWidget *widget)
  	return GTK_V3270(widget)->color;
 }
 
+void v3270_set_mono_color_table(GdkColor *clr, const gchar *fg, const gchar *bg)
+{
+	int f;
+
+	gdk_color_parse(bg,clr);
+	gdk_color_parse(fg,clr+1);
+
+	for(f=2;f<V3270_COLOR_COUNT;f++)
+		clr[f] = clr[1];
+
+	clr[V3270_COLOR_BLACK]			= *clr;
+	clr[V3270_COLOR_OIA_BACKGROUND]	= *clr;
+	clr[V3270_COLOR_SELECTED_BG]	= clr[V3270_COLOR_WHITE];
+	clr[V3270_COLOR_SELECTED_FG]	= clr[V3270_COLOR_BLACK];
+
+
+}
+
 void v3270_set_color_table(GdkColor *table, const gchar *colors)
 {
  	gchar	**clr;
diff --git a/src/gtk/valgrind.suppression b/src/gtk/valgrind.suppression
index a37bfa5..e3d24a7 100644
--- a/src/gtk/valgrind.suppression
+++ b/src/gtk/valgrind.suppression
@@ -101,3 +101,18 @@
    ...
 }
 
+{
+   g_cclosure_marshal_VOID__BOXED
+   Memcheck:Cond
+   ...
+   fun:g_cclosure_marshal_VOID__BOXED
+   ...
+}
+
+{
+   gdk_window_destroy
+   Memcheck:Cond
+   ...
+   fun:gdk_window_destroy
+   ...
+}
--
libgit2 0.21.2