remove tizen_surface_extension protocol

Change-Id: I456d49f87eeb5263e6c525977e1dd8550f6aa2ed

diff --git a/src/modules/Makefile_wl_desktop_shell.mk b/src/modules/Makefile_wl_desktop_shell.mk
index c5480a3c58376214284b2c52901a8ef2e0a6728f..cb86915a572941b6315447de3f058c58690fc133 100644 (file)
--- a/src/modules/Makefile_wl_desktop_shell.mk
+++ b/src/modules/Makefile_wl_desktop_shell.mk
@@ -17,9 +17,7 @@ src_modules_wl_desktop_shell_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_wl_desktop_shell_module_la_SOURCES = \
   src/modules/wl_desktop_shell/e_mod_main.c \
   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/e_scaler.h
 
 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 26ddd997e1ac23edfbfb863b4459580612360d73..8a6e03ff896695fa6a92ec16a053c0c57a4f4552 100644 (file)
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -4,7 +4,6 @@
 #include <xdg-shell-server-protocol.h>
 #include <tizen-extension-server-protocol.h>
 #include "e_scaler.h"
-#include "tizen_extension_server_protocol.h"
 
 #define XDG_SERVER_VERSION 4
 
@@ -1385,53 +1384,6 @@ static const struct tizen_resource_interface _e_tz_res_interface =
    _e_tz_res_cb_destroy
 };
 
-static void
-_e_tz_surf_ext_cb_tz_res_get(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *surface)
-{
-   struct wl_resource *res;
-   E_Pixmap *ep;
-   uint32_t res_id;
-
-   /* get the pixmap from this surface so we can find the client */
-   if (!(ep = wl_resource_get_user_data(surface)))
-     {
-        wl_resource_post_error(surface,
-                               WL_DISPLAY_ERROR_INVALID_OBJECT,
-                               "No Pixmap Set On Surface");
-        return;
-     }
-
-   /* make sure it's a wayland pixmap */
-   if (e_pixmap_type_get(ep) != E_PIXMAP_TYPE_WL) return;
-
-   /* find the window id for this pixmap */
-   res_id = e_pixmap_res_id_get(ep);
-
-   DBG("tizen resource id %" PRIu32, res_id);
-
-   /* try to create a tizen_gid */
-   if (!(res = wl_resource_create(client,
-                                  &tizen_resource_interface,
-                                  wl_resource_get_version(resource),
-                                  id)))
-     {
-        wl_resource_post_no_memory(resource);
-        return;
-     }
-
-   wl_resource_set_implementation(res,
-                                  &_e_tz_res_interface,
-                                  ep,
-                                  NULL);
-
-   tizen_resource_send_resource_id(res, res_id);
-}
-
-static const struct tizen_surface_extension_interface  _e_tz_surf_ext_interface =
-{
-   _e_tz_surf_ext_cb_tz_res_get,
-};
-
 static const struct wl_shell_interface _e_shell_interface =
 {
    _e_shell_cb_shell_surface_get
@@ -1541,31 +1493,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)
-{
-   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_surface_extension_interface,
-                                  MIN(version, 1),
-                                  id)))
-     {
-        ERR("Could not create tizen_ext resource: %m");
-        wl_client_post_no_memory(client);
-        return;
-     }
-
-   wl_resource_set_implementation(res, &_e_tz_surf_ext_interface, cdata, NULL);
-}
-
 static void
 _e_tz_surf_cb_tz_res_get(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *surface)
 {
@@ -1673,17 +1600,6 @@ e_modapi_init(E_Module *m)
 
    e_scaler_init();
 
-   /* try to create global tizen surface extention interface */
-   if (!wl_global_create(cdata->wl.disp,
-                         &tizen_surface_extension_interface,
-                         1,
-                         cdata,
-                         _e_tz_surf_ext_cb_bind))
-     {
-        ERR("Could not create tizen_surface_extension to wayland globals: %m");
-        return NULL;
-     }
-
    if (!wl_global_create(cdata->wl.disp,
                          &tizen_surface_interface,
                          1,

diff --git a/src/modules/wl_desktop_shell/tizen_extension.xml b/src/modules/wl_desktop_shell/tizen_extension.xml
deleted file mode 100644 (file)
index 14a8347..0000000
--- a/src/modules/wl_desktop_shell/tizen_extension.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<protocol name="tizen_extension">
-   <interface name="tizen_surface_extension" version="1">
-      <request name="get_tizen_resource">
-         <arg name="id" type="new_id" interface="tizen_resource" />
-         <arg name="surface" type="object" interface="wl_surface" />
-      </request>
-   </interface>
-</protocol>

diff --git a/src/modules/wl_desktop_shell/tizen_extension_protocol.c b/src/modules/wl_desktop_shell/tizen_extension_protocol.c
deleted file mode 100644 (file)
index f9db487..0000000
--- a/src/modules/wl_desktop_shell/tizen_extension_protocol.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <stdlib.h>
-#include <stdint.h>
-#include "wayland-util.h"
-
-extern const struct wl_interface tizen_resource_interface;
-extern const struct wl_interface wl_surface_interface;
-
-static const struct wl_interface *types[] = {
-       &tizen_resource_interface,
-       &wl_surface_interface,
-};
-
-static const struct wl_message tizen_surface_extension_requests[] = {
-       { "get_tizen_resource", "no", types + 0 },
-};
-
-WL_EXPORT const struct wl_interface tizen_surface_extension_interface = {
-       "tizen_surface_extension", 1,
-       1, tizen_surface_extension_requests,
-       0, NULL,
-};
-

diff --git a/src/modules/wl_desktop_shell/tizen_extension_server_protocol.h b/src/modules/wl_desktop_shell/tizen_extension_server_protocol.h
deleted file mode 100644 (file)
index 65ad556..0000000
--- a/src/modules/wl_desktop_shell/tizen_extension_server_protocol.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef TIZEN_EXT_SERVER_PROTOCOL_H
-#define TIZEN_EXT_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_surface_extension;
-
-extern const struct wl_interface tizen_surface_extension_interface;
-
-struct tizen_surface_extension_interface {
-       /**
-        * get_tizen_resource - (none)
-        * @id: (none)
-        * @surface: (none)
-        */
-       void (*get_tizen_resource)(struct wl_client *client,
-                                  struct wl_resource *resource,
-                                  uint32_t id,
-                                  struct wl_resource *surface);
-};
-
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif