forked from enlightenment/efl
imf - fix x11 vs wl fix to leave x11 alone for those without scim
scim has a nasty habit of sitting and hanging if tryng to set up and no scim daemon is there. since in x11 you may have multiple input methods, leave it to be manually set up via env var, and if not then dont work at all.
This commit is contained in:
parent
81d6713324
commit
3943b45cf0
|
@ -73,9 +73,11 @@ ecore_imf_context_default_id_by_canvas_type_get(const char *canvas_type)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (getenv("DISPLAY")) id = "scim";
|
if (getenv("WAYLAND_DISPLAY"))
|
||||||
else if (getenv("WAYLAND_DISPLAY")) id = "wayland";
|
{
|
||||||
if (ecore_imf_module_get(id)) return id;
|
id = "wayland";
|
||||||
|
if (ecore_imf_module_get(id)) return id;
|
||||||
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue