diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-05-30 15:41:40 +0900 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-05-30 15:42:46 +0900 |
| commit | 4b5b92f97220dce9cba927b8b648123742be85d7 (patch) | |
| tree | 0c6a30dff6726a2008d08d6ed831e6fd3075f046 | |
| parent | ddcb73f4ff97a005c5a3bda4c91a8630ea615f83 (diff) | |
| download | elementary-4b5b92f97220dce9cba927b8b648123742be85d7.tar.gz | |
elm win - if no ELM_DISPLAY is set, try more engines before giving up
this should fix T1294 without needing ELM_DISPLAY set. @fix
| -rw-r--r-- | src/lib/elm_win.c | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 68e603ee6..f2f5d142f 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -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++) |