From 67471cd984cebc743d1634a4d6d9d2246c6a2fc2 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Thu, 29 Mar 2012 18:11:00 +0000
Subject: [PATCH] Implementando controle de cores

---
 src/gtk/colors.c       | 126 ++++++++++++++++++++++++------------------------------------------------------------------------------------------------------
 src/gtk/v3270/v3270.h  |   1 +
 src/gtk/v3270/widget.c |   6 ++++++
 3 files changed, 31 insertions(+), 102 deletions(-)

diff --git a/src/gtk/colors.c b/src/gtk/colors.c
index 33ad7df..be9595f 100644
--- a/src/gtk/colors.c
+++ b/src/gtk/colors.c
@@ -32,106 +32,6 @@
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
-/*
- void load_color_schemes(GtkWidget *widget, gchar *active)
- {
-
-	else
-	{
-		gchar 		** group;
-		GKeyFile	*  conf 	= g_key_file_new();
-		int			   f		= 0;
-		gboolean	   found 	= FALSE;
-
-#if !GTK_CHECK_VERSION(3,0,0)
-		GtkTreeModel	* model		= (GtkTreeModel *) gtk_list_store_new(2,G_TYPE_STRING,G_TYPE_STRING);
-		GtkCellRenderer * renderer	= gtk_cell_renderer_text_new();
-		GtkTreeIter		  iter;
-
-		gtk_combo_box_set_model(GTK_COMBO_BOX(widget),model);
-
-		gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(widget), renderer, TRUE);
-		gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(widget), renderer, "text", 0, NULL);
-
-#endif // !GTK(3,0,0)
-
-		g_key_file_load_from_file(conf,filename,G_KEY_FILE_NONE,NULL);
-
-		group = g_key_file_get_groups(conf,NULL);
-
-		for(f=0;group[f];f++)
-		{
-			gchar *str = g_strjoin( ",",	g_key_file_get_string(conf,group[f],"Terminal",NULL),
-											g_key_file_get_string(conf,group[f],"BaseAttributes",NULL),
-											g_key_file_get_string(conf,group[f],"SelectedText",NULL),
-											g_key_file_get_string(conf,group[f],"Cursor",NULL),
-											g_key_file_get_string(conf,group[f],"OIA",NULL),
-											NULL
-								);
-#if GTK_CHECK_VERSION(3,0,0)
-
-			gtk_combo_box_text_insert(		GTK_COMBO_BOX_TEXT(widget),
-											f,
-											str,
-											g_key_file_get_locale_string(conf,group[f],"Label",NULL,NULL));
-
-
-			if(active && !g_strcasecmp(active,str))
-			{
-				found = TRUE;
-				gtk_combo_box_set_active(GTK_COMBO_BOX(widget),f);
-			}
-#else
-
-			gtk_list_store_append((GtkListStore *) model,&iter);
-			gtk_list_store_set((GtkListStore *) model, &iter,
-												0, g_key_file_get_locale_string(conf,group[f],"Label",NULL,NULL),
-												1, str,
-												-1);
-
-			if(active && !g_strcasecmp(active,str))
-			{
-				found = TRUE;
-				gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widget),&iter);
-			}
-
-#endif // GTK(3,0,0)
-
-			g_free(str);
-		}
-
-		g_strfreev(group);
-		g_key_file_free(conf);
-
-		if(active && !found)
-		{
-#if GTK_CHECK_VERSION(3,0,0)
-
-			gtk_combo_box_text_insert(		GTK_COMBO_BOX_TEXT(widget),
-											0,
-											active,
-											_( "Custom colors") );
-			gtk_combo_box_set_active(GTK_COMBO_BOX(widget),0);
-
-#else
-
-			gtk_list_store_append((GtkListStore *) model,&iter);
-			gtk_list_store_set((GtkListStore *) model, &iter,
-												0, _( "Custom colors" ),
-												1, active,
-												-1);
-
-			gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widget),&iter);
-#endif
-		}
-
-		gtk_widget_set_sensitive(widget,TRUE);
-
-	}
-
-	g_free(filename);
- }
-*/
 
 static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 {
@@ -294,13 +194,28 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 
  }
 
+ static gboolean compare_colors(const GdkColor *colora, const GdkColor *colorb)
+ {
+ 	int f;
+
+ 	for(f=0;f<V3270_COLOR_COUNT;f++)
+	{
+		if(!gdk_color_equal(colora+f,colorb+f))
+			return FALSE;
+	}
+
+ 	return TRUE;
+ }
+
 /**
  * Create a color scheme dropdown button
  *
  * @param clr	Pointer to current color table
  *
+ * @return Combobox widget with colors.conf loaded and set
+ *
  */
- GtkWidget * color_scheme_new(GdkColor *clr)
+ GtkWidget * color_scheme_new(const GdkColor *current)
  {
 	gchar			* filename	= build_data_filename("colors.conf",NULL);
 	GtkTreeModel	* model		= (GtkTreeModel *) gtk_list_store_new(2,G_TYPE_STRING,G_TYPE_POINTER);
@@ -355,6 +270,13 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 													1, clr,
 													-1);
 
+				if(compare_colors(clr,current) && current)
+				{
+					// It's the same color, select iter
+					trace("Current color scheme is \"%s\"",group[g]);
+					gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widget),&iter);
+				}
+
 				// move to next color list
 				pos += V3270_COLOR_COUNT;
 			}
@@ -558,7 +480,7 @@ static void load_color_scheme(GKeyFile *conf, const gchar *group, GdkColor *clr)
 	// Color scheme combo
 	{
 		GtkWidget * box		= gtk_hbox_new(FALSE,2);
-		GtkWidget * button	= color_scheme_new(NULL);
+		GtkWidget * button	= color_scheme_new(v3270_get_color_table(widget));
 
 		g_object_set_data(G_OBJECT(button),"terminal_widget",widget);
 		g_object_set_data(G_OBJECT(button),"color_selection_widget",color);
diff --git a/src/gtk/v3270/v3270.h b/src/gtk/v3270/v3270.h
index 8fe4c37..a3c380c 100644
--- a/src/gtk/v3270/v3270.h
+++ b/src/gtk/v3270/v3270.h
@@ -218,6 +218,7 @@
  // Colors
  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_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 7358194..5151aa4 100644
--- a/src/gtk/v3270/widget.c
+++ b/src/gtk/v3270/widget.c
@@ -868,6 +868,12 @@ GdkColor * v3270_get_color(GtkWidget *widget, enum V3270_COLOR id)
  	return GTK_V3270(widget)->color+id;
 }
 
+const GdkColor * v3270_get_color_table(GtkWidget *widget)
+{
+	g_return_val_if_fail(GTK_IS_V3270(widget),NULL);
+ 	return GTK_V3270(widget)->color;
+}
+
 void v3270_set_color_table(GdkColor *table, const gchar *colors)
 {
  	gchar	**clr;
--
libgit2 0.21.2