Download as
Browse Code »

Commit 4aaba43003de658e40477ac4a2cc4dc9e2e4fd23

Authored by Perry Werneck
1 parent 913fc234
Exists in master and in 1 other branch develop

Removing deprecated call, fixing warnings.

Showing 5 changed files with 36 additions and 75 deletions   Show diff stats
src/include/v3270.h
  Diff comments   View file @4aaba43
... ... @@ -246,7 +246,6 @@
246 246 LIB3270_EXPORT void v3270_remap_from_xml(GtkWidget *widget, const gchar *path);
247 247  
248 248 // Keyboard & Mouse special actions
249   - LIB3270_EXPORT gboolean v3270_set_keyboard_action(GtkWidget *widget, const gchar *key_name, GtkAction *action);
250 249 LIB3270_EXPORT void v3270_set_scroll_action(GtkWidget *widget, GdkScrollDirection direction, GtkAction *action);
251 250  
252 251 // SSL & Security
... ...
src/terminal/keyboard.c
  Diff comments   View file @4aaba43
... ... @@ -54,9 +54,6 @@
54 54 #define GDK_NUMLOCK_MASK GDK_MOD2_MASK
55 55 #endif
56 56  
57   -#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
58   -#pragma GCC diagnostic ignored "-Wsign-compare"
59   -
60 57 /*--[ Globals ]--------------------------------------------------------------------------------------*/
61 58  
62 59 static struct _keycode
... ... @@ -64,37 +61,36 @@
64 61 guint keyval;
65 62 GdkModifierType state;
66 63 int (*exec)(H3270 *session);
67   - GtkAction * action;
68 64 } keycode[] =
69 65 {
70   - { GDK_Left, 0, lib3270_cursor_left, NULL },
71   - { GDK_Up, 0, lib3270_cursor_up, NULL },
72   - { GDK_Right, 0, lib3270_cursor_right, NULL },
73   - { GDK_Down, 0, lib3270_cursor_down, NULL },
74   - { GDK_Tab, 0, lib3270_nextfield, NULL },
75   - { GDK_ISO_Left_Tab, GDK_SHIFT_MASK, lib3270_previousfield, NULL },
76   - { GDK_KP_Left, 0, lib3270_cursor_left, NULL },
77   - { GDK_KP_Up, 0, lib3270_cursor_up, NULL },
78   - { GDK_KP_Right, 0, lib3270_cursor_right, NULL },
79   - { GDK_KP_Down, 0, lib3270_cursor_down, NULL },
80   -
81   - { GDK_KP_Add, GDK_NUMLOCK_MASK, NULL, NULL },
82   - { GDK_KP_Subtract, GDK_NUMLOCK_MASK, NULL, NULL },
83   -
84   - { GDK_3270_PrintScreen, 0, lib3270_print_all, NULL },
85   - { GDK_P, GDK_CONTROL_MASK, lib3270_print_all, NULL },
86   -
87   - { GDK_Sys_Req, 0, lib3270_sysreq, NULL },
88   -
89   - { GDK_Print, GDK_CONTROL_MASK, lib3270_print_all, NULL },
90   - { GDK_Print, GDK_SHIFT_MASK, lib3270_sysreq, NULL },
91   - { GDK_Control_R, 0, NULL, NULL },
92   - { GDK_Control_L, 0, NULL, NULL },
93   -
94   -
95   -#ifdef WIN32
96   - { GDK_Pause, 0, NULL, NULL },
97   -#endif
  66 + { GDK_Left, 0, lib3270_cursor_left },
  67 + { GDK_Up, 0, lib3270_cursor_up },
  68 + { GDK_Right, 0, lib3270_cursor_right },
  69 + { GDK_Down, 0, lib3270_cursor_down },
  70 + { GDK_Tab, 0, lib3270_nextfield },
  71 + { GDK_ISO_Left_Tab, GDK_SHIFT_MASK, lib3270_previousfield },
  72 + { GDK_KP_Left, 0, lib3270_cursor_left },
  73 + { GDK_KP_Up, 0, lib3270_cursor_up },
  74 + { GDK_KP_Right, 0, lib3270_cursor_right },
  75 + { GDK_KP_Down, 0, lib3270_cursor_down },
  76 +
  77 +// { GDK_KP_Add, GDK_NUMLOCK_MASK, NULL },
  78 +// { GDK_KP_Subtract, GDK_NUMLOCK_MASK, NULL },
  79 +
  80 + { GDK_3270_PrintScreen, 0, lib3270_print_all },
  81 + { GDK_P, GDK_CONTROL_MASK, lib3270_print_all },
  82 +
  83 + { GDK_Sys_Req, 0, lib3270_sysreq },
  84 +
  85 + { GDK_Print, GDK_CONTROL_MASK, lib3270_print_all },
  86 + { GDK_Print, GDK_SHIFT_MASK, lib3270_sysreq },
  87 +// { GDK_Control_R, 0, NULL },
  88 +// { GDK_Control_L, 0, NULL },
  89 +
  90 +
  91 +//#ifdef WIN32
  92 +// { GDK_Pause, 0, NULL },
  93 +//#endif
98 94 };
99 95  
100 96 /*--[ Implement ]------------------------------------------------------------------------------------*/
... ... @@ -127,9 +123,9 @@
127 123  
128 124 static gboolean check_keypress(v3270 *widget, GdkEventKey *event)
129 125 {
130   - int f;
131   - int state = event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_ALT_MASK);
132   - gboolean handled = FALSE;
  126 + int f;
  127 + GdkModifierType state = event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_ALT_MASK);
  128 + gboolean handled = FALSE;
133 129  
134 130 #ifdef WIN32
135 131 // FIXME (perry#1#): Find a better way!
... ... @@ -142,6 +138,7 @@
142 138 #endif
143 139  
144 140 g_signal_emit(GTK_WIDGET(widget), v3270_widget_signal[SIGNAL_KEYPRESS], 0, event->keyval, state, &handled);
  141 + debug("Keyboard action was %s",handled ? "Handled" : "Not handled");
145 142 if(handled)
146 143 return TRUE;
147 144  
... ... @@ -160,9 +157,7 @@
160 157 {
161 158 if(keycode[f].keyval == event->keyval && state == keycode[f].state)
162 159 {
163   - if(keycode[f].action)
164   - gtk_action_activate(keycode[f].action);
165   - else if(keycode[f].exec)
  160 + if(keycode[f].exec)
166 161 keycode[f].exec(widget->host);
167 162 else
168 163 return FALSE;
... ... @@ -174,28 +169,6 @@
174 169 return FALSE;
175 170 }
176 171  
177   - LIB3270_EXPORT gboolean v3270_set_keyboard_action(GtkWidget *widget, const gchar *key_name, GtkAction *action)
178   - {
179   - guint keyval;
180   - GdkModifierType state;
181   - int f;
182   -
183   - g_return_val_if_fail(GTK_IS_V3270(widget),FALSE);
184   -
185   - gtk_accelerator_parse(key_name,&keyval,&state);
186   -
187   - for(f=0; f < (int) G_N_ELEMENTS(keycode);f++)
188   - {
189   - if(keycode[f].keyval == keyval && keycode[f].state == state)
190   - {
191   - keycode[f].action = action;
192   - return TRUE;
193   - }
194   - }
195   -
196   - return FALSE;
197   - }
198   -
199 172 gboolean v3270_key_press_event(GtkWidget *widget, GdkEventKey *event)
200 173 {
201 174 v3270 * terminal = GTK_V3270(widget);
... ...
src/terminal/marshal
  Diff comments   View file @4aaba43
... ... @@ -5,7 +5,7 @@ VOID:VOID,POINTER
5 5 VOID:POINTER
6 6 VOID:VOID,POINTER,POINTER
7 7 VOID:VOID,UINT,POINTER
8   -BOOLEAN:VOID,UINT,ENUM
  8 +BOOLEAN:UINT,ENUM
9 9 VOID:VOID,BOOLEAN
10 10 BOOLEAN:VOID,BOOLEAN,BOOLEAN,POINTER
11 11 VOID:VOID,UINT,UINT
... ...
src/terminal/private.h
  Diff comments   View file @4aaba43
... ... @@ -49,7 +49,6 @@ G_BEGIN_DECLS
49 49 void (*toggle_changed)(v3270 *widget,LIB3270_TOGGLE toggle_id,gboolean toggle_state,const gchar *toggle_name);
50 50 void (*message_changed)(v3270 *widget, LIB3270_MESSAGE id);
51 51 void (*popup_message)(GtkWidget *widget, LIB3270_NOTIFY id , const gchar *title, const gchar *message, const gchar *text);
52   - gboolean (*keypress)(GtkWidget *widget,guint keyval,GdkModifierType state);
53 52  
54 53 };
55 54  
... ...
src/terminal/widget.c
  Diff comments   View file @4aaba43
... ... @@ -235,13 +235,6 @@ static void finalize(GObject *object)
235 235 G_OBJECT_CLASS(v3270_parent_class)->finalize(object);
236 236 }
237 237  
238   -static gboolean signal_keypress(GtkWidget *widget,guint keyval, GdkModifierType state)
239   -{
240   -// debug("v3270::%s",__FUNCTION__);
241   -
242   - return FALSE;
243   -}
244   -
245 238 static void v3270_class_init(v3270Class *klass)
246 239 {
247 240 GObjectClass * gobject_class = G_OBJECT_CLASS(klass);
... ... @@ -253,9 +246,6 @@ static void v3270_class_init(v3270Class *klass)
253 246  
254 247 lib3270_set_log_handler(loghandler);
255 248  
256   - // V3270 methods
257   - klass->keypress = signal_keypress;
258   -
259 249 // Object methods
260 250 gobject_class->finalize = finalize;
261 251  
... ... @@ -376,9 +366,9 @@ static void v3270_class_init(v3270Class *klass)
376 366 g_signal_new( "keypress",
377 367 G_OBJECT_CLASS_TYPE (gobject_class),
378 368 G_SIGNAL_RUN_LAST,
379   - G_STRUCT_OFFSET (v3270Class, keypress),
  369 + 0,
380 370 NULL, NULL,
381   - v3270_BOOLEAN__VOID_UINT_ENUM,
  371 + v3270_BOOLEAN__UINT_ENUM,
382 372 G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT);
383 373  
384 374 v3270_widget_signal[SIGNAL_CONNECTED] =
... ...