ecore-wayland: Modified ecore_wl_window_indicator_state_set()

Modified
- ecore_wl_window_indicator_state_set()
Added
- ecore_wl_window_indicator_opacity_set()

Change-Id: Id7541c8e8473fe4b2355f7d99bf27fa95fbf4e07
Signed-off-by: Duna Oh <duna.oh@samsung.com>

diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h
index 435f584..fdb3888 100644 (file)
--- a/src/lib/ecore_wayland/Ecore_Wayland.h
+++ b/src/lib/ecore_wayland/Ecore_Wayland.h
@@ -130,6 +130,14 @@ enum _Ecore_Wl_Clipboard_State
    ECORE_WL_CLIPBOARD_STATE_ON
 };
 
+enum _Ecore_Wl_Indicator_Opacity_Mode
+{
+   ECORE_WL_INDICATOR_OPACITY_UNKNOWN = 0,
+   ECORE_WL_INDICATOR_OPAQUE,
+   ECORE_WL_INDICATOR_TRANSLUCENT,
+   ECORE_WL_INDICATOR_TRANSPARENT
+};
+
 typedef enum _Ecore_Wl_Window_Type Ecore_Wl_Window_Type;
 typedef enum _Ecore_Wl_Window_Buffer_Type Ecore_Wl_Window_Buffer_Type;
 typedef enum _Ecore_Wl_Window_Keygrab_Mode Ecore_Wl_Window_Keygrab_Mode;
@@ -137,6 +145,7 @@ typedef enum _Ecore_Wl_Conformant_Part_Type Ecore_Wl_Conformant_Part_Type;
 typedef enum _Ecore_Wl_Virtual_Keyboard_State Ecore_Wl_Virtual_Keyboard_State;
 typedef enum _Ecore_Wl_Indicator_State Ecore_Wl_Indicator_State;
 typedef enum _Ecore_Wl_Clipboard_State Ecore_Wl_Clipboard_State;
+typedef enum _Ecore_Wl_Indicator_Opacity_Mode Ecore_Wl_Indicator_Opacity_Mode;
 
 /** @since 1.7.6 */
 struct _Ecore_Wl_Global
@@ -994,8 +1003,10 @@ EAPI Eina_Bool ecore_wl_window_conformant_get(Ecore_Wl_Window *win);
 
 EAPI void ecore_wl_window_indicator_geometry_set(Ecore_Wl_Window *win, int x, int y, int w, int h);
 EAPI Eina_Bool ecore_wl_window_indicator_geometry_get(Ecore_Wl_Window *win, int *x, int *y, int *w, int *h);
-EAPI void ecore_wl_window_indicator_state_set(Ecore_Wl_Window *win, Eina_Bool on);
+EAPI void ecore_wl_window_indicator_state_set(Ecore_Wl_Window *win, Ecore_Wl_Indicator_State state);
 EAPI Ecore_Wl_Indicator_State ecore_wl_window_indicator_state_get(Ecore_Wl_Window *win);
+EAPI void ecore_wl_window_indicator_opacity_set(Ecore_Wl_Window *win, Ecore_Wl_Indicator_Opacity_Mode mode);
+EAPI Ecore_Wl_Indicator_Opacity_Mode ecore_wl_window_indicator_opacity_get(Ecore_Wl_Window *win);
 
 EAPI void ecore_wl_window_clipboard_geometry_set(Ecore_Wl_Window *win, int x, int y, int w, int h);
 EAPI Eina_Bool ecore_wl_window_clipboard_geometry_get(Ecore_Wl_Window *win, int *x, int *y, int *w, int *h);

diff --git a/src/lib/ecore_wayland/ecore_wl_private.h b/src/lib/ecore_wayland/ecore_wl_private.h
index a1f5e5b..9c979aa 100644 (file)
--- a/src/lib/ecore_wayland/ecore_wl_private.h
+++ b/src/lib/ecore_wayland/ecore_wl_private.h
@@ -165,6 +165,7 @@ struct _Ecore_Wl_Window
      {
         int x, y, w, h;
         Ecore_Wl_Indicator_State state;
+        Ecore_Wl_Indicator_Opacity_Mode mode;
      } indicator;
    struct
      {

diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c
index d61244c..1006af3 100644 (file)
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -1640,13 +1640,12 @@ ecore_wl_window_indicator_geometry_get(Ecore_Wl_Window *win, int *x, int *y, int
 }
 
 EAPI void
-ecore_wl_window_indicator_state_set(Ecore_Wl_Window *win, Eina_Bool on)
+ecore_wl_window_indicator_state_set(Ecore_Wl_Window *win, Ecore_Wl_Indicator_State state)
 {
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
    if (!win) return;
 
-   if (on) win->indicator.state = ECORE_WL_INDICATOR_STATE_ON;
-   else if (!on) win->indicator.state = ECORE_WL_INDICATOR_STATE_OFF;
+   win->indicator.state = state;
 }
 
 EAPI Ecore_Wl_Indicator_State
@@ -1658,6 +1657,24 @@ ecore_wl_window_indicator_state_get(Ecore_Wl_Window *win)
    return win->indicator.state;
 }
 
+EAPI void
+ecore_wl_window_indicator_opacity_set(Ecore_Wl_Window *win, Ecore_Wl_Indicator_Opacity_Mode mode)
+{
+   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   if (!win) return;
+
+   win->indicator.mode = mode;
+}
+
+EAPI Ecore_Wl_Indicator_Opacity_Mode
+ecore_wl_window_indicator_opacity_get(Ecore_Wl_Window *win)
+{
+   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+   if (!win) return EINA_FALSE;
+
+   return win->indicator.mode;
+}
+
 void
 ecore_wl_window_clipboard_geometry_set(Ecore_Wl_Window *win, int x, int y, int w, int h)
 {