styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Derek Foreman 2015-03-09 15:49:08 -04:00 committed by Mike Blumenkrantz
parent 8c7364b682
commit 5c345bf37f
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bin/e_comp_wl_input.c
View File

@ -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)

1
src/bin/e_comp_wl_input.h
View File

@ -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);