e_tizen_ws_shell_manager: declare E_Tizen_Ws_Shell_Srv

declare E_Tizen_Ws_Shell_Srv structure at e_tizen_ws_shell_manager_intern.h

Change-Id: I4bd991b35dbb8fde2c6d9a5f7f9cdc26b566ad3f

diff --git a/src/bin/server/e_tizen_ws_shell_manager.c b/src/bin/server/e_tizen_ws_shell_manager.c
index 1b3d5cbfc82c9e433b2441e7e5607e2886ebfa54..d0c414c09b4f2e8e7ae3521b6527614484930840 100644 (file)
--- a/src/bin/server/e_tizen_ws_shell_manager.c
+++ b/src/bin/server/e_tizen_ws_shell_manager.c
@@ -23,26 +23,6 @@
 
 #include <tzsh_server.h>
 
-typedef enum _Tzsh_Srv_Role
-{
-   TZSH_SRV_ROLE_UNKNOWN = -1,
-   TZSH_SRV_ROLE_VOLUME,
-   TZSH_SRV_ROLE_QUICKPANEL_SYSTEM_DEFAULT,
-   TZSH_SRV_ROLE_QUICKPANEL_CONTEXT_MENU,
-   TZSH_SRV_ROLE_QUICKPANEL_APPS_MENU,
-   TZSH_SRV_ROLE_LOCKSCREEN,
-   TZSH_SRV_ROLE_INDICATOR,
-   TZSH_SRV_ROLE_SCREENSAVER_MNG,
-   TZSH_SRV_ROLE_SCREENSAVER,
-   TZSH_SRV_ROLE_CBHM,
-   TZSH_SRV_ROLE_SOFTKEY,
-   TZSH_SRV_ROLE_MAGNIFIER,
-   TZSH_SRV_ROLE_LAUNCHER,
-   TZSH_SRV_ROLE_TASKBAR,
-   TZSH_SRV_ROLE_KVM,
-   TZSH_SRV_ROLE_MAX
-} Tzsh_Srv_Role;
-
 typedef enum _Tzsh_Client_Handle_Type
 {
    TZSH_CLIENT_HANDLE_TYPE_NONE = 0,
@@ -58,24 +38,12 @@ typedef enum _Tzsh_Type
    TZSH_TYPE_CLIENT
 } Tzsh_Type;
 
-typedef struct _E_Tizen_Ws_Shell
+struct _E_Tizen_Ws_Shell
 {
    struct wl_resource *res_tzsh; /* tizen_ws_shell_interface */
    Eina_List *service_list;
    Eina_List *client_list;
-} E_Tizen_Ws_Shell;
-
-typedef struct _E_Tizen_Ws_Shell_Srv
-{
-   E_Tizen_Ws_Shell   *tzsh;
-   struct wl_resource *res_tzsh_srv;
-   Tzsh_Srv_Role       role;
-   const char         *name;
-   E_Pixmap *ep;
-   E_Client *ec;
-   E_Zone *zone;
-   Eina_List *events;
-} E_Tizen_Ws_Shell_Srv;
+};
 
 typedef struct _E_Tizen_Ws_Shell_Client
 {
@@ -3372,4 +3340,4 @@ e_tizen_ws_shell_shutdown(void)
 
    E_FREE(g_tizen_ws_shell_mgr);
    g_tizen_ws_shell_mgr = NULL;
-}
\ No newline at end of file
+}

diff --git a/src/bin/server/e_tizen_ws_shell_manager_intern.h b/src/bin/server/e_tizen_ws_shell_manager_intern.h
index 0fe61255e96adff049465236c87a50f9e2323a7f..f818a96dca07a4f980688dd7486f5e96175a2ea7 100644 (file)
--- a/src/bin/server/e_tizen_ws_shell_manager_intern.h
+++ b/src/bin/server/e_tizen_ws_shell_manager_intern.h
@@ -3,11 +3,50 @@
 
 #include "e_intern.h"
 #include "e_policy_intern.h"
+#include "e_client_intern.h"
+#include "e_pixmap_intern.h"
+#include "e_zone_intern.h"
 
 typedef struct _E_Tizen_Ws_Shell_Manager E_Tizen_Ws_Shell_Manager;
+typedef struct _E_Tizen_Ws_Shell_Srv E_Tizen_Ws_Shell_Srv;
+typedef struct _E_Tizen_Ws_Shell E_Tizen_Ws_Shell;
 
 typedef struct wl_resource* (*E_Tizen_Ws_Shell_Ext_Hook_Cb)(struct wl_client* client, struct wl_resource* res, uint32_t id);
 
+typedef enum _Tzsh_Srv_Role
+{
+   TZSH_SRV_ROLE_UNKNOWN = -1,
+   TZSH_SRV_ROLE_VOLUME,
+   TZSH_SRV_ROLE_QUICKPANEL_SYSTEM_DEFAULT,
+   TZSH_SRV_ROLE_QUICKPANEL_CONTEXT_MENU,
+   TZSH_SRV_ROLE_QUICKPANEL_APPS_MENU,
+   TZSH_SRV_ROLE_LOCKSCREEN,
+   TZSH_SRV_ROLE_INDICATOR,
+   TZSH_SRV_ROLE_SCREENSAVER_MNG,
+   TZSH_SRV_ROLE_SCREENSAVER,
+   TZSH_SRV_ROLE_CBHM,
+   TZSH_SRV_ROLE_SOFTKEY,
+   TZSH_SRV_ROLE_MAGNIFIER,
+   TZSH_SRV_ROLE_LAUNCHER,
+   TZSH_SRV_ROLE_TASKBAR,
+   TZSH_SRV_ROLE_KVM,
+   TZSH_SRV_ROLE_MAX
+} Tzsh_Srv_Role;
+
+struct _E_Tizen_Ws_Shell_Srv
+{
+   E_Tizen_Ws_Shell   *tzsh;
+   struct wl_client   *client;
+   uint32_t id;
+   struct wl_resource *res_tzsh_srv;
+   Tzsh_Srv_Role       role;
+   const char         *name;
+   E_Pixmap *ep;
+   E_Client *ec;
+   E_Zone *zone;
+   Eina_List *events;
+};
+
 EINTERN E_Tizen_Ws_Shell_Manager *e_tizen_ws_shell_manager_init(struct wl_display *display);
 EINTERN void                      e_tizen_ws_shell_shutdown(void);