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)
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
3036 { 3036 {
3037 if (_accel_is_gl()) 3037 if (_accel_is_gl())
3038 { 3038 {
3039 enginelist[0] = ELM_OPENGL_X11; 3039 enginelist[ 0] = ELM_OPENGL_X11;
3040 enginelist[1] = ELM_WAYLAND_EGL; 3040 enginelist[ 1] = ELM_WAYLAND_EGL;
3041 enginelist[2] = ELM_DRM; 3041 enginelist[ 2] = ELM_DRM;
3042 enginelist[3] = ELM_SOFTWARE_FB; 3042 enginelist[ 3] = ELM_SOFTWARE_FB;
3043 enginelist[4] = ELM_OPENGL_COCOA; 3043 enginelist[ 4] = ELM_OPENGL_COCOA;
3044 enginelist[5] = ELM_OPENGL_SDL; 3044 enginelist[ 5] = ELM_OPENGL_SDL;
3045 enginelist[6] = NULL; 3045 enginelist[ 6] = ELM_SOFTWARE_X11;
3046 enginelist[ 7] = ELM_WAYLAND_SHM;
3047 enginelist[ 8] = ELM_SOFTWARE_SDL;
3048 enginelist[ 9] = ELM_SOFTWARE_PSL1GHT;
3049 enginelist[10] = NULL;
3046 } 3050 }
3047 else 3051 else
3048 { 3052 {
3049 enginelist[0] = ENGINE_GET(); 3053 enginelist[ 0] = ENGINE_GET();
3050 enginelist[1] = ELM_SOFTWARE_X11; 3054 enginelist[ 1] = ELM_SOFTWARE_X11;
3051 enginelist[2] = ELM_WAYLAND_SHM; 3055 enginelist[ 2] = ELM_WAYLAND_SHM;
3052 enginelist[3] = ELM_DRM; 3056 enginelist[ 3] = ELM_DRM;
3053 enginelist[4] = ELM_SOFTWARE_FB; 3057 enginelist[ 4] = ELM_SOFTWARE_FB;
3054 enginelist[5] = ELM_OPENGL_COCOA; 3058 enginelist[ 5] = ELM_OPENGL_COCOA;
3055 enginelist[6] = ELM_SOFTWARE_SDL; 3059 enginelist[ 6] = ELM_SOFTWARE_SDL;
3056 enginelist[7] = NULL; 3060 enginelist[ 7] = ELM_OPENGL_X11;
3061 enginelist[ 8] = ELM_WAYLAND_EGL;
3062 enginelist[ 9] = ELM_DRM;
3063 enginelist[10] = ELM_OPENGL_SDL;
3064 enginelist[11] = NULL;
3057 } 3065 }
3058 } 3066 }
3059 for (i = 0; i < 30; i++) 3067 for (i = 0; i < 30; i++)