Ecore_Evas (wayland): Update shm and egl engines for recent changes in

wayland.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@68284 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/ecore_evas/ecore_evas_wayland_egl.c b/src/lib/ecore_evas/ecore_evas_wayland_egl.c
index 6a032eb..a0e96ad 100644 (file)
--- a/src/lib/ecore_evas/ecore_evas_wayland_egl.c
+++ b/src/lib/ecore_evas/ecore_evas_wayland_egl.c
@@ -70,7 +70,7 @@ static void _ecore_evas_wl_layer_set(Ecore_Evas *ee, int layer);
 static void _ecore_evas_wl_focus_set(Ecore_Evas *ee, int focus __UNUSED__);
 static void _ecore_evas_wl_iconified_set(Ecore_Evas *ee, int iconify);
 static void _ecore_evas_wl_maximized_set(Ecore_Evas *ee, int max);
-static void _ecore_evas_wl_fullscreen_set(Ecore_Evas *ee, int full __UNUSED__);
+static void _ecore_evas_wl_fullscreen_set(Ecore_Evas *ee, int full);
 static int _ecore_evas_wl_render(Ecore_Evas *ee);
 static void _ecore_evas_wl_screen_geometry_get(const Ecore_Evas *ee __UNUSED__, int *x, int *y, int *w, int *h);
 
@@ -745,13 +745,18 @@ _ecore_evas_wl_maximized_set(Ecore_Evas *ee, int max)
 }
 
 static void 
-_ecore_evas_wl_fullscreen_set(Ecore_Evas *ee, int full __UNUSED__)
+_ecore_evas_wl_fullscreen_set(Ecore_Evas *ee, int full)
 {
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
 
    if ((!ee) || (!ee->visible)) return;
    if (!ee->engine.wl.shell_surface) return;
-   wl_shell_surface_set_fullscreen(ee->engine.wl.shell_surface);
+   if (full)
+     wl_shell_surface_set_fullscreen(ee->engine.wl.shell_surface, 
+                                     WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT, 
+                                     0, NULL);
+   else
+     wl_shell_surface_set_toplevel(ee->engine.wl.shell_surface);
 }
 
 static int 

diff --git a/src/lib/ecore_evas/ecore_evas_wayland_shm.c b/src/lib/ecore_evas/ecore_evas_wayland_shm.c
index 8ad1809..94693da 100644 (file)
--- a/src/lib/ecore_evas/ecore_evas_wayland_shm.c
+++ b/src/lib/ecore_evas/ecore_evas_wayland_shm.c
@@ -70,7 +70,7 @@ static void _ecore_evas_wl_layer_set(Ecore_Evas *ee, int layer);
 static void _ecore_evas_wl_focus_set(Ecore_Evas *ee, int focus __UNUSED__);
 static void _ecore_evas_wl_iconified_set(Ecore_Evas *ee, int iconify);
 static void _ecore_evas_wl_maximized_set(Ecore_Evas *ee, int max);
-static void _ecore_evas_wl_fullscreen_set(Ecore_Evas *ee, int full __UNUSED__);
+static void _ecore_evas_wl_fullscreen_set(Ecore_Evas *ee, int full);
 static int _ecore_evas_wl_render(Ecore_Evas *ee);
 static void _ecore_evas_wl_screen_geometry_get(const Ecore_Evas *ee __UNUSED__, int *x, int *y, int *w, int *h);
 static void _ecore_evas_wl_buffer_new(Ecore_Evas *ee, void **dest);
@@ -820,13 +820,18 @@ _ecore_evas_wl_maximized_set(Ecore_Evas *ee, int max)
 }
 
 static void 
-_ecore_evas_wl_fullscreen_set(Ecore_Evas *ee, int full __UNUSED__)
+_ecore_evas_wl_fullscreen_set(Ecore_Evas *ee, int full)
 {
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
 
    if ((!ee) || (!ee->visible)) return;
    if (!ee->engine.wl.shell_surface) return;
-   wl_shell_surface_set_fullscreen(ee->engine.wl.shell_surface);
+   if (full)
+     wl_shell_surface_set_fullscreen(ee->engine.wl.shell_surface, 
+                                     WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT, 
+                                     0, NULL);
+   else
+     wl_shell_surface_set_toplevel(ee->engine.wl.shell_surface);
 }
 
 static int