forked from enlightenment/enlightenment
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
This commit is contained in:
parent
8c7364b682
commit
5c345bf37f
|
@ -442,12 +442,8 @@ e_comp_wl_input_keyboard_check(struct wl_resource *res)
|
||||||
}
|
}
|
||||||
|
|
||||||
EINTERN void
|
EINTERN void
|
||||||
e_comp_wl_input_keyboard_modifiers_update(E_Comp_Data *cdata)
|
e_comp_wl_input_keyboard_modifiers_serialize(E_Comp_Data *cdata)
|
||||||
{
|
{
|
||||||
uint32_t serial;
|
|
||||||
struct wl_resource *res;
|
|
||||||
Eina_List *l;
|
|
||||||
|
|
||||||
cdata->kbd.mod_depressed =
|
cdata->kbd.mod_depressed =
|
||||||
xkb_state_serialize_mods(cdata->xkb.state, XKB_STATE_DEPRESSED);
|
xkb_state_serialize_mods(cdata->xkb.state, XKB_STATE_DEPRESSED);
|
||||||
cdata->kbd.mod_latched =
|
cdata->kbd.mod_latched =
|
||||||
|
@ -456,6 +452,16 @@ e_comp_wl_input_keyboard_modifiers_update(E_Comp_Data *cdata)
|
||||||
xkb_state_serialize_mods(cdata->xkb.state, XKB_STATE_MODS_LOCKED);
|
xkb_state_serialize_mods(cdata->xkb.state, XKB_STATE_MODS_LOCKED);
|
||||||
cdata->kbd.mod_group =
|
cdata->kbd.mod_group =
|
||||||
xkb_state_serialize_layout(cdata->xkb.state, XKB_STATE_LAYOUT_EFFECTIVE);
|
xkb_state_serialize_layout(cdata->xkb.state, XKB_STATE_LAYOUT_EFFECTIVE);
|
||||||
|
}
|
||||||
|
|
||||||
|
EINTERN void
|
||||||
|
e_comp_wl_input_keyboard_modifiers_update(E_Comp_Data *cdata)
|
||||||
|
{
|
||||||
|
uint32_t serial;
|
||||||
|
struct wl_resource *res;
|
||||||
|
Eina_List *l;
|
||||||
|
|
||||||
|
e_comp_wl_input_keyboard_modifiers_serialize(cdata);
|
||||||
|
|
||||||
serial = wl_display_next_serial(cdata->wl.disp);
|
serial = wl_display_next_serial(cdata->wl.disp);
|
||||||
EINA_LIST_FOREACH(cdata->kbd.resources, l, res)
|
EINA_LIST_FOREACH(cdata->kbd.resources, l, res)
|
||||||
|
|
|
@ -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_pointer_check(struct wl_resource *res);
|
||||||
EINTERN Eina_Bool e_comp_wl_input_keyboard_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_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);
|
EINTERN void e_comp_wl_input_keyboard_state_update(E_Comp_Data *cdata, uint32_t keycode, Eina_Bool pressed);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue