From 22765196d65d421077c5bc5cd28b0f8d11bab6ff Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Tue, 20 Mar 2012 23:06:15 +0000
Subject: [PATCH] Reorganizando montagem das acoes para uso de novos atributos

---
 src/gtk/actions.c            | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 src/gtk/uiparser/parsefile.c |  41 +++++++++++++++++++++--------------------
 src/gtk/uiparser/parser.h    |  17 +++++++++++------
 src/gtk/uiparser/private.h   |   2 --
 src/lib3270/toggles.c        |  13 +++++++------
 ui/00default.xml             |  38 +++++++++++++++++++-------------------
 6 files changed, 242 insertions(+), 60 deletions(-)

diff --git a/src/gtk/actions.c b/src/gtk/actions.c
index 8e67451..e6166b9 100644
--- a/src/gtk/actions.c
+++ b/src/gtk/actions.c
@@ -35,8 +35,11 @@
  #include <lib3270/actions.h>
  #include <lib3270/selection.h>
 
+ #define ERROR_DOMAIN g_quark_from_static_string(PACKAGE_NAME)
+
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
+/*
 static void lib3270_action(GtkAction *action, GtkWidget *widget)
 {
 	int	(*call)(H3270 *h) = (int (*)(H3270 *h)) g_object_get_data(G_OBJECT(action),"lib3270_call");
@@ -92,7 +95,7 @@ void ui_connect_action(GtkAction *action, GtkWidget *widget, const gchar *name, 
 	#define DECLARE_LIB3270_CLEAR_SELECTION_ACTION( name )		{ #name, lib3270_ ## name			},
 	#define DECLARE_LIB3270_KEY_ACTION( name )					{ #name, lib3270_ ## name			},
 	#define DECLARE_LIB3270_CURSOR_ACTION( name )				{ #name, lib3270_cursor_ ## name	},
-	#define DECLARE_LIB3270_FKEY_ACTION( name )					/* name */
+	#define DECLARE_LIB3270_FKEY_ACTION( name )					// name
 
 	static const struct _lib3270_action
 	{
@@ -147,6 +150,7 @@ void ui_connect_action(GtkAction *action, GtkWidget *widget, const gchar *name, 
 	// Not-found, disable action
 	gtk_action_set_sensitive(action,FALSE);
 }
+*/
 
 static void lib3270_toggle_action(GtkToggleAction *action,GtkWidget *widget)
 {
@@ -157,6 +161,7 @@ static void lib3270_toggle_action(GtkToggleAction *action,GtkWidget *widget)
 	lib3270_set_toggle(GTK_V3270(widget)->host,toggle,gtk_toggle_action_get_active(action));
 }
 
+/*
 void ui_connect_toggle(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id)
 {
 	LIB3270_TOGGLE toggle = lib3270_get_toggle_id(id);
@@ -176,7 +181,9 @@ void ui_connect_toggle(GtkAction *action, GtkWidget *widget, const gchar *name, 
 	// Not found, disable action
 	gtk_action_set_sensitive(action,FALSE);
 }
+*/
 
+/*
 static void selection_move_action(GtkAction *action, GtkWidget *widget)
 {
 	trace("Action %s activated on widget %p dir=%d",gtk_action_get_name(action),widget,g_object_get_data(G_OBJECT(action),"direction"));
@@ -219,6 +226,7 @@ void ui_connect_target_action(GtkAction *action, GtkWidget *widget, const gchar 
 	}
 
 }
+*/
 
 static void action_pfkey(GtkAction *action, GtkWidget *widget)
 {
@@ -226,18 +234,13 @@ static void action_pfkey(GtkAction *action, GtkWidget *widget)
 	lib3270_pfkey(GTK_V3270(widget)->host,(int) g_object_get_data(G_OBJECT(action),"pfkey"));
 }
 
-void ui_connect_pfkey(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id)
-{
-	g_object_set_data(G_OBJECT(action),"pfkey",(gpointer) atoi(id));
-	g_signal_connect(action,"activate",G_CALLBACK(action_pfkey),widget);
-}
-
 static void action_pakey(GtkAction *action, GtkWidget *widget)
 {
 	trace("Action %s activated on widget %p key=%d",gtk_action_get_name(action),widget,g_object_get_data(G_OBJECT(action),"pakey"));
 	lib3270_pakey(GTK_V3270(widget)->host,(int) g_object_get_data(G_OBJECT(action),"pakey"));
 }
 
+/*
 static void action_fullscreen(GtkAction *action, GtkWidget *widget)
 {
 	lib3270_set_toggle(GTK_V3270(widget)->host,LIB3270_TOGGLE_FULL_SCREEN,1);
@@ -290,4 +293,178 @@ void ui_connect_index_action(GtkAction *action, GtkWidget *widget, int ix, GtkAc
 		g_warning("Action \"%s\" has unexpected id %d",gtk_action_get_name(action),ix);
 		gtk_action_set_sensitive(action,FALSE);
 	}
+ }
+*/
+
+GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash, const gchar **names, const gchar **values, GError **error)
+{
+ 	GtkAction		* action 		= NULL;
+	GtkAction 		**toggle_action	= (GtkAction **) g_object_get_data(G_OBJECT(widget),"toggle_actions");
+	const gchar		* direction		= ui_get_attribute("direction",names,values);
+	unsigned short	  flags			= 0;
+	const gchar		* attr;
+	int				  id			= 0;
+	gchar			* nm			= NULL;
+
+	enum _action_type
+	{
+		ACTION_TYPE_DEFAULT,
+		ACTION_TYPE_TOGGLE,
+		ACTION_TYPE_MOVE,
+		ACTION_TYPE_PFKEY,
+		ACTION_TYPE_PAKEY,
+		ACTION_TYPE_SET,
+		ACTION_TYPE_RESET,
+
+	} action_type = ACTION_TYPE_DEFAULT;
+
+	if(direction)
+	{
+		static const gchar *dirname[] = { "up", "down", "left", "right" };
+		int f;
+
+		for(f=0;f<G_N_ELEMENTS(dirname);f++)
+		{
+			if(!g_strcasecmp(direction,dirname[f]))
+			{
+				flags |= f;
+				break;
+			}
+		}
+	}
+
+	if(ui_get_bool_attribute("selecting",names,values,FALSE))
+		flags |= 0x80;
+
+	// Build action name & type
+	if(!g_strcasecmp(name,"toggle"))
+	{
+		action_type	= ACTION_TYPE_TOGGLE;
+		attr		= ui_get_attribute("id",names,values);
+		id			= lib3270_get_toggle_id(attr);
+		if(id < 0)
+		{
+			*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s",_("Toggle action needs a valid toggle id" ));
+			return NULL;
+		}
+		nm 	= g_strconcat(name,attr,NULL);
+	}
+	else if(!g_strcasecmp(name,"move"))
+	{
+		action_type	= ACTION_TYPE_MOVE;
+		attr		= ui_get_attribute("target",names,values);
+
+		if(!(attr && direction))
+		{
+			*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s",_("Move action needs target & direction attributes" ));
+			return NULL;
+		}
+
+		nm = g_strconcat((flags & 0x80) ? "select" : "move",attr,direction, NULL);
+
+	}
+	else if(!g_strcasecmp(name,"set"))
+	{
+		attr		= ui_get_attribute("toggle",names,values);
+		id			= lib3270_get_toggle_id(attr);
+		if(id < 0)
+		{
+			*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s",_("Set action needs a valid toggle name" ));
+			return NULL;
+		}
+		nm 	 = g_strconcat("set",attr,NULL);
+	}
+	else if(!g_strcasecmp(name,"reset"))
+	{
+		attr		= ui_get_attribute("toggle",names,values);
+		id			= lib3270_get_toggle_id(attr);
+		if(id < 0)
+		{
+			*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s",_("Reset action needs a valid toggle name" ));
+			return NULL;
+		}
+		nm = g_strconcat("reset",attr,NULL);
+	}
+	else if(!g_strcasecmp(name,"pfkey"))
+	{
+		action_type = ACTION_TYPE_PFKEY;
+		attr 		= ui_get_attribute("id",names,values);
+		if(!attr)
+		{
+			*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s",_("pf action needs a valid id attribute" ));
+			return NULL;
+		}
+		id   = atoi(attr);
+		nm   = g_strdup_printf("pf%02d",id);
+	}
+	else if(!g_strcasecmp(name,"pakey"))
+	{
+		action_type = ACTION_TYPE_PAKEY;
+		attr 		= ui_get_attribute("id",names,values);
+		if(!attr)
+		{
+			*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s",_("pf action needs a valid id attribute" ));
+			return NULL;
+		}
+		id   = atoi(attr);
+		nm   = g_strdup_printf("pa%02d",id);
+	}
+	else
+	{
+		nm = g_strdup(name);
+	}
+
+	// Check if action is available
+	action = g_hash_table_lookup(hash,nm);
+	if(action)
+	{
+		g_free(nm);
+		return action;
+	}
+
+	// Not available, create a new one
+	switch(action_type)
+	{
+	case ACTION_TYPE_DEFAULT:
+		action = gtk_action_new(nm,NULL,NULL,NULL);
+		break;
+
+	case ACTION_TYPE_TOGGLE:
+		action = GTK_ACTION(gtk_toggle_action_new(nm,NULL,NULL,NULL));
+		toggle_action[id] = action;
+		g_object_set_data(G_OBJECT(action),"toggle_id",(gpointer) id);
+		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action),(lib3270_get_toggle(GTK_V3270(widget)->host,id) != 0));
+		g_signal_connect(action,"toggled",G_CALLBACK(lib3270_toggle_action),widget);
+		break;
+
+	case ACTION_TYPE_MOVE:
+		action = gtk_action_new(nm,NULL,NULL,NULL);
+		break;
+
+	case ACTION_TYPE_PFKEY:
+		action = gtk_action_new(nm,NULL,NULL,NULL);
+		g_object_set_data(G_OBJECT(action),"pfkey",(gpointer) id);
+		g_signal_connect(action,"activate",G_CALLBACK(action_pfkey),widget);
+		break;
+
+	case ACTION_TYPE_PAKEY:
+		action = gtk_action_new(nm,NULL,NULL,NULL);
+		g_object_set_data(G_OBJECT(action),"pakey",(gpointer) id);
+		g_signal_connect(action,"activate",G_CALLBACK(action_pakey),widget);
+		break;
+
+	case ACTION_TYPE_SET:
+		action = gtk_action_new(nm,NULL,NULL,NULL);
+		break;
+
+	case ACTION_TYPE_RESET:
+		action = gtk_action_new(nm,NULL,NULL,NULL);
+		break;
+	}
+
+	g_hash_table_insert(hash,nm,action);
+	g_free(nm);
+
+	return action;
 }
+
diff --git a/src/gtk/uiparser/parsefile.c b/src/gtk/uiparser/parsefile.c
index 39b5a36..9948e16 100644
--- a/src/gtk/uiparser/parsefile.c
+++ b/src/gtk/uiparser/parsefile.c
@@ -139,33 +139,34 @@
 
  static GtkAction * get_action(const gchar *name, struct parser *info, const gchar **names, const gchar **values, GError **error)
  {
+ 	GtkAction *action;
+
+ 	if(!g_strcasecmp(name,"quit"))
+	{
+		action = g_hash_table_lookup(info->actions,name);
+		if(!action)
+		{
+			action = gtk_action_new(name,NULL,NULL,NULL);
+			g_signal_connect(action,"activate",G_CALLBACK(gtk_main_quit), NULL);
+		}
+	}
+ 	else
+	{
+		action = ui_get_action(info->center_widget,name,info->actions,names,values,error);
+	}
+
+	if(!action)
+		return action;
+
+/*
 	const gchar		* target   	= NULL;
 	const gchar		* direction	= ui_get_attribute("direction",names,values);
 	const gchar		* id		= ui_get_attribute("id",names,values);
-	unsigned short	  flags		= 0;
 	GtkAction		* action;
 	gchar			* nm;
 	void			  (*connect)(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id)		= ui_connect_action;
 	GtkAction		* (*create)(const gchar *,const gchar *,const gchar *,const gchar *)						= gtk_action_new;
 
-	if(direction)
-	{
-		static const gchar *dirname[] = {	"up", "down", "left", "right" };
-		int f;
-
-		for(f=0;f<G_N_ELEMENTS(dirname);f++)
-		{
-			if(!g_strcasecmp(direction,dirname[f]))
-			{
-				flags |= f;
-				break;
-			}
-		}
-	}
-
-	if(ui_get_bool_attribute("selecting",names,values,FALSE))
-		flags |= 0x80;
-
 	if(!g_strcasecmp(name,"toggle"))
 	{
 		nm 		= g_strconcat(name,id,NULL);
@@ -241,7 +242,7 @@
 			g_signal_connect(action,"activate",G_CALLBACK(gtk_main_quit), NULL);
 
 	}
-
+*/
 	ui_action_set_options(action,info,names,values,error);
 
 	return action;
diff --git a/src/gtk/uiparser/parser.h b/src/gtk/uiparser/parser.h
index ebf4724..42cabed 100644
--- a/src/gtk/uiparser/parser.h
+++ b/src/gtk/uiparser/parser.h
@@ -52,11 +52,16 @@
 	} UI_WIDGET_SETUP;
 
 	GtkWidget 		* ui_parse_xml_folder(const gchar *path, const gchar ** groupname, const gchar **popupname, const gchar **actionname, GtkWidget *widget, const UI_WIDGET_SETUP *itn);
-	void			  ui_connect_action(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id);
-	void			  ui_connect_target_action(GtkAction *action, GtkWidget *widget, const gchar *target, unsigned short flags, GError **error);
-	void			  ui_connect_index_action(GtkAction *action, GtkWidget *widget, int ix, GtkAction **lst);
-	void			  ui_connect_toggle(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id);
-	void			  ui_connect_pfkey(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id);
-	void			  ui_connect_pakey(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id);
+	const gchar		* ui_get_attribute(const gchar *key, const gchar **name, const gchar **value);
+	gboolean		  ui_get_bool_attribute(const gchar *key, const gchar **name, const gchar **value, gboolean def);
+	GtkAction		* ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash, const gchar **names, const gchar **values, GError **error);
+
+
+//	void			  ui_connect_action(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id);
+//	void			  ui_connect_target_action(GtkAction *action, GtkWidget *widget, const gchar *target, unsigned short flags, GError **error);
+//	void			  ui_connect_index_action(GtkAction *action, GtkWidget *widget, int ix, GtkAction **lst);
+//	void			  ui_connect_toggle(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id);
+//	void			  ui_connect_pfkey(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id);
+//	void			  ui_connect_pakey(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id);
 
 #endif // UI_PARSER_H_INCLUDED
diff --git a/src/gtk/uiparser/private.h b/src/gtk/uiparser/private.h
index 83ab5ef..1b0a19f 100644
--- a/src/gtk/uiparser/private.h
+++ b/src/gtk/uiparser/private.h
@@ -69,8 +69,6 @@
 	const UI_WIDGET_SETUP	*  setup;
  };
 
- const gchar	* ui_get_attribute(const gchar *key, const gchar **name, const gchar **value);
- gboolean		  ui_get_bool_attribute(const gchar *key, const gchar **name, const gchar **value, gboolean def);
  int 			  ui_parse_file(struct parser *info, const gchar *filename);
  void 			  ui_action_set_options(GtkAction *action, struct parser *info, const gchar **names, const gchar **values, GError **error);
 
diff --git a/src/lib3270/toggles.c b/src/lib3270/toggles.c
index 6e3d409..3f725f7 100644
--- a/src/lib3270/toggles.c
+++ b/src/lib3270/toggles.c
@@ -222,14 +222,15 @@ LIB3270_EXPORT const char * lib3270_get_toggle_name(LIB3270_TOGGLE_ID ix)
 
 LIB3270_EXPORT LIB3270_TOGGLE lib3270_get_toggle_id(const char *name)
 {
-	int f;
-
-	for(f=0;f<N_TOGGLES;f++)
+	if(name)
 	{
-		if(!strcasecmp(name,toggle_names[f]))
-			return f;
+		int f;
+		for(f=0;f<N_TOGGLES;f++)
+		{
+			if(!strcasecmp(name,toggle_names[f]))
+				return f;
+		}
 	}
-
 	return -1;
 }
 
diff --git a/ui/00default.xml b/ui/00default.xml
index 16ff1eb..71565f2 100644
--- a/ui/00default.xml
+++ b/ui/00default.xml
@@ -93,22 +93,22 @@
 			<menuitem name='ScreenSizes' group='offline' label='Screen size' />
 
 			<menu name='OptionsMenu' label='_Options' >
-				<menuitem action='Toggle' id='AutoConnect' label='Connect on startup' />
-				<menuitem action='Toggle' id='CursorBlink' label='Blinking Cursor' />
-				<menuitem action='Toggle' id='Monocase' label='Monocase' />
-				<menuitem action='Toggle' id='CursorPos'  label='Track Cursor' />
-				<menuitem action='Toggle' id='FullScreen' key='<alt>Home' label='Full Screen' />
-				<menuitem action='Toggle' id='MarginedPaste'  label='Paste with left margin' />
-				<menuitem action='Toggle' id='CrossHair' key='<alt>x' label='Cross Hair Cursor' />
-				<menuitem action='Toggle' id='BlankFill' label='Blank Fill' />
-				<menuitem action='Toggle' id='RectSelect'  label='Select by rectangles' />
-				<menuitem action='Toggle' id='Reconnect' label='Auto-Reconnect'  />
-				<menuitem action='Toggle' id='Bold' label='Bold'  />
-				<menuitem action='Toggle' id='Underline' label='Show Underline'  />
-				<menuitem action='Toggle' id='KeepSelected' label='Keep selected' />
-				<menuitem action='Toggle' id='SmartPaste' label='Smart paste' />
-				<menuitem action='Toggle' id='Beep' label='Alert sound' />
-				<menuitem action='Toggle' id='KPAlternative' label='Use +/- for field navigation' />
+				<menuitem action='toggle' id='AutoConnect' label='Connect on startup' />
+				<menuitem action='toggle' id='CursorBlink' label='Blinking Cursor' />
+				<menuitem action='toggle' id='Monocase' label='Monocase' />
+				<menuitem action='toggle' id='CursorPos'  label='Track Cursor' />
+				<menuitem action='toggle' id='FullScreen' key='<alt>Home' label='Full Screen' />
+				<menuitem action='toggle' id='MarginedPaste'  label='Paste with left margin' />
+				<menuitem action='toggle' id='CrossHair' key='<alt>x' label='Cross Hair Cursor' />
+				<menuitem action='toggle' id='BlankFill' label='Blank Fill' />
+				<menuitem action='toggle' id='RectSelect'  label='Select by rectangles' />
+				<menuitem action='toggle' id='Reconnect' label='Auto-Reconnect'  />
+				<menuitem action='toggle' id='Bold' label='Bold'  />
+				<menuitem action='toggle' id='Underline' label='Show Underline'  />
+				<menuitem action='toggle' id='KeepSelected' label='Keep selected' />
+				<menuitem action='toggle' id='SmartPaste' label='Smart paste' />
+				<menuitem action='toggle' id='Beep' label='Alert sound' />
+				<menuitem action='toggle' id='KPAlternative' label='Use +/- for field navigation' />
 			</menu>
 
 			<!--- Special action - InputMethod menu will be populated with Gtk input_method menu items --->
@@ -133,8 +133,8 @@
 		<toolitem action='Disconnect' />
 
 		<separator/>
-		<toolitem action='ToggleSet' id='FullScreen' icon='fullscreen' label='Full Screen' />
-		<toolitem action='ToggleReset' id='FullScreen' icon='leave-fullscreen' label='Window' />
+		<toolitem action='set' toggle='fullscreen' icon='fullscreen' label='Full Screen' />
+		<toolitem action='reset' toggle='fullscreen' icon='leave-fullscreen' label='Window' />
 		<toolitem action='SelectColors' />
 		<toolitem action='PrintScreen' />
 		<toolitem action='Quit' />
@@ -175,7 +175,7 @@
 	<accelerator action='Toggle' id='Insert' key='Insert' group='online' />
 
 	<accelerator action='Home' key='Home' group='online' />
-	<accelerator action='Reset' key='<Shift><Ctrl>r' group='online' />
+	<!-- accelerator action='Reset' key='<Shift><Ctrl>r' group='online' /-->
 	<accelerator action='Return' key='Return' />
 	<accelerator action='Enter' key='KP_Enter' />
 	<accelerator action='Break' key='Escape' group='online' />
--
libgit2 0.21.2