summaryrefslogtreecommitdiff
path: root/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-08-14 17:07:31 -0500
committerDerek Foreman <derekf@osg.samsung.com>2017-08-18 14:27:31 -0500
commite3b9fbaed8e5e5f3730d3a8aa406873f8df60744 (patch)
treef241826d5e6388a86ca41ba3e5392cdb886da689 /src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
parentccc4ffc80d0ca401dd58fc4fc573ab110f5cbd8e (diff)
wayland: Put Ecore_Wl2_Win instead of wl_surface into the engines
We'll need to track some state in a common way, so attaching it to the window seems like a good idea.
Diffstat (limited to 'src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c')
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index ad307edd51..51a55e417b 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -136,7 +136,7 @@ _ee_display_unset(Ecore_Evas *ee)
136 if (!einfo) return; 136 if (!einfo) return;
137 137
138 einfo->info.wl_display = NULL; 138 einfo->info.wl_display = NULL;
139 einfo->info.wl_surface = NULL; 139 einfo->info.wl2_win = NULL;
140 140
141 wdata = ee->engine.data; 141 wdata = ee->engine.data;
142 if (!strcmp(ee->driver, "wayland_egl")) 142 if (!strcmp(ee->driver, "wayland_egl"))
@@ -1663,7 +1663,7 @@ _ecore_evas_wl_common_render_flush_pre(void *data, Evas *evas, void *event EINA_
1663 einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(evas); 1663 einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(evas);
1664 if (!einfo) return; 1664 if (!einfo) return;
1665 1665
1666 surf = einfo->info.wl_surface; 1666 surf = ecore_wl2_window_surface_get(einfo->info.wl2_win);
1667 if (!surf) return; 1667 if (!surf) return;
1668 1668
1669 wdata = ee->engine.data; 1669 wdata = ee->engine.data;
@@ -2018,7 +2018,7 @@ _ecore_evas_wl_common_show(Ecore_Evas *ee)
2018 einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas); 2018 einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas);
2019 if (einfo) 2019 if (einfo)
2020 { 2020 {
2021 einfo->info.wl_surface = ecore_wl2_window_surface_get(wdata->win); 2021 einfo->info.wl2_win = wdata->win;
2022 einfo->info.hidden = wdata->win->pending.configure; //EINA_FALSE; 2022 einfo->info.hidden = wdata->win->pending.configure; //EINA_FALSE;
2023 einfo->www_avail = !!wdata->win->www_surface; 2023 einfo->www_avail = !!wdata->win->www_surface;
2024 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) 2024 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
@@ -2147,7 +2147,7 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
2147 ecore_wl2_display_compositor_version_get(wdata->display); 2147 ecore_wl2_display_compositor_version_get(wdata->display);
2148 einfo->info.destination_alpha = EINA_TRUE; 2148 einfo->info.destination_alpha = EINA_TRUE;
2149 einfo->info.rotation = ee->rotation; 2149 einfo->info.rotation = ee->rotation;
2150 einfo->info.wl_surface = ecore_wl2_window_surface_get(wdata->win); 2150 einfo->info.wl2_win = wdata->win;
2151 2151
2152 if (wdata->reset_pending) 2152 if (wdata->reset_pending)
2153 { 2153 {
@@ -2447,7 +2447,7 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, unsigned int parent, i
2447 einfo->info.destination_alpha = EINA_TRUE; 2447 einfo->info.destination_alpha = EINA_TRUE;
2448 einfo->info.rotation = ee->rotation; 2448 einfo->info.rotation = ee->rotation;
2449 einfo->info.depth = 32; 2449 einfo->info.depth = 32;
2450 einfo->info.wl_surface = ecore_wl2_window_surface_get(wdata->win); 2450 einfo->info.wl2_win = wdata->win;
2451 einfo->info.wl_dmabuf = ecore_wl2_display_dmabuf_get(ewd); 2451 einfo->info.wl_dmabuf = ecore_wl2_display_dmabuf_get(ewd);
2452 einfo->info.wl_shm = ecore_wl2_display_shm_get(ewd); 2452 einfo->info.wl_shm = ecore_wl2_display_shm_get(ewd);
2453 einfo->info.compositor_version = 2453 einfo->info.compositor_version =