summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-05-30 15:41:40 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-05-30 15:41:40 +0900
commit132a4d38735441c983be92d8ad4b0fe339557e72 (patch)
tree5e223f5fc84933aa498d04a2bf86b2e47adde2f9
parentad834e18165abcd0929f97a784b9060c6ebcad88 (diff)
downloadelementary-132a4d38735441c983be92d8ad4b0fe339557e72.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.c38
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++)