summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-04-28 21:51:12 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-04-28 21:53:52 +0900
commit8b0c2eb207f71d43d6396d0327514e9840ba2d7e (patch)
tree5df8f5a0e4121004d38b5858ecd460b8429beda2 /src/lib
parent3ed24d9c3ca55216b2c061cb1f12183837ff566c (diff)
elm win - fix ELM_DISPLAY to choose the right software enine
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elm_win.c49
1 files changed, 20 insertions, 29 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 7e982dc5b..e34fecfdd 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2944,10 +2944,9 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t
2944 } 2944 }
2945 else 2945 else
2946 { 2946 {
2947 enginelist[0] = ENGINE_GET(); 2947 enginelist[0] = ELM_SOFTWARE_X11;
2948 enginelist[1] = ELM_SOFTWARE_X11; 2948 enginelist[1] = ELM_OPENGL_X11;
2949 enginelist[2] = ELM_OPENGL_X11; 2949 enginelist[2] = NULL;
2950 enginelist[3] = NULL;
2951 } 2950 }
2952 } 2951 }
2953 else if ((disp) && (!strcmp(disp, "wl"))) 2952 else if ((disp) && (!strcmp(disp, "wl")))
@@ -2960,15 +2959,13 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t
2960 } 2959 }
2961 else 2960 else
2962 { 2961 {
2963 enginelist[0] = ENGINE_GET(); 2962 enginelist[0] = ELM_WAYLAND_SHM;
2964 enginelist[1] = ELM_WAYLAND_SHM; 2963 enginelist[1] = ELM_WAYLAND_EGL;
2965 enginelist[2] = ELM_WAYLAND_EGL; 2964 enginelist[2] = NULL;
2966 enginelist[3] = NULL;
2967 } 2965 }
2968 } 2966 }
2969 else if ((disp) && (!strcmp(disp, "win"))) 2967 else if ((disp) && (!strcmp(disp, "win")))
2970 { 2968 {
2971 enginelist[0] = ENGINE_GET();
2972 enginelist[1] = ELM_SOFTWARE_WIN32; 2969 enginelist[1] = ELM_SOFTWARE_WIN32;
2973 enginelist[2] = NULL; 2970 enginelist[2] = NULL;
2974 } 2971 }
@@ -2982,42 +2979,36 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t
2982 } 2979 }
2983 else 2980 else
2984 { 2981 {
2985 enginelist[0] = ENGINE_GET(); 2982 enginelist[0] = ELM_SOFTWARE_SDL;
2986 enginelist[1] = ELM_SOFTWARE_SDL; 2983 enginelist[1] = ELM_OPENGL_SDL;
2987 enginelist[2] = ELM_OPENGL_SDL; 2984 enginelist[2] = NULL;
2988 enginelist[3] = NULL;
2989 } 2985 }
2990 } 2986 }
2991 else if ((disp) && (!strcmp(disp, "mac"))) 2987 else if ((disp) && (!strcmp(disp, "mac")))
2992 { 2988 {
2993 enginelist[0] = ENGINE_GET(); 2989 enginelist[0] = ELM_OPENGL_COCOA;
2994 enginelist[1] = ELM_OPENGL_COCOA; 2990 enginelist[1] = NULL;
2995 enginelist[2] = NULL;
2996 } 2991 }
2997 else if ((disp) && (!strcmp(disp, "ews"))) 2992 else if ((disp) && (!strcmp(disp, "ews")))
2998 { 2993 {
2999 enginelist[0] = ENGINE_GET(); 2994 enginelist[0] = ELM_EWS;
3000 enginelist[1] = ELM_EWS; 2995 enginelist[1] = NULL;
3001 enginelist[2] = NULL;
3002 } 2996 }
3003 else if ((disp) && (!strcmp(disp, "fb"))) 2997 else if ((disp) && (!strcmp(disp, "fb")))
3004 { 2998 {
3005 enginelist[0] = ENGINE_GET(); 2999 enginelist[0] = ELM_DRM;
3006 enginelist[1] = ELM_DRM; 3000 enginelist[1] = ELM_SOFTWARE_FB;
3007 enginelist[2] = ELM_SOFTWARE_FB; 3001 enginelist[2] = NULL;
3008 enginelist[3] = NULL;
3009 } 3002 }
3010 else if ((disp) && (!strcmp(disp, "buffer"))) 3003 else if ((disp) && (!strcmp(disp, "buffer")))
3011 { 3004 {
3012 enginelist[0] = ENGINE_GET(); 3005 enginelist[0] = ELM_BUFFER;
3013 enginelist[1] = ELM_BUFFER; 3006 enginelist[1] = NULL;
3014 enginelist[2] = NULL;
3015 } 3007 }
3016 else if ((disp) && (!strcmp(disp, "ps3"))) 3008 else if ((disp) && (!strcmp(disp, "ps3")))
3017 { 3009 {
3018 enginelist[0] = ENGINE_GET(); 3010 enginelist[0] = ELM_SOFTWARE_PSL1GHT;
3019 enginelist[1] = ELM_SOFTWARE_PSL1GHT; 3011 enginelist[1] = NULL;
3020 enginelist[2] = NULL;
3021 } 3012 }
3022 else if ((disp) && (!strcmp(disp, "shot"))) 3013 else if ((disp) && (!strcmp(disp, "shot")))
3023 { 3014 {