diff options
author | Jean-Louis Dupond <jean-louis@dupond.be> | 2012-05-16 13:44:41 +0400 |
---|---|---|
committer | Jean-Louis Dupond <jean-louis@dupond.be> | 2012-05-16 13:44:41 +0400 |
commit | bd37bd4f6b2d49adfecbfb6448399c945d860271 (patch) | |
tree | 8ec54e241347a7eedc41b97e339c72b96c1baca4 /remmina-plugins/rdp | |
parent | 0e4b03ab068729915b136f090fa968240d58c36c (diff) |
Numlock and Capslock state are not used
Diffstat (limited to 'remmina-plugins/rdp')
-rw-r--r-- | remmina-plugins/rdp/rdp_plugin.c | 49 | ||||
-rw-r--r-- | remmina-plugins/rdp/rdp_plugin.h | 2 |
2 files changed, 0 insertions, 51 deletions
diff --git a/remmina-plugins/rdp/rdp_plugin.c b/remmina-plugins/rdp/rdp_plugin.c index c3f3fb411..abb96aca7 100644 --- a/remmina-plugins/rdp/rdp_plugin.c +++ b/remmina-plugins/rdp/rdp_plugin.c @@ -40,54 +40,6 @@ RemminaPluginService* remmina_plugin_service = NULL; -/* Migrated from xfreerdp */ -static gboolean rf_get_key_state(KeyCode keycode, int state, XModifierKeymap* modmap) -{ - int offset; - int modifierpos, key, keysymMask = 0; - - if (keycode == NoSymbol) - return FALSE; - - for (modifierpos = 0; modifierpos < 8; modifierpos++) - { - offset = modmap->max_keypermod * modifierpos; - - for (key = 0; key < modmap->max_keypermod; key++) - { - if (modmap->modifiermap[offset + key] == keycode) - keysymMask |= 1 << modifierpos; - } - } - - return (state & keysymMask) ? TRUE : FALSE; -} - -void rf_init(RemminaProtocolWidget* gp) -{ - int dummy; - uint32 state; - gint keycode; - Window wdummy; - XModifierKeymap* modmap; - rfContext* rfi; - - rfi = GET_DATA(gp); - - XQueryPointer(rfi->display, GDK_ROOT_WINDOW(), &wdummy, &wdummy, &dummy, &dummy, - &dummy, &dummy, &state); - - modmap = XGetModifierMapping(rfi->display); - - keycode = XKeysymToKeycode(rfi->display, XK_Caps_Lock); - rfi->capslock_initstate = rf_get_key_state(keycode, state, modmap); - - keycode = XKeysymToKeycode(rfi->display, XK_Num_Lock); - rfi->numlock_initstate = rf_get_key_state(keycode, state, modmap); - - XFreeModifiermap(modmap); -} - void rf_get_fds(RemminaProtocolWidget* gp, void** rfds, int* rcount) { rfContext* rfi; @@ -900,7 +852,6 @@ static void remmina_rdp_init(RemminaProtocolWidget* gp) pthread_mutex_init(&rfi->mutex, NULL); remmina_rdp_event_init(gp); - rf_init(gp); } static gboolean remmina_rdp_open_connection(RemminaProtocolWidget* gp) diff --git a/remmina-plugins/rdp/rdp_plugin.h b/remmina-plugins/rdp/rdp_plugin.h index f36ad22ae..400ef37b5 100644 --- a/remmina-plugins/rdp/rdp_plugin.h +++ b/remmina-plugins/rdp/rdp_plugin.h @@ -96,8 +96,6 @@ struct rf_context gdouble scale_x; gdouble scale_y; guint scale_handler; - gboolean capslock_initstate; - gboolean numlock_initstate; gboolean use_client_keymap; HGDI_DC hdc; |