e_tizen_wl_shell: make e_tizen_wl_shell_cbhm.c file

Move the cbhm impelementation to this e_tizen_ws_shell_cbhm.c file.

Change-Id: Ib58d9f50a20150e77cab91045b0151433bc9331d

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index de8800b4d9ddbfe6c0dae30bdd66e1e61fc3f478..e562ac6629e690009b8f10bcb8609c3288c15366 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -206,6 +206,7 @@ src/bin/server/e_tizen_launch_effect.c \
 src/bin/server/e_tizen_launch_appinfo.c \
 src/bin/server/e_tizen_display_policy.c \
 src/bin/server/e_tizen_ws_shell_manager.c \
+src/bin/server/e_tizen_ws_shell_srv_cbhm.c \
 src/bin/server/e_tizen_indicator.c \
 src/bin/server/e_tizen_clipboard.c \
 src/bin/server/e_surface_view.c \

diff --git a/src/bin/meson.build b/src/bin/meson.build
index 2595df2a5cedff84fbea1230245f39871e46f836..c7b261260e50c4bfe5f1317491e0e344d1eff165 100644 (file)
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -210,6 +210,7 @@ e_sources = [
   'server/e_tizen_launch_appinfo.c',
   'server/e_tizen_display_policy.c',
   'server/e_tizen_ws_shell_manager.c',
+  'server/e_tizen_ws_shell_srv_cbhm.c',
   'server/e_tizen_indicator.c',
   'server/e_tizen_clipboard.c',
   'server/e_surface_view.c',

diff --git a/src/bin/server/e_tizen_ws_shell_manager.c b/src/bin/server/e_tizen_ws_shell_manager.c
index 9d2a48fe7db37dbdee0939aa0eee134b205efee5..8fb9949fae588cfe193cadd75529bdbed4cba2be 100644 (file)
--- a/src/bin/server/e_tizen_ws_shell_manager.c
+++ b/src/bin/server/e_tizen_ws_shell_manager.c
@@ -7,7 +7,6 @@
 #include "services/e_service_taskbar_intern.h"
 #include "services/e_service_kvm_intern.h"
 #include "services/e_service_softkey_intern.h"
-#include "services/e_service_cbhm_intern.h"
 #include "e_comp_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_pixmap_intern.h"
@@ -19,6 +18,7 @@
 #include "e_screensaver_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_config_intern.h"
+#include "e_tizen_ws_shell_srv_cbhm_intern.h"
 
 #include <tzsh_server.h>
 
@@ -1066,54 +1066,10 @@ _tzsh_srv_iface_cb_scrsaver_mng_get(struct wl_client *client, struct wl_resource
                                   _tzsh_srv_scrsaver_mng_cb_resource_destroy);
 }
 
-static void
-_tzsh_srv_cbhm_cb_destroy(struct wl_client *client EINA_UNUSED, struct wl_resource *resource)
-{
-   wl_resource_destroy(resource);
-}
-
-static void
-_tzsh_srv_cbhm_cb_msg(struct wl_client *client EINA_UNUSED, struct wl_resource *resource, uint32_t msg)
-{
-   E_Tizen_Ws_Shell_Srv *tzsh_srv;
-
-   tzsh_srv = wl_resource_get_user_data(resource);
-
-   EINA_SAFETY_ON_NULL_RETURN(tzsh_srv);
-   EINA_SAFETY_ON_NULL_RETURN(tzsh_srv->tzsh);
-
-#define EC  tzsh_srv->ec
-   EINA_SAFETY_ON_NULL_RETURN(EC);
-
-   switch (msg)
-     {
-      case TWS_SERVICE_CBHM_MSG_SHOW:
-         e_service_cbhm_show();
-         break;
-      case TWS_SERVICE_CBHM_MSG_HIDE:
-         e_service_cbhm_hide();
-         break;
-      case TWS_SERVICE_CBHM_MSG_DATA_SELECTED:
-         e_service_cbhm_data_selected();
-         break;
-      default:
-         ERR("Unknown message!! msg %d", msg);
-         break;
-     }
-#undef EC
-}
-
-static const struct tws_service_cbhm_interface _tzsh_srv_cbhm_iface =
-{
-   _tzsh_srv_cbhm_cb_destroy,
-   _tzsh_srv_cbhm_cb_msg
-};
-
 static void
 _tzsh_srv_iface_cb_cbhm_get(struct wl_client *client, struct wl_resource *res_tzsh_srv, uint32_t id)
 {
    E_Tizen_Ws_Shell_Srv *tzsh_srv;
-   struct wl_resource *res;
 
    tzsh_srv = wl_resource_get_user_data(res_tzsh_srv);
    EINA_SAFETY_ON_NULL_RETURN(tzsh_srv);
@@ -1121,14 +1077,24 @@ _tzsh_srv_iface_cb_cbhm_get(struct wl_client *client, struct wl_resource *res_tz
    if (!eina_list_data_find(g_tizen_ws_shell_mgr->tzsh_srvs, tzsh_srv))
      return;
 
-   res = wl_resource_create(client, &tws_service_cbhm_interface, 1, id);
-   if (!res)
+   if (tzsh_srv->role != TZSH_SRV_ROLE_CBHM)
      {
-        wl_client_post_no_memory(client);
+        ERR("Could not find cbhm service");
+        tizen_ws_shell_send_error(res_tzsh_srv,
+                                   TIZEN_WS_SHELL_ERROR_NO_SERVICE);
         return;
      }
 
-   wl_resource_set_implementation(res, &_tzsh_srv_cbhm_iface, tzsh_srv, NULL);
+   tzsh_srv->client = client;
+   tzsh_srv->id = id;
+
+   if (!e_tizen_ws_shell_srv_cbhm_init(tzsh_srv))
+     {
+        ERR("e_tizen_ws_shell_srv_cbhm_init() failed.");
+        tizen_ws_shell_send_error(res_tzsh_srv,
+                                  TIZEN_WS_SHELL_ERROR_NOT_SUPPORTED);
+        return;
+     }
 }
 
 

diff --git a/src/bin/server/e_tizen_ws_shell_srv_cbhm.c b/src/bin/server/e_tizen_ws_shell_srv_cbhm.c
new file mode 100644 (file)
index 0000000..8db0904
--- /dev/null
+++ b/src/bin/server/e_tizen_ws_shell_srv_cbhm.c
@@ -0,0 +1,71 @@
+#include "e_tizen_ws_shell_srv_cbhm_intern.h"
+#include "services/e_service_cbhm_intern.h"
+
+#include <tzsh_server.h>
+
+static void
+_tzsh_srv_cbhm_cb_destroy(struct wl_client *client EINA_UNUSED, struct wl_resource *resource)
+{
+   wl_resource_destroy(resource);
+}
+
+static void
+_tzsh_srv_cbhm_cb_msg(struct wl_client *client EINA_UNUSED, struct wl_resource *resource, uint32_t msg)
+{
+   E_Tizen_Ws_Shell_Srv *tzsh_srv;
+   E_Client *ec;
+
+   tzsh_srv = wl_resource_get_user_data(resource);
+
+   EINA_SAFETY_ON_NULL_RETURN(tzsh_srv);
+   EINA_SAFETY_ON_NULL_RETURN(tzsh_srv->tzsh);
+
+   ec = tzsh_srv->ec;
+   EINA_SAFETY_ON_NULL_RETURN(ec);
+
+   switch (msg)
+     {
+      case TWS_SERVICE_CBHM_MSG_SHOW:
+         e_service_cbhm_show();
+         break;
+      case TWS_SERVICE_CBHM_MSG_HIDE:
+         e_service_cbhm_hide();
+         break;
+      case TWS_SERVICE_CBHM_MSG_DATA_SELECTED:
+         e_service_cbhm_data_selected();
+         break;
+      default:
+         ERR("Unknown message!! msg %d", msg);
+         break;
+     }
+}
+
+static const struct tws_service_cbhm_interface _tzsh_srv_cbhm_iface =
+{
+   _tzsh_srv_cbhm_cb_destroy,
+   _tzsh_srv_cbhm_cb_msg
+};
+
+EINTERN Eina_Bool
+e_tizen_ws_shell_srv_cbhm_init(E_Tizen_Ws_Shell_Srv *tzsh_srv)
+{
+   struct wl_client *client;
+   struct wl_resource *res;
+   uint32_t id;
+
+   EINA_SAFETY_ON_NULL_RETURN_VAL(tzsh_srv, EINA_FALSE);
+
+   client = tzsh_srv->client;
+   id = tzsh_srv->id;
+
+   res = wl_resource_create(client, &tws_service_cbhm_interface, 1, id);
+   if (!res)
+     {
+        wl_client_post_no_memory(client);
+        return EINA_FALSE;
+     }
+
+   wl_resource_set_implementation(res, &_tzsh_srv_cbhm_iface, tzsh_srv, NULL);
+
+   return EINA_TRUE;
+}

diff --git a/src/bin/server/e_tizen_ws_shell_srv_cbhm_intern.h b/src/bin/server/e_tizen_ws_shell_srv_cbhm_intern.h
new file mode 100644 (file)
index 0000000..c4831ad
--- /dev/null
+++ b/src/bin/server/e_tizen_ws_shell_srv_cbhm_intern.h
@@ -0,0 +1,9 @@
+#ifndef E_TIZEN_WS_SHELL_CBHM_SRV_INTERN_H
+#define E_TIZEN_WS_SHELL_CBHM_SRV_INTERN_H
+
+#include "e_intern.h"
+#include "e_tizen_ws_shell_manager_intern.h"
+
+EINTERN Eina_Bool e_tizen_ws_shell_srv_cbhm_init(E_Tizen_Ws_Shell_Srv *tzsh_srv);
+
+#endif