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

elm win - if no ELM_DISPLAY is set, try more engines before giving up 

this should fix T1294 without needing ELM_DISPLAY set. @fix
This commit is contained in:
Carsten Haitzler 2014-05-30 15:41:40 +09:00
parent e14e0116e8
commit 77ff32b582
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3036,24 +3036,32 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t
{
if (_accel_is_gl())
{
enginelist[0] = ELM_OPENGL_X11;
enginelist[1] = ELM_WAYLAND_EGL;
enginelist[2] = ELM_DRM;
enginelist[3] = ELM_SOFTWARE_FB;
enginelist[4] = ELM_OPENGL_COCOA;
enginelist[5] = ELM_OPENGL_SDL;
enginelist[6] = NULL;
enginelist[ 0] = ELM_OPENGL_X11;
enginelist[ 1] = ELM_WAYLAND_EGL;
enginelist[ 2] = ELM_DRM;
enginelist[ 3] = ELM_SOFTWARE_FB;
enginelist[ 4] = ELM_OPENGL_COCOA;
enginelist[ 5] = ELM_OPENGL_SDL;
enginelist[ 6] = ELM_SOFTWARE_X11;
enginelist[ 7] = ELM_WAYLAND_SHM;
enginelist[ 8] = ELM_SOFTWARE_SDL;
enginelist[ 9] = ELM_SOFTWARE_PSL1GHT;
enginelist[10] = NULL;
}
else
{
enginelist[0] = ENGINE_GET();
enginelist[1] = ELM_SOFTWARE_X11;
enginelist[2] = ELM_WAYLAND_SHM;
enginelist[3] = ELM_DRM;
enginelist[4] = ELM_SOFTWARE_FB;
enginelist[5] = ELM_OPENGL_COCOA;
enginelist[6] = ELM_SOFTWARE_SDL;
enginelist[7] = NULL;
enginelist[ 0] = ENGINE_GET();
enginelist[ 1] = ELM_SOFTWARE_X11;
enginelist[ 2] = ELM_WAYLAND_SHM;
enginelist[ 3] = ELM_DRM;
enginelist[ 4] = ELM_SOFTWARE_FB;
enginelist[ 5] = ELM_OPENGL_COCOA;
enginelist[ 6] = ELM_SOFTWARE_SDL;
enginelist[ 7] = ELM_OPENGL_X11;
enginelist[ 8] = ELM_WAYLAND_EGL;
enginelist[ 9] = ELM_DRM;
enginelist[10] = ELM_OPENGL_SDL;
enginelist[11] = NULL;
}
}
for (i = 0; i < 30; i++)