forked from enlightenment/enlightenment
Initialize keyboard before initializing comp module.
This is needed so that setxkbmap runs before we initialize the wayland compositor So that wayland clients can use the proper keymap. Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
parent
ebb35638f5
commit
c74a796e02
|
@ -935,13 +935,6 @@ main(int argc, char **argv)
|
||||||
_e_main_shutdown(-1);
|
_e_main_shutdown(-1);
|
||||||
}
|
}
|
||||||
TS("E_Mouse Init Done");
|
TS("E_Mouse Init Done");
|
||||||
TS("E_Xkb Init");
|
|
||||||
if (!e_xkb_init())
|
|
||||||
{
|
|
||||||
e_error_message_show(_("Enlightenment cannot setup XKB Keyboard layouts.\n"));
|
|
||||||
_e_main_shutdown(-1);
|
|
||||||
}
|
|
||||||
TS("E_Xkb Init Done");
|
|
||||||
|
|
||||||
if (e_config->show_splash)
|
if (e_config->show_splash)
|
||||||
e_init_status_set(_("Setup Bindings"));
|
e_init_status_set(_("Setup Bindings"));
|
||||||
|
@ -1689,6 +1682,13 @@ _e_main_screens_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TS("E_Xkb Init");
|
||||||
|
if (!e_xkb_init())
|
||||||
|
{
|
||||||
|
e_error_message_show(_("Enlightenment cannot setup XKB Keyboard layouts.\n"));
|
||||||
|
_e_main_shutdown(-1);
|
||||||
|
}
|
||||||
|
TS("E_Xkb Init Done");
|
||||||
|
|
||||||
TS("E_Comp Init");
|
TS("E_Comp Init");
|
||||||
e_comp_init();
|
e_comp_init();
|
||||||
|
|
Loading…
Reference in New Issue