Download as
Browse Code »

Commit 03b34fbedb94d55bedbc37d1bd78030a3a96e020

Authored by Perry Werneck
1 parent 4ec73b91
Exists in master and in 1 other branch develop

Adjustments for KP_ALTERNATIVE option.

Showing 1 changed file with 3 additions and 8 deletions   Show diff stats
src/terminal/keyboard.c
  Diff comments   View file @03b34fb
... ... @@ -48,10 +48,6 @@
48 48 #include <gdk/gdkkeysyms.h>
49 49 #endif
50 50  
51   - #ifndef GDK_NUMLOCK_MASK
52   - #define GDK_NUMLOCK_MASK GDK_MOD2_MASK
53   - #endif
54   -
55 51 /*--[ Implement ]------------------------------------------------------------------------------------*/
56 52  
57 53 #define keyval_is_alt() (event->keyval == GDK_Alt_L || event->keyval == GDK_Meta_L || event->keyval == GDK_ISO_Level3_Shift)
... ... @@ -90,7 +86,7 @@
90 86 #ifdef DEBUG
91 87 {
92 88 g_autofree gchar * keyname = gtk_accelerator_name(event->keyval,event->state);
93   - debug("%s Keyval: %d (%s) State: %04x %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
  89 + debug("%s Keyval: %d (%s) State: %04x %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%",
94 90 __FUNCTION__,
95 91 event->keyval,
96 92 gdk_keyval_name(event->keyval),
... ... @@ -109,15 +105,14 @@
109 105 event->state & GDK_BUTTON4_MASK ? " GDK_BUTTON4_MASK" : "",
110 106 event->state & GDK_BUTTON5_MASK ? " GDK_BUTTON5_MASK" : "",
111 107 event->state & GDK_RELEASE_MASK ? " GDK_RELEASE_MASK" : "",
112   - event->state & GDK_MODIFIER_MASK ? " GDK_MODIFIER_MASK" : "",
113   - event->state & GDK_NUMLOCK_MASK ? " GDK_NUMLOCK_MASK" : ""
  108 + event->state & GDK_MODIFIER_MASK ? " GDK_MODIFIER_MASK" : ""
114 109 );
115 110  
116 111 }
117 112 #endif // DEBUG
118 113  
119 114 // Check +/- keyboard redirection
120   - if(lib3270_get_toggle(terminal->host,LIB3270_TOGGLE_KP_ALTERNATIVE) && (event->state & GDK_NUMLOCK_MASK)) {
  115 + if(lib3270_get_toggle(terminal->host,LIB3270_TOGGLE_KP_ALTERNATIVE) && !(event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK))) {
121 116  
122 117 switch(event->keyval) {
123 118 case GDK_KP_Add:
... ...