remove tizen_transient_for protocol

Change-Id: If3fce63c871bb725275b1b12fadea1affb0c88cf

diff --git a/src/modules/Makefile_wl_desktop_shell.mk b/src/modules/Makefile_wl_desktop_shell.mk
index 39c5907dfbd77c9a68ef094494aeda5e5d840a37..c5480a3c58376214284b2c52901a8ef2e0a6728f 100644 (file)
--- a/src/modules/Makefile_wl_desktop_shell.mk
+++ b/src/modules/Makefile_wl_desktop_shell.mk
@@ -19,9 +19,7 @@ src_modules_wl_desktop_shell_module_la_SOURCES = \
   src/modules/wl_desktop_shell/e_scaler.c \
   src/modules/wl_desktop_shell/e_scaler.h \
   src/modules/wl_desktop_shell/tizen_extension_server_protocol.h \
-  src/modules/wl_desktop_shell/tizen_extension_protocol.c \
-  src/modules/wl_desktop_shell/tizen_transient_for_server_protocol.h \
-  src/modules/wl_desktop_shell/tizen_transient_for_protocol.c
+  src/modules/wl_desktop_shell/tizen_extension_protocol.c
 
 PHONIES += wl_desktop_shell install-wl_desktop_shell
 wl_desktop_shell: $(wl_desktop_shellpkg_LTLIBRARIES) $(wl_desktop_shell_DATA)

diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c
index 31ff5f77ec5754b01e79df794d4bb6bbcf396918..26ddd997e1ac23edfbfb863b4459580612360d73 100644 (file)
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -5,7 +5,6 @@
 #include <tizen-extension-server-protocol.h>
 #include "e_scaler.h"
 #include "tizen_extension_server_protocol.h"
-#include "tizen_transient_for_server_protocol.h"
 
 #define XDG_SERVER_VERSION 4
 
@@ -1428,55 +1427,11 @@ _e_tz_surf_ext_cb_tz_res_get(struct wl_client *client, struct wl_resource *resou
    tizen_resource_send_resource_id(res, res_id);
 }
 
-static void
-_e_tz_transient_for_cb_set(struct wl_client *client, struct wl_resource *resource, uint32_t child_id, uint32_t parent_id)
-{
-   E_Client *ec, *pc;
-   struct wl_resource *parent_res;
-
-   DBG("chid_id: %" PRIu32 ", parent_id: %" PRIu32, child_id, parent_id);
-
-   ec = e_pixmap_find_client_by_res_id(child_id);
-   EINA_SAFETY_ON_NULL_RETURN(ec);
-
-   pc = e_pixmap_find_client_by_res_id(parent_id);
-   EINA_SAFETY_ON_NULL_RETURN(pc);
-   EINA_SAFETY_ON_NULL_RETURN(pc->comp_data);
-
-   parent_res = pc->comp_data->surface;
-   _e_shell_surface_parent_set(ec, parent_res);
-   tizen_transient_for_send_done(resource, child_id);
-
-   EC_CHANGED(ec);
-}
-
-static void
-_e_tz_transient_for_cb_unset(struct wl_client *client, struct wl_resource *resource, uint32_t child_id)
-{
-   E_Client *ec;
-
-   DBG("chid_id: %" PRIu32, child_id);
-
-   ec = e_pixmap_find_client_by_res_id(child_id);
-   EINA_SAFETY_ON_NULL_RETURN(ec);
-
-   _e_shell_surface_parent_set(ec, NULL);
-   tizen_transient_for_send_done(resource, child_id);
-
-   EC_CHANGED(ec);
-}
-
 static const struct tizen_surface_extension_interface  _e_tz_surf_ext_interface =
 {
    _e_tz_surf_ext_cb_tz_res_get,
 };
 
-static const struct tizen_transient_for_interface _e_tz_transient_for_interface =
-{
-   _e_tz_transient_for_cb_set,
-   _e_tz_transient_for_cb_unset,
-};
-
 static const struct wl_shell_interface _e_shell_interface =
 {
    _e_shell_cb_shell_surface_get
@@ -1586,7 +1541,6 @@ _e_xdg_shell_cb_bind(struct wl_client *client, void *data, uint32_t version, uin
    wl_resource_set_dispatcher(res, _e_xdg_shell_cb_dispatch, NULL, cdata, NULL);
 }
 
-
 static void
 _e_tz_surf_ext_cb_bind(struct wl_client *client, void *data, uint32_t version, uint32_t id)
 {
@@ -1684,31 +1638,6 @@ _e_tz_surf_cb_bind(struct wl_client *client, void *data, uint32_t version, uint3
    wl_resource_set_implementation(res, &_e_tz_surf_interface, cdata, NULL);
 }
 
-static void
-_e_tz_transient_for_cb_bind(struct wl_client *client, void *data, uint32_t version, uint32_t id)
-{
-   E_Comp_Data *cdata;
-   struct wl_resource *res;
-
-   if (!(cdata = data))
-     {
-        wl_client_post_no_memory(client);
-        return;
-     }
-
-   if (!(res = wl_resource_create(client,
-                                  &tizen_transient_for_interface,
-                                  MIN(version, 1),
-                                  id)))
-     {
-        ERR("Could not create tizen_transient_for resource: %m");
-        wl_client_post_no_memory(client);
-        return;
-     }
-
-   wl_resource_set_implementation(res, &_e_tz_transient_for_interface, cdata, NULL);
-}
-
 EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_Desktop_Shell" };
 
 EAPI void *
@@ -1754,16 +1683,6 @@ e_modapi_init(E_Module *m)
         ERR("Could not create tizen_surface_extension to wayland globals: %m");
         return NULL;
      }
-   /* try to create global tizen transient_for interface */
-   if (!wl_global_create(cdata->wl.disp,
-                         &tizen_transient_for_interface,
-                         1,
-                         cdata,
-                         _e_tz_transient_for_cb_bind))
-     {
-        ERR("Could not create tizen_transient_for to wayland globals: %m");
-        return NULL;
-     }
 
    if (!wl_global_create(cdata->wl.disp,
                          &tizen_surface_interface,

diff --git a/src/modules/wl_desktop_shell/tizen_transient_for.xml b/src/modules/wl_desktop_shell/tizen_transient_for.xml
deleted file mode 100644 (file)
index e18330b..0000000
--- a/src/modules/wl_desktop_shell/tizen_transient_for.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<protocol name="tizen_transient_for">
-   <interface name="tizen_transient_for" version="1">
-      <request name="set">
-         <arg name="child_id" type="uint" />
-         <arg name="parent_id" type="uint" />
-      </request>
-      <request name="unset">
-         <arg name="child_id" type="uint" />
-      </request>
-      <event name="done">
-         <arg name="child_id" type="uint"/>
-      </event>
-   </interface>
-</protocol>

diff --git a/src/modules/wl_desktop_shell/tizen_transient_for_protocol.c b/src/modules/wl_desktop_shell/tizen_transient_for_protocol.c
deleted file mode 100644 (file)
index 5864df8..0000000
--- a/src/modules/wl_desktop_shell/tizen_transient_for_protocol.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <stdlib.h>
-#include <stdint.h>
-#include "wayland-util.h"
-
-
-static const struct wl_interface *types[] = {
-       NULL,
-       NULL,
-};
-
-static const struct wl_message tizen_transient_for_requests[] = {
-       { "set", "uu", types + 0 },
-       { "unset", "u", types + 0 },
-};
-
-static const struct wl_message tizen_transient_for_events[] = {
-       { "done", "u", types + 0 },
-};
-
-WL_EXPORT const struct wl_interface tizen_transient_for_interface = {
-       "tizen_transient_for", 1,
-       2, tizen_transient_for_requests,
-       1, tizen_transient_for_events,
-};
-

diff --git a/src/modules/wl_desktop_shell/tizen_transient_for_server_protocol.h b/src/modules/wl_desktop_shell/tizen_transient_for_server_protocol.h
deleted file mode 100644 (file)
index a1fb174..0000000
--- a/src/modules/wl_desktop_shell/tizen_transient_for_server_protocol.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef TIZEN_TRANSIENT_FOR_SERVER_PROTOCOL_H
-#define TIZEN_TRANSIENT_FOR_SERVER_PROTOCOL_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-server.h"
-
-struct wl_client;
-struct wl_resource;
-
-struct tizen_transient_for;
-
-extern const struct wl_interface tizen_transient_for_interface;
-
-struct tizen_transient_for_interface {
-       /**
-        * set - (none)
-        * @child_id: (none)
-        * @parent_id: (none)
-        */
-       void (*set)(struct wl_client *client,
-                   struct wl_resource *resource,
-                   uint32_t child_id,
-                   uint32_t parent_id);
-       /**
-        * unset - (none)
-        * @child_id: (none)
-        */
-       void (*unset)(struct wl_client *client,
-                     struct wl_resource *resource,
-                     uint32_t child_id);
-};
-
-#define TIZEN_TRANSIENT_FOR_DONE       0
-
-#define TIZEN_TRANSIENT_FOR_DONE_SINCE_VERSION 1
-
-static inline void
-tizen_transient_for_send_done(struct wl_resource *resource_, uint32_t child_id)
-{
-       wl_resource_post_event(resource_, TIZEN_TRANSIENT_FOR_DONE, child_id);
-}
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif