From 93290192c1ee1577bc106f1103c5528ea41ce48c Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Thu, 24 Jan 2019 17:44:23 -0200
Subject: [PATCH] Rewriting color scheme selector.

---
 colors.conf                     |  2 +-
 src/dialogs/colorscheme.c       | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/include/v3270/colorscheme.h |  3 ++-
 src/testprogram/testprogram.c   |  3 ++-
 src/v3270/colors.c              |  2 +-
 5 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/colors.conf b/colors.conf
index bc8c8e8..9a953f1 100644
--- a/colors.conf
+++ b/colors.conf
@@ -31,7 +31,7 @@ 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
+OIA=#000000;#00FF00;#7890F0;#FFFFFF;#FFFF00
 
 cross-hair=#00FF00
 
diff --git a/src/dialogs/colorscheme.c b/src/dialogs/colorscheme.c
index 98d6c61..9e2d8fb 100644
--- a/src/dialogs/colorscheme.c
+++ b/src/dialogs/colorscheme.c
@@ -308,3 +308,59 @@
 	return widget;
  }
 
+ static gboolean compare_colors(const GdkRGBA *colora, const GdkRGBA *colorb)
+ {
+ 	int f;
+
+ 	for(f=0;f<V3270_COLOR_COUNT;f++)
+	{
+		if(!gdk_rgba_equal(colora+f,colorb+f))
+		{
+#ifdef DEBUG
+			g_autofree gchar * cla = gdk_rgba_to_string(colora+f);
+			g_autofree gchar * clb = gdk_rgba_to_string(colorb+f);
+
+			debug(
+				"diff on %d of %d %s - %s",
+					f,
+					V3270_COLOR_COUNT,
+					cla,
+					clb
+			);
+#endif // DEBUG
+
+			return FALSE;
+		}
+	}
+
+ 	return TRUE;
+ }
+
+ void v3270_color_scheme_set_rgba(GtkWidget *widget, const GdkRGBA *colors)
+ {
+ 	GtkTreeModel	* model = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
+	GtkTreeIter		  iter;
+
+	if(gtk_tree_model_get_iter_first(model,&iter))
+	{
+		do
+		{
+			GdkRGBA		* clr		= NULL;
+			GValue		  value	= { 0, };
+
+			gtk_tree_model_get_value(model,&iter,1,&value);
+			clr = g_value_get_pointer(&value);
+
+			debug("%p",clr);
+
+			if(clr && compare_colors(clr,colors))
+			{
+				gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widget),&iter);
+				break;
+			}
+
+		} while(gtk_tree_model_iter_next(model,&iter));
+	}
+
+
+ }
diff --git a/src/include/v3270/colorscheme.h b/src/include/v3270/colorscheme.h
index cc303c3..2bf4d0a 100644
--- a/src/include/v3270/colorscheme.h
+++ b/src/include/v3270/colorscheme.h
@@ -47,7 +47,8 @@
 
 /*--[ Prototipes ]-----------------------------------------------------------------------------------*/
 
- LIB3270_EXPORT GtkWidget * v3270_color_scheme_new();
+ LIB3270_EXPORT GtkWidget	* v3270_color_scheme_new();
+ LIB3270_EXPORT void 		  v3270_color_scheme_set_rgba(GtkWidget *widget, const GdkRGBA *colors);
 
  G_END_DECLS
 
diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c
index d11dd78..ef66c8e 100644
--- a/src/testprogram/testprogram.c
+++ b/src/testprogram/testprogram.c
@@ -90,7 +90,7 @@ static void trace_window_destroy(G_GNUC_UNUSED GtkWidget *widget, H3270 *hSessio
 	lib3270_set_toggle(hSession,LIB3270_TOGGLE_NETWORK_TRACE,0);
 }
 
-static void color_scheme_changed(GtkWidget *widget, const GdkRGBA *colors, GtkWidget *terminal) {
+static void color_scheme_changed(GtkWidget G_GNUC_UNUSED(*widget), const GdkRGBA *colors, GtkWidget *terminal) {
 
 	debug("%s=%p",__FUNCTION__,colors);
 
@@ -173,6 +173,7 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) {
 	GtkWidget *grid		= gtk_grid_new();
 	GtkWidget *color	= v3270_color_scheme_new();
 
+	v3270_color_scheme_set_rgba(color,v3270_get_color_table(terminal));
 	g_signal_connect(G_OBJECT(color),"update-colors",G_CALLBACK(color_scheme_changed),terminal);
 
 	gtk_grid_attach(GTK_GRID(grid),color,0,0,1,1);
diff --git a/src/v3270/colors.c b/src/v3270/colors.c
index d7afcc7..84ae488 100644
--- a/src/v3270/colors.c
+++ b/src/v3270/colors.c
@@ -70,7 +70,7 @@ const gchar * v3270_default_colors =
 		"#7890F0,"			// V3270_COLOR_OIA_SEPARATOR
 		"#FFFFFF,"			// V3270_COLOR_OIA_STATUS_OK
 		"#FFFF00,"			// V3270_COLOR_OIA_STATUS_WARNING
-		"#FF0000";			// V3270_COLOR_OIA_STATUS_INVALID
+		"#FFFF00";			// V3270_COLOR_OIA_STATUS_INVALID
 
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
--
libgit2 0.21.2