Rômulo Silva Neiva

23 de agosto de 2012 08:18 Outra coisa, a configuração do Ctrl como "enter" não funcionou.

Rômulo Silva Neiva
23 de agosto de 2012 08:18 Outra coisa, a configuração do Ctrl como "enter" não funcionou.
perry.werneck@gmail.com
1 parent cb274a9a
Showing 4 changed files with 75 additions and 40 deletions Show diff stats
src/include/v3270.h
src/pw3270/uiparser/parser.c
src/pw3270/v3270/keyboard.c
ui/99debug.xml
@@ -178,6 +178,7 @@
  LIB3270_EXPORT	void		  	  v3270_draw_element(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 *session, guint height, GdkRectangle *rect, GdkColor *color);
  LIB3270_EXPORT	void			  v3270_set_color(GtkWidget *widget, enum V3270_COLOR id, GdkColor *color);
  LIB3270_EXPORT	GdkColor		* v3270_get_color(GtkWidget *widget, enum V3270_COLOR id);
+ LIB3270_EXPORT gboolean		  v3270_set_keyboard_action(GtkWidget *widget, const gchar *key_name, GtkAction *action);
  
  // Misc
  LIB3270_EXPORT	GtkIMContext	* v3270_get_im_context(GtkWidget *widget);
@@ -30,6 +30,7 @@
  */
  
  #include "private.h"
+ #include <v3270.h>
  
  #ifdef HAVE_GTKMAC
 	#include <gtkmacintegration/gtk-mac-menu.h>
@@ -109,8 +110,10 @@ struct action_info
 {
 	GtkActionGroup	** group;
 	GtkAccelGroup	*  accel_group;
+	GtkWidget		*  widget;
 };
  
+
 static void action_group_setup(gpointer key, GtkAction *action, struct action_info *info)
 {
 	int group_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"id_group"));
@@ -130,7 +133,7 @@ static void action_group_setup(gpointer key, GtkAction *action, struct action_in
 */
  
  
-		if(key_name)
+		if(key_name && !v3270_set_keyboard_action(info->widget,key_name,action))
 		{
 			gtk_action_group_add_action_with_accel(info->group[group_id],action,key_name);
 			gtk_action_connect_accelerator(action);
@@ -176,6 +179,7 @@ void parser_build(struct parser *p, GtkWidget *widget)
 	GtkWidget			* parent;
 	int				 	  f;
  
+	a_info.widget		= widget;
 	a_info.group 		= g_new0(GtkActionGroup *,(g_strv_length((gchar **) p->group)+1));
 	a_info.accel_group	= gtk_accel_group_new();
  
@@ -221,7 +225,7 @@ void parser_build(struct parser *p, GtkWidget *widget)
 	gtk_window_add_accel_group(GTK_WINDOW(p->toplevel),a_info.accel_group);
  
 	gtk_window_set_default(GTK_WINDOW(p->toplevel),widget);
-	
+
 #ifdef HAVE_GTKMAC
 	if(p->topmenu)
 	{
@@ -55,6 +55,42 @@
 	#define GDK_NUMLOCK_MASK GDK_MOD2_MASK
 #endif
  
+/*--[ Globals ]--------------------------------------------------------------------------------------*/
+
+	 static struct _keycode
+	 {
+		guint			  keyval;
+		GdkModifierType	  state;
+		int				  (*exec)(H3270 *session);
+		GtkAction		* action;
+	 } keycode[] =
+	 {
+		{ GDK_Left,				0,					lib3270_cursor_left,	NULL	},
+		{ GDK_Up,				0,					lib3270_cursor_up,		NULL	},
+		{ GDK_Right,			0,					lib3270_cursor_right,	NULL	},
+		{ GDK_Down,				0,					lib3270_cursor_down,	NULL	},
+		{ GDK_Tab,				0,					lib3270_nextfield,		NULL	},
+		{ GDK_ISO_Left_Tab,		GDK_SHIFT_MASK,		lib3270_previousfield,	NULL	},
+		{ GDK_KP_Left,			0,					lib3270_cursor_left,	NULL	},
+		{ GDK_KP_Up,			0,					lib3270_cursor_up,		NULL	},
+		{ GDK_KP_Right,			0,					lib3270_cursor_right,	NULL	},
+		{ GDK_KP_Down,			0,					lib3270_cursor_down,	NULL	},
+
+		{ GDK_KP_Add,			GDK_NUMLOCK_MASK,	NULL,					NULL	},
+		{ GDK_KP_Subtract,		GDK_NUMLOCK_MASK,	NULL,					NULL	},
+
+		{ GDK_3270_PrintScreen,	0,					NULL,					NULL	},
+		{ GDK_Sys_Req,			0,					lib3270_sysreq,			NULL	},
+
+		{ GDK_Print,			GDK_CONTROL_MASK,	NULL,					NULL	},
+		{ GDK_Print,			GDK_SHIFT_MASK,		lib3270_sysreq,			NULL	},
+		{ GDK_Control_R,		0,					NULL,					NULL	},
+		{ GDK_Control_L,		0,					NULL,					NULL	},
+
+#ifdef WIN32
+		{ GDK_Pause,			0,					NULL,					NULL	},
+#endif
+	};
  
 /*--[ Implement ]------------------------------------------------------------------------------------*/
  
@@ -84,40 +120,6 @@
  
  static gboolean check_keypress(v3270 *widget, GdkEventKey *event)
  {
-	 static const struct _keycode
-	 {
-		guint			keyval;
-		GdkModifierType	state;
-		int				(*exec)(H3270 *session);
-	 } keycode[] =
-	 {
-		{ GDK_Left,				0,					lib3270_cursor_left		},
-		{ GDK_Up,				0,					lib3270_cursor_up		},
-		{ GDK_Right,			0,					lib3270_cursor_right	},
-		{ GDK_Down,				0,					lib3270_cursor_down		},
-		{ GDK_Tab,				0,					lib3270_nextfield		},
-		{ GDK_ISO_Left_Tab,		GDK_SHIFT_MASK,		lib3270_previousfield	},
-		{ GDK_KP_Left,			0,					lib3270_cursor_left		},
-		{ GDK_KP_Up,			0,					lib3270_cursor_up		},
-		{ GDK_KP_Right,			0,					lib3270_cursor_right	},
-		{ GDK_KP_Down,			0,					lib3270_cursor_down		},
-
-		{ GDK_KP_Add,			GDK_NUMLOCK_MASK,	NULL					},
-		{ GDK_KP_Subtract,		GDK_NUMLOCK_MASK,	NULL					},
-
-		{ GDK_3270_PrintScreen,	0,					NULL					},
-		{ GDK_Sys_Req,			0,					lib3270_sysreq			},
-
-		{ GDK_Print,			GDK_CONTROL_MASK,	NULL					},
-		{ GDK_Print,			GDK_SHIFT_MASK,		lib3270_sysreq			},
-		{ GDK_Control_R,		0,					NULL					},
-		{ GDK_Control_L,		0,					NULL					},
-
-#ifdef WIN32
-		{ GDK_Pause,			0,					NULL					},
-#endif
-	};
-
 	int			f;
 	int			state	= event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_ALT_MASK);
 	gboolean	handled = FALSE;
@@ -153,17 +155,43 @@
 	{
 		if(keycode[f].keyval == event->keyval && state == keycode[f].state)
 		{
-			if(keycode[f].exec)
-			{
+			trace("%s: id=%d action=%p",__FUNCTION__,f,keycode[f].action);
+			if(keycode[f].action)
+				gtk_action_activate(keycode[f].action);
+			else if(keycode[f].exec)
 				keycode[f].exec(widget->host);
-				return TRUE;
-			}
+			else
+				return FALSE;
+			return TRUE;
+
 		}
 	}
  
  	return FALSE;
  }
  
+ gboolean v3270_set_keyboard_action(GtkWidget *widget, const gchar *key_name, GtkAction *action)
+ {
+	guint			keyval;
+	GdkModifierType	state;
+	int				f;
+
+	g_return_val_if_fail(GTK_IS_V3270(widget),FALSE);
+
+	gtk_accelerator_parse(key_name,&keyval,&state);
+
+	for(f=0; f < G_N_ELEMENTS(keycode);f++)
+	{
+		if(keycode[f].keyval == keyval && keycode[f].state == state)
+		{
+			keycode[f].action = action;
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+ }
+
  gboolean v3270_key_press_event(GtkWidget *widget, GdkEventKey *event)
  {
 	v3270 * terminal = GTK_V3270(widget);
@@ -52,4 +52,6 @@
  
 	</menubar>
  
+	<accelerator name='ctrl' action='Enter' key='Control_R' />
+
 </ui>
...	...	@@ -178,6 +178,7 @@
178	178	LIB3270_EXPORT void v3270_draw_element(cairo_t cr, unsigned char chr, unsigned short attr, H3270 session, guint height, GdkRectangle rect, GdkColor color);
179	179	LIB3270_EXPORT void v3270_set_color(GtkWidget widget, enum V3270_COLOR id, GdkColor color);
180	180	LIB3270_EXPORT GdkColor * v3270_get_color(GtkWidget *widget, enum V3270_COLOR id);
	181	+ LIB3270_EXPORT gboolean v3270_set_keyboard_action(GtkWidget widget, const gchar key_name, GtkAction *action);
181	182
182	183	// Misc
183	184	LIB3270_EXPORT GtkIMContext * v3270_get_im_context(GtkWidget *widget);
...	...
...	...	@@ -30,6 +30,7 @@
30	30	*/
31	31
32	32	#include "private.h"
	33	+ #include <v3270.h>
33	34
34	35	#ifdef HAVE_GTKMAC
35	36	#include <gtkmacintegration/gtk-mac-menu.h>
...	...	@@ -109,8 +110,10 @@ struct action_info
109	110	{
110	111	GtkActionGroup ** group;
111	112	GtkAccelGroup * accel_group;
	113	+ GtkWidget * widget;
112	114	};
113	115
	116	+
114	117	static void action_group_setup(gpointer key, GtkAction action, struct action_info info)
115	118	{
116	119	int group_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"id_group"));
...	...	@@ -130,7 +133,7 @@ static void action_group_setup(gpointer key, GtkAction *action, struct action_in
130	133	*/
131	134
132	135
133		- if(key_name)
	136	+ if(key_name && !v3270_set_keyboard_action(info->widget,key_name,action))
134	137	{
135	138	gtk_action_group_add_action_with_accel(info->group[group_id],action,key_name);
136	139	gtk_action_connect_accelerator(action);
...	...	@@ -176,6 +179,7 @@ void parser_build(struct parser p, GtkWidget widget)
176	179	GtkWidget * parent;
177	180	int f;
178	181
	182	+ a_info.widget = widget;
179	183	a_info.group = g_new0(GtkActionGroup ,(g_strv_length((gchar *) p->group)+1));
180	184	a_info.accel_group = gtk_accel_group_new();
181	185
...	...	@@ -221,7 +225,7 @@ void parser_build(struct parser p, GtkWidget widget)
221	225	gtk_window_add_accel_group(GTK_WINDOW(p->toplevel),a_info.accel_group);
222	226
223	227	gtk_window_set_default(GTK_WINDOW(p->toplevel),widget);
224		-
	228	+
225	229	#ifdef HAVE_GTKMAC
226	230	if(p->topmenu)
227	231	{
...	...
...	...	@@ -55,6 +55,42 @@
55	55	#define GDK_NUMLOCK_MASK GDK_MOD2_MASK
56	56	#endif
57	57
	58	+/--[ Globals ]--------------------------------------------------------------------------------------/
	59	+
	60	+ static struct _keycode
	61	+ {
	62	+ guint keyval;
	63	+ GdkModifierType state;
	64	+ int (exec)(H3270 session);
	65	+ GtkAction * action;
	66	+ } keycode[] =
	67	+ {
	68	+ { GDK_Left, 0, lib3270_cursor_left, NULL },
	69	+ { GDK_Up, 0, lib3270_cursor_up, NULL },
	70	+ { GDK_Right, 0, lib3270_cursor_right, NULL },
	71	+ { GDK_Down, 0, lib3270_cursor_down, NULL },
	72	+ { GDK_Tab, 0, lib3270_nextfield, NULL },
	73	+ { GDK_ISO_Left_Tab, GDK_SHIFT_MASK, lib3270_previousfield, NULL },
	74	+ { GDK_KP_Left, 0, lib3270_cursor_left, NULL },
	75	+ { GDK_KP_Up, 0, lib3270_cursor_up, NULL },
	76	+ { GDK_KP_Right, 0, lib3270_cursor_right, NULL },
	77	+ { GDK_KP_Down, 0, lib3270_cursor_down, NULL },
	78	+
	79	+ { GDK_KP_Add, GDK_NUMLOCK_MASK, NULL, NULL },
	80	+ { GDK_KP_Subtract, GDK_NUMLOCK_MASK, NULL, NULL },
	81	+
	82	+ { GDK_3270_PrintScreen, 0, NULL, NULL },
	83	+ { GDK_Sys_Req, 0, lib3270_sysreq, NULL },
	84	+
	85	+ { GDK_Print, GDK_CONTROL_MASK, NULL, NULL },
	86	+ { GDK_Print, GDK_SHIFT_MASK, lib3270_sysreq, NULL },
	87	+ { GDK_Control_R, 0, NULL, NULL },
	88	+ { GDK_Control_L, 0, NULL, NULL },
	89	+
	90	+#ifdef WIN32
	91	+ { GDK_Pause, 0, NULL, NULL },
	92	+#endif
	93	+ };
58	94
59	95	/--[ Implement ]------------------------------------------------------------------------------------/
60	96
...	...	@@ -84,40 +120,6 @@
84	120
85	121	static gboolean check_keypress(v3270 widget, GdkEventKey event)
86	122	{
87		- static const struct _keycode
88		- {
89		- guint keyval;
90		- GdkModifierType state;
91		- int (exec)(H3270 session);
92		- } keycode[] =
93		- {
94		- { GDK_Left, 0, lib3270_cursor_left },
95		- { GDK_Up, 0, lib3270_cursor_up },
96		- { GDK_Right, 0, lib3270_cursor_right },
97		- { GDK_Down, 0, lib3270_cursor_down },
98		- { GDK_Tab, 0, lib3270_nextfield },
99		- { GDK_ISO_Left_Tab, GDK_SHIFT_MASK, lib3270_previousfield },
100		- { GDK_KP_Left, 0, lib3270_cursor_left },
101		- { GDK_KP_Up, 0, lib3270_cursor_up },
102		- { GDK_KP_Right, 0, lib3270_cursor_right },
103		- { GDK_KP_Down, 0, lib3270_cursor_down },
104		-
105		- { GDK_KP_Add, GDK_NUMLOCK_MASK, NULL },
106		- { GDK_KP_Subtract, GDK_NUMLOCK_MASK, NULL },
107		-
108		- { GDK_3270_PrintScreen, 0, NULL },
109		- { GDK_Sys_Req, 0, lib3270_sysreq },
110		-
111		- { GDK_Print, GDK_CONTROL_MASK, NULL },
112		- { GDK_Print, GDK_SHIFT_MASK, lib3270_sysreq },
113		- { GDK_Control_R, 0, NULL },
114		- { GDK_Control_L, 0, NULL },
115		-
116		-#ifdef WIN32
117		- { GDK_Pause, 0, NULL },
118		-#endif
119		- };
120		-
121	123	int f;
122	124	int state = event->state & (GDK_SHIFT_MASK\|GDK_CONTROL_MASK\|GDK_ALT_MASK);
123	125	gboolean handled = FALSE;
...	...	@@ -153,17 +155,43 @@
153	155	{
154	156	if(keycode[f].keyval == event->keyval && state == keycode[f].state)
155	157	{
156		- if(keycode[f].exec)
157		- {
	158	+ trace("%s: id=%d action=%p",__FUNCTION__,f,keycode[f].action);
	159	+ if(keycode[f].action)
	160	+ gtk_action_activate(keycode[f].action);
	161	+ else if(keycode[f].exec)
158	162	keycode[f].exec(widget->host);
159		- return TRUE;
160		- }
	163	+ else
	164	+ return FALSE;
	165	+ return TRUE;
	166	+
161	167	}
162	168	}
163	169
164	170	return FALSE;
165	171	}
166	172
	173	+ gboolean v3270_set_keyboard_action(GtkWidget widget, const gchar key_name, GtkAction *action)
	174	+ {
	175	+ guint keyval;
	176	+ GdkModifierType state;
	177	+ int f;
	178	+
	179	+ g_return_val_if_fail(GTK_IS_V3270(widget),FALSE);
	180	+
	181	+ gtk_accelerator_parse(key_name,&keyval,&state);
	182	+
	183	+ for(f=0; f < G_N_ELEMENTS(keycode);f++)
	184	+ {
	185	+ if(keycode[f].keyval == keyval && keycode[f].state == state)
	186	+ {
	187	+ keycode[f].action = action;
	188	+ return TRUE;
	189	+ }
	190	+ }
	191	+
	192	+ return FALSE;
	193	+ }
	194	+
167	195	gboolean v3270_key_press_event(GtkWidget widget, GdkEventKey event)
168	196	{
169	197	v3270 * terminal = GTK_V3270(widget);
...	...
...	...	@@ -52,4 +52,6 @@
52	52
53	53	</menubar>
54	54
	55	+ <accelerator name='ctrl' action='Enter' key='Control_R' />
	56	+
55	57	</ui>
...	...