Implementando movimentação da caixa de seleção

perry.werneck@gmail.com
1 parent bccf6df4
Showing 4 changed files with 59 additions and 10 deletions Show diff stats
src/gtk/actions.c
src/gtk/uiparser/parsefile.c
src/lib3270/selection.c
ui/00default.xml
@@ -177,9 +177,56 @@ void ui_connect_toggle(GtkAction *action, GtkWidget *widget, const gchar *name, 
 	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"));
+	lib3270_move_selection(GTK_V3270(widget)->host,(LIB3270_DIRECTION) g_object_get_data(G_OBJECT(action),"direction"));
+}
+
 void ui_connect_target_action(GtkAction *action, GtkWidget *widget, const gchar *target, const gchar *direction, GError **error)
 {
-	#warning TODO: Implementar
+	static const gchar *dirname[] = {	"up", "down", "left", "right" };
+
+	LIB3270_DIRECTION dir = (LIB3270_DIRECTION) -1;
+	int f;
+
+	if(!(direction && target))
+	{
+		gtk_action_set_sensitive(action,FALSE);
+		return;
+	}
+
+	for(f=0;f<G_N_ELEMENTS(dirname) && dir == -1;f++)
+	{
+		if(!g_strcasecmp(direction,dirname[f]))
+		{
+			dir = f;
+			break;
+		}
+	}
+
+	if(dir == -1)
+	{
+		*error = g_error_new(	g_quark_from_static_string(PACKAGE_NAME),
+								ENOENT,
+								_( "Unexpected direction \"%s\""),
+								direction);
+	}
+
+	if(!g_strcasecmp(target,"selection"))
+	{
+		g_object_set_data(G_OBJECT(action),"direction",(gpointer) dir);
+		g_signal_connect(action,"activate",G_CALLBACK(selection_move_action),widget);
+
+	}
+	else
+	{
+		*error = g_error_new(	g_quark_from_static_string(PACKAGE_NAME),
+								ENOENT,
+								_( "Unexpected target \"%s\""),
+								target);
+	}
+
 }
 static void action_pfkey(GtkAction *action, GtkWidget *widget)
@@ -155,8 +155,8 @@
 	}
 	else if(!g_strcasecmp(name,"move"))
 	{
-		const gchar *target    = ui_get_attribute("target",names,values);
-		const gchar *direction = ui_get_attribute("direction",names,values);
+		target    = ui_get_attribute("target",names,values);
+		direction = ui_get_attribute("direction",names,values);
 		if(!(target && direction))
 		{
@@ -214,10 +214,10 @@
 		if(ix >= 0)
 			ui_connect_index_action(info->action[ix] = action,info->center_widget,ix,info->action);
-		else if(g_strcasecmp(name,"quit"))
-			connect(action,info->center_widget,name,id);
 		else if(target)
 			ui_connect_target_action(action,info->center_widget,target,direction,error);
+		else if(g_strcasecmp(name,"quit"))
+			connect(action,info->center_widget,name,id);
 		else
 			g_signal_connect(action,"activate",G_CALLBACK(gtk_main_quit), NULL);
@@ -376,7 +376,7 @@ LIB3270_EXPORT int lib3270_move_selection(H3270 *hSession, LIB3270_DIRECTION dir
 		break;
 	case LIB3270_DIR_RIGHT:
-		if( (hSession->select.end % hSession->cols) >= hSession->cols)
+		if( (hSession->select.end % hSession->cols) >= (hSession->cols-1))
 			return EINVAL;
 		hSession->select.begin++;
 		hSession->select.end++;
@@ -387,5 +387,7 @@ LIB3270_EXPORT int lib3270_move_selection(H3270 *hSession, LIB3270_DIRECTION dir
 	}
 	update_selection(hSession);
+	lib3270_set_cursor_address(hSession,hSession->select.end);
+
 	return 0;
 }
@@ -194,10 +194,10 @@
 	<accelerator action='SelectUp' key='<Shift>Up' group='online' />
 	<accelerator action='SelectDown' key='<Shift>Down' group='online' />
-	<accelerator action='SelectionRight' key='<alt>Right' />
-	<accelerator action='SelectionLeft' key='<alt>Left' />
-	<accelerator action='SelectionUp' key='<alt>Up' />
-	<accelerator action='SelectionDown' key='<alt>Down' />
+	<accelerator action='move' target='selection' direction='right' key='<alt>Right' />
+	<accelerator action='move' target='selection' direction='left' key='<alt>Left' />
+	<accelerator action='move' target='selection' direction='up' key='<alt>Up' />
+	<accelerator action='move' target='selection' direction='down' key='<alt>Down' />
 	<accelerator action='CursorRight' key='Right' group='online' />
 	<accelerator action='CursorLeft' key='Left' group='online' />
	@@ -177,9 +177,56 @@ void ui_connect_toggle(GtkAction action, GtkWidget widget, const gchar *name,		@@ -177,9 +177,56 @@ void ui_connect_toggle(GtkAction action, GtkWidget widget, const gchar *name,
177	gtk_action_set_sensitive(action,FALSE);	177	gtk_action_set_sensitive(action,FALSE);
178	}	178	}
179		179
		180	+static void selection_move_action(GtkAction action, GtkWidget widget)
		181	+{
		182	+ trace("Action %s activated on widget %p dir=%d",gtk_action_get_name(action),widget,g_object_get_data(G_OBJECT(action),"direction"));
		183	+ lib3270_move_selection(GTK_V3270(widget)->host,(LIB3270_DIRECTION) g_object_get_data(G_OBJECT(action),"direction"));
		184	+}
		185	+
180	void ui_connect_target_action(GtkAction action, GtkWidget widget, const gchar target, const gchar direction, GError **error)	186	void ui_connect_target_action(GtkAction action, GtkWidget widget, const gchar target, const gchar direction, GError **error)
181	{	187	{
182	- #warning TODO: Implementar	188	+ static const gchar *dirname[] = { "up", "down", "left", "right" };
		189	+
		190	+ LIB3270_DIRECTION dir = (LIB3270_DIRECTION) -1;
		191	+ int f;
		192	+
		193	+ if(!(direction && target))
		194	+ {
		195	+ gtk_action_set_sensitive(action,FALSE);
		196	+ return;
		197	+ }
		198	+
		199	+ for(f=0;f<G_N_ELEMENTS(dirname) && dir == -1;f++)
		200	+ {
		201	+ if(!g_strcasecmp(direction,dirname[f]))
		202	+ {
		203	+ dir = f;
		204	+ break;
		205	+ }
		206	+ }
		207	+
		208	+ if(dir == -1)
		209	+ {
		210	+ *error = g_error_new( g_quark_from_static_string(PACKAGE_NAME),
		211	+ ENOENT,
		212	+ _( "Unexpected direction \"%s\""),
		213	+ direction);
		214	+ }
		215	+
		216	+ if(!g_strcasecmp(target,"selection"))
		217	+ {
		218	+ g_object_set_data(G_OBJECT(action),"direction",(gpointer) dir);
		219	+ g_signal_connect(action,"activate",G_CALLBACK(selection_move_action),widget);
		220	+
		221	+ }
		222	+ else
		223	+ {
		224	+ *error = g_error_new( g_quark_from_static_string(PACKAGE_NAME),
		225	+ ENOENT,
		226	+ _( "Unexpected target \"%s\""),
		227	+ target);
		228	+ }
		229	+
183	}	230	}
184		231
185	static void action_pfkey(GtkAction action, GtkWidget widget)	232	static void action_pfkey(GtkAction action, GtkWidget widget)