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

e_xkb: implement keyboard setting on wayland. 

this splits e_xkb_update into a update function for wayland and x. The
matching function to the compositor type is called.

@feature
This commit is contained in:
Marcel Hollerbach 2016-01-14 17:07:45 +01:00
parent b8dd1c5bcd
commit 35ae02a524
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/bin/e_xkb.c
View File

@ -51,8 +51,8 @@ e_xkb_shutdown(void)
return 1;
}
E_API void
e_xkb_update(int cur_group)
static void
_e_x_xkb_update(int cur_group)
{
E_Config_XKB_Layout *cl;
E_Config_XKB_Option *op;
@ -155,6 +155,37 @@ e_xkb_update(int cur_group)
eina_strbuf_free(buf);
}
static void
_e_wl_xkb_update(int cur_group)
{
#ifdef HAVE_WAYLAND
E_Config_XKB_Layout *cl;
Eina_List *l;
if (cur_group == -1) {
cur_group = e_config->xkb.cur_group;
}
l = eina_list_nth_list(e_config->xkb.used_layouts, cur_group);
if (!l) return;
cl = eina_list_data_get(l);
e_comp_wl_input_keymap_set(NULL, cl->model, cl->name, NULL, NULL);
INF("Set wl keyboard to %s %s", cl->model, cl->name);
#else
(void) cur_group;
#endif
}
E_API void
e_xkb_update(int cur_group)
{
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
_e_wl_xkb_update(cur_group);
else
_e_x_xkb_update(cur_group);
}
E_API void
e_xkb_layout_next(void)
{