enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

ecore-wl2: Group connect and disconnect functions together 

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-08-20 10:57:07 -04:00
parent 93ea0b172c
commit f5e35519b3
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lib/ecore_wl2/Ecore_Wl2.h
View File

@ -153,6 +153,19 @@ EAPI Ecore_Wl2_Display *ecore_wl2_display_connect(const char *name);
*/
EAPI void ecore_wl2_display_disconnect(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);
/**
* Retrieve the existing Wayland display
*
@ -177,19 +190,6 @@ 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 */

28
src/lib/ecore_wl2/ecore_wl2_display.c
View File

@ -293,20 +293,6 @@ connect_err:
return NULL;
}
EAPI struct wl_display *
ecore_wl2_display_get(Ecore_Wl2_Display *display)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL);
return display->wl.display;
}
EAPI struct wl_shm *
ecore_wl2_display_shm_get(Ecore_Wl2_Display *display)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL);
return display->wl.shm;
}
EAPI void
ecore_wl2_display_disconnect(Ecore_Wl2_Display *display)
{
@ -329,3 +315,17 @@ ecore_wl2_display_terminate(Ecore_Wl2_Display *display)
EINA_SAFETY_ON_NULL_RETURN(display);
wl_display_terminate(display->wl.display);
}
EAPI struct wl_display *
ecore_wl2_display_get(Ecore_Wl2_Display *display)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL);
return display->wl.display;
}
EAPI struct wl_shm *
ecore_wl2_display_shm_get(Ecore_Wl2_Display *display)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL);
return display->wl.shm;
}