devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=98706f01575bd0819397069d433296c06706547d
commit 98706f01575bd0819397069d433296c06706547d Author: Chris Michael <[email protected]> Date: Thu Aug 20 10:41:33 2015 -0400 ecore-wl2: Add API function for servers to terminate wayland display main loop Signed-off-by: Chris Michael <[email protected]> --- src/lib/ecore_wl2/Ecore_Wl2.h | 13 +++++++++++++ src/lib/ecore_wl2/ecore_wl2_display.c | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index d54d4bb..13e8e6b 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -177,6 +177,19 @@ EAPI struct wl_display *ecore_wl2_display_get(Ecore_Wl2_Display *display); */ EAPI struct wl_shm *ecore_wl2_display_shm_get(Ecore_Wl2_Display *display); +/** + * Terminate a Wayland display's main loop + * + * @brief This function is typically used by servers to terminate the + * Wayland display main loop. This is usually only called when a server + * encounters an error. + * + * @param display The Ecore_Wl2_Display to terminate + * + * @ingroup Ecore_Wl2_Display_Group + */ +EAPI void ecore_wl2_display_terminate(Ecore_Wl2_Display *display); + /* # ifdef __cplusplus */ /* } */ /* # endif */ diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c index 58337c7..0c7d4d8 100644 --- a/src/lib/ecore_wl2/ecore_wl2_display.c +++ b/src/lib/ecore_wl2/ecore_wl2_display.c @@ -308,3 +308,10 @@ ecore_wl2_display_destroy(Ecore_Wl2_Display *display) EINA_SAFETY_ON_NULL_RETURN(display); wl_display_destroy(display->wl.display); } + +EAPI void +ecore_wl2_display_terminate(Ecore_Wl2_Display *display) +{ + EINA_SAFETY_ON_NULL_RETURN(display); + wl_display_terminate(display->wl.display); +} --
