Break e_comp_wl_input_keyboard_modifiers_update into two functions

Summary:
Separate the state serialization from the send so we can use the
serialization function elsewhere.

Reviewers: zmike, devilhorns

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D2123

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index 0d86402..1abe509 100644 (file)
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -441,6 +441,19 @@ e_comp_wl_input_keyboard_check(struct wl_resource *res)
                                   &_e_keyboard_interface);
 }
 
+EINTERN void
+e_comp_wl_input_keyboard_modifiers_serialize(E_Comp_Data *cdata)
+{
+   cdata->kbd.mod_depressed =
+     xkb_state_serialize_mods(cdata->xkb.state, XKB_STATE_DEPRESSED);
+   cdata->kbd.mod_latched =
+     xkb_state_serialize_mods(cdata->xkb.state, XKB_STATE_MODS_LATCHED);
+   cdata->kbd.mod_locked =
+     xkb_state_serialize_mods(cdata->xkb.state, XKB_STATE_MODS_LOCKED);
+   cdata->kbd.mod_group =
+     xkb_state_serialize_layout(cdata->xkb.state, XKB_STATE_LAYOUT_EFFECTIVE);
+}
+
 EINTERN void 
 e_comp_wl_input_keyboard_modifiers_update(E_Comp_Data *cdata)
 {
@@ -448,14 +461,7 @@ e_comp_wl_input_keyboard_modifiers_update(E_Comp_Data *cdata)
    struct wl_resource *res;
    Eina_List *l;
 
-   cdata->kbd.mod_depressed = 
-     xkb_state_serialize_mods(cdata->xkb.state, XKB_STATE_DEPRESSED);
-   cdata->kbd.mod_latched = 
-     xkb_state_serialize_mods(cdata->xkb.state, XKB_STATE_MODS_LATCHED);
-   cdata->kbd.mod_locked = 
-     xkb_state_serialize_mods(cdata->xkb.state, XKB_STATE_MODS_LOCKED);
-   cdata->kbd.mod_group = 
-     xkb_state_serialize_layout(cdata->xkb.state, XKB_STATE_LAYOUT_EFFECTIVE);
+   e_comp_wl_input_keyboard_modifiers_serialize(cdata);
 
    serial = wl_display_next_serial(cdata->wl.disp);
    EINA_LIST_FOREACH(cdata->kbd.resources, l, res)

diff --git a/src/bin/e_comp_wl_input.h b/src/bin/e_comp_wl_input.h
index 9c0000c..0392bdb 100644 (file)
--- a/src/bin/e_comp_wl_input.h
+++ b/src/bin/e_comp_wl_input.h
@@ -8,6 +8,7 @@ EINTERN void e_comp_wl_input_shutdown(E_Comp_Data *cdata);
 EINTERN Eina_Bool e_comp_wl_input_pointer_check(struct wl_resource *res);
 EINTERN Eina_Bool e_comp_wl_input_keyboard_check(struct wl_resource *res);
 
+EINTERN void e_comp_wl_input_keyboard_modifiers_serialize(E_Comp_Data *cdata);
 EINTERN void e_comp_wl_input_keyboard_modifiers_update(E_Comp_Data *cdata);
 EINTERN void e_comp_wl_input_keyboard_state_update(E_Comp_Data *cdata, uint32_t keycode, Eina_Bool pressed);