derekf pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b898d3f929c9e21833196d1a41430f9760a364ee
commit b898d3f929c9e21833196d1a41430f9760a364ee Author: Derek Foreman <[email protected]> Date: Tue Nov 1 07:42:23 2016 -0500 wayland ecore evas: move move_resize to common It's identical in both shm and egl variants, share it. --- .../engines/wayland/ecore_evas_wayland_common.c | 12 ++++++++++++ .../ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 15 +-------------- .../engines/wayland/ecore_evas_wayland_private.h | 1 + .../ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 15 +-------------- 4 files changed, 15 insertions(+), 28 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 48f0317..fdfcc99 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 @@ -992,6 +992,18 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h) } void +_ecore_evas_wl_common_move_resize(Ecore_Evas *ee, int x, int y, int w, int h) +{ + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + if (!ee) return; + if ((ee->x != x) || (ee->y != y)) + _ecore_evas_wl_common_move(ee, x, y); + if ((ee->w != w) || (ee->h != h)) + _ecore_evas_wl_common_resize(ee, w, h); +} + +void _ecore_evas_wl_common_callback_resize_set(Ecore_Evas *ee, void (*func)(Ecore_Evas *ee)) { if (!ee) return; diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c index 9880e85..3b2ad37 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c @@ -34,7 +34,6 @@ extern EAPI Eina_List *_evas_canvas_image_data_unset(Evas *eo_e); extern EAPI void _evas_canvas_image_data_regenerate(Eina_List *list); /* local function prototypes */ -static void _ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h); static void _ecore_evas_wl_show(Ecore_Evas *ee); static void _ecore_evas_wl_hide(Ecore_Evas *ee); static void _ecore_evas_wl_alpha_set(Ecore_Evas *ee, int alpha); @@ -61,7 +60,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func = _ecore_evas_wl_common_move, NULL, // managed_move _ecore_evas_wl_common_resize, - _ecore_evas_wl_move_resize, + _ecore_evas_wl_common_move_resize, _ecore_evas_wl_rotation_set, NULL, // shaped_set _ecore_evas_wl_show, @@ -450,18 +449,6 @@ conn_err: return NULL; } -static void -_ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h) -{ - LOGFN(__FILE__, __LINE__, __FUNCTION__); - - if (!ee) return; - if ((ee->x != x) || (ee->y != y)) - _ecore_evas_wl_common_move(ee, x, y); - if ((ee->w != w) || (ee->h != h)) - _ecore_evas_wl_common_resize(ee, w, h); -} - static void _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int resize) { diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h index bea9870..dc53701 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h @@ -71,6 +71,7 @@ void _ecore_evas_wl_common_callback_mouse_in_set(Ecore_Evas *ee, void (*func)(Ec void _ecore_evas_wl_common_callback_mouse_out_set(Ecore_Evas *ee, void (*func)(Ecore_Evas *ee)); void _ecore_evas_wl_common_move(Ecore_Evas *ee, int x, int y); void _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h); +void _ecore_evas_wl_common_move_resize(Ecore_Evas *ee, int x, int y, int w, int h); void _ecore_evas_wl_common_raise(Ecore_Evas *ee); void _ecore_evas_wl_common_title_set(Ecore_Evas *ee, const char *title); void _ecore_evas_wl_common_name_class_set(Ecore_Evas *ee, const char *n, const char *c); diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c index 4b3b492..3398f19 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c @@ -31,7 +31,6 @@ #endif /* ! _WIN32 */ /* local function prototypes */ -static void _ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h); static void _ecore_evas_wl_show(Ecore_Evas *ee); static void _ecore_evas_wl_hide(Ecore_Evas *ee); static void _ecore_evas_wl_alpha_set(Ecore_Evas *ee, int alpha); @@ -58,7 +57,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func = _ecore_evas_wl_common_move, NULL, // managed_move _ecore_evas_wl_common_resize, - _ecore_evas_wl_move_resize, + _ecore_evas_wl_common_move_resize, _ecore_evas_wl_rotation_set, NULL, // shaped_set _ecore_evas_wl_show, @@ -379,18 +378,6 @@ conn_err: return NULL; } -static void -_ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h) -{ - LOGFN(__FILE__, __LINE__, __FUNCTION__); - - if (!ee) return; - if ((ee->x != x) || (ee->y != y)) - _ecore_evas_wl_common_move(ee, x, y); - if ((ee->w != w) || (ee->h != h)) - _ecore_evas_wl_common_resize(ee, w, h); -} - static void _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int resize) { --
