ecore-wl2: Add API to return the compositor object from a given display
authorChristopher Michael <cp.michael@samsung.com>
Tue, 19 Nov 2019 14:23:18 +0000 (09:23 -0500)
committerJongmin Lee <jm105.lee@samsung.com>
Tue, 19 Nov 2019 21:32:44 +0000 (06:32 +0900)
This patch adds a convenience function to get the wl_compositor object
from a given display

@feature

src/lib/ecore_wl2/Ecore_Wl2.h
src/lib/ecore_wl2/ecore_wl2_display.c

index b04f491..80a8751 100644 (file)
@@ -966,6 +966,18 @@ EAPI Ecore_Wl2_Window *ecore_wl2_display_window_find_by_surface(Ecore_Wl2_Displa
 EAPI Ecore_Wl2_Display *ecore_wl2_connected_display_get(const char *name);
 
 /**
+ * Gets the wl_compositor which belongs to this display
+ *
+ * @param display The Ecore_Wl2_Display to get the compositor of
+ *
+ * @return The wl_compositor associated with this display
+ *
+ * @ingroup Ecore_Wl2_Display_Group
+ * @since 1.24
+ */
+EAPI struct wl_compositor *ecore_wl2_display_compositor_get(Ecore_Wl2_Display *display);
+
+/**
  * @defgroup Ecore_Wl2_Window_Group Wayland Library Window Functions
  * @ingroup Ecore_Wl2_Group
  *
@@ -2430,10 +2442,6 @@ EAPI void ecore_wl2_sync(void);
 EAPI Eina_Bool ecore_wl2_window_ignore_output_transform_get(Ecore_Wl2_Window *win);
 //
 
-//TIZEN_ONLY(20171115): support getting wl_compositor of Ecore_Wl2_Display
-EAPI struct wl_compositor *ecore_wl2_display_compositor_get(Ecore_Wl2_Display *display);
-//
-
 //TIZEN_ONLY(20180810): support client demand move resize
 EAPI void
 ecore_wl2_window_sync_geometry_set(Ecore_Wl2_Window *window, uint32_t serial, int x, int y, int w, int h);
index 669d997..67dca7b 100644 (file)
@@ -1919,16 +1919,6 @@ ecore_wl2_display_compositor_version_get(Ecore_Wl2_Display *display)
    return display->wl.compositor_version;
 }
 
-// TIZEN_ONLY(20180123)
-EAPI struct wl_compositor *
-ecore_wl2_display_compositor_get(Ecore_Wl2_Display *display)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(display, 0);
-
-   return display->wl.compositor;
-}
-//
-
 EAPI Eina_Iterator *
 ecore_wl2_display_inputs_get(Ecore_Wl2_Display *display)
 {
@@ -2032,3 +2022,10 @@ ecore_wl2_connected_display_get(const char *name)
 
    return ewd;
 }
+
+EAPI struct wl_compositor *
+ecore_wl2_display_compositor_get(Ecore_Wl2_Display *display)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL);
+   return display->wl.compositor;
+}