discomfitor pushed a commit to branch enlightenment-0.20.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=c111cf74558801d0a6e37c5bfa2379609219bf3c

commit c111cf74558801d0a6e37c5bfa2379609219bf3c
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Jan 25 16:29:28 2016 -0500

    do not update keymap group in _e_comp_wl_input_keymap_update()
    
    this state is dead, and any group changes which have been made should
    be reapplied based on the new state
---
 src/bin/e_comp_wl_input.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index e108973..90c7c1f 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -327,7 +327,7 @@ static void
 _e_comp_wl_input_keymap_update(struct xkb_keymap *keymap)
 {
    char *tmp;
-   xkb_mod_mask_t latched = 0, locked = 0, group = 0;
+   xkb_mod_mask_t latched = 0, locked = 0;
    struct wl_resource *res;
    Eina_List *l;
 
@@ -349,18 +349,14 @@ _e_comp_wl_input_keymap_update(struct xkb_keymap *keymap)
         locked =
           xkb_state_serialize_mods(e_comp_wl->xkb.state,
                                    XKB_STATE_MODS_LOCKED);
-        group =
-          xkb_state_serialize_layout(e_comp_wl->xkb.state,
-                                     XKB_STATE_LAYOUT_EFFECTIVE);
         xkb_state_unref(e_comp_wl->xkb.state);
      }
 
    /* create a new xkb state */
    e_comp_wl->xkb.state = xkb_state_new(keymap);
 
-   if ((latched) || (locked) || (group))
-     xkb_state_update_mask(e_comp_wl->xkb.state, 0,
-                           latched, locked, 0, 0, group);
+   xkb_state_update_mask(e_comp_wl->xkb.state, 0,
+                         latched, locked, 0, 0, 0);
 
    /* increment keymap reference */
    e_comp_wl->xkb.keymap = keymap;

-- 


Reply via email to