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

win: set config engine on higher priority than DISPLAY env var 

DISPLAY environment variable may set regardless of Elementary/EFL.
Mostly user has no way to switch their intent engine such as "buffer"

Guarantee work application engine with their intended engine first.

@fix
This commit is contained in:
ChunEon Park 2014-12-12 21:56:26 +09:00
parent 7a5fbb69d2
commit b647f1350f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/elementary/src/lib/elm_win.c
View File

@ -3146,9 +3146,10 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t
enginelist[p++] = ELM_SOFTWARE_PSL1GHT;
}
#endif
#ifdef HAVE_ELEMENTARY_X
else if ((getenv("DISPLAY")) && (!getenv("ELM_ENGINE")))
else if (!elm_config_engine_get() &&
!elm_config_preferred_engine_get() &&
getenv("DISPLAY") && !getenv("ELM_ENGINE"))
{
if (_accel_is_gl())
{
@ -3162,9 +3163,10 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t
}
}
#endif
#ifdef HAVE_ELEMENTARY_WAYLAND
else if ((getenv("WAYLAND_DISPLAY")) && (!getenv("ELM_ENGINE")))
else if (!elm_config_engine_get() &&
!elm_config_preferred_engine_get() &&
getenv("WAYLAND_DISPLAY") && !getenv("ELM_ENGINE"))
{
if (_accel_is_gl())
{