From b265a06e160e173f199c98524153fcc20327ad45 Mon Sep 17 00:00:00 2001 From: Duna Oh Date: Tue, 19 May 2015 11:38:00 +0900 Subject: [PATCH] remove 'transient_for' protocol from tizen_surface_extension Signed-off-by: Duna Oh Change-Id: Id992761a72b28cccf7e3bdc0ef9837d2a9fd7a1a --- .../tizen-extension-client-protocol.h | 49 +--------------------- src/lib/ecore_wayland/tizen-extension-protocol.c | 16 +------ 2 files changed, 3 insertions(+), 62 deletions(-) diff --git a/src/lib/ecore_wayland/tizen-extension-client-protocol.h b/src/lib/ecore_wayland/tizen-extension-client-protocol.h index 0a8d130..d84dc40 100644 --- a/src/lib/ecore_wayland/tizen-extension-client-protocol.h +++ b/src/lib/ecore_wayland/tizen-extension-client-protocol.h @@ -14,11 +14,11 @@ struct wl_resource; struct tizen_resource; struct tizen_surface_extension; -struct tizen_transient_for; +struct wl_surface; extern const struct wl_interface tizen_resource_interface; extern const struct wl_interface tizen_surface_extension_interface; -extern const struct wl_interface tizen_transient_for_interface; +extern const struct wl_interface wl_surface_interface; struct tizen_resource_listener { /** @@ -92,51 +92,6 @@ tizen_surface_extension_get_tizen_resource(struct tizen_surface_extension *tizen return (struct tizen_resource *) id; } -struct tizen_transient_for_listener { - /** - * done - (none) - * @child_id: (none) - */ - void (*done)(void *data, - struct tizen_transient_for *tizen_transient_for, - uint32_t child_id); -}; - -static inline int -tizen_transient_for_add_listener(struct tizen_transient_for *tizen_transient_for, - const struct tizen_transient_for_listener *listener, void *data) -{ - return wl_proxy_add_listener((struct wl_proxy *) tizen_transient_for, - (void (**)(void)) listener, data); -} - -#define TIZEN_TRANSIENT_FOR_SET 0 - -static inline void -tizen_transient_for_set_user_data(struct tizen_transient_for *tizen_transient_for, void *user_data) -{ - wl_proxy_set_user_data((struct wl_proxy *) tizen_transient_for, user_data); -} - -static inline void * -tizen_transient_for_get_user_data(struct tizen_transient_for *tizen_transient_for) -{ - return wl_proxy_get_user_data((struct wl_proxy *) tizen_transient_for); -} - -static inline void -tizen_transient_for_destroy(struct tizen_transient_for *tizen_transient_for) -{ - wl_proxy_destroy((struct wl_proxy *) tizen_transient_for); -} - -static inline void -tizen_transient_for_set(struct tizen_transient_for *tizen_transient_for, uint32_t child_id, uint32_t parent_id) -{ - wl_proxy_marshal((struct wl_proxy *) tizen_transient_for, - TIZEN_TRANSIENT_FOR_SET, child_id, parent_id); -} - #ifdef __cplusplus } #endif diff --git a/src/lib/ecore_wayland/tizen-extension-protocol.c b/src/lib/ecore_wayland/tizen-extension-protocol.c index a89d31c..3216ba7 100644 --- a/src/lib/ecore_wayland/tizen-extension-protocol.c +++ b/src/lib/ecore_wayland/tizen-extension-protocol.c @@ -7,7 +7,6 @@ extern const struct wl_interface wl_surface_interface; static const struct wl_interface *types[] = { NULL, - NULL, &tizen_resource_interface, &wl_surface_interface, }; @@ -27,7 +26,7 @@ WL_EXPORT const struct wl_interface tizen_resource_interface = { }; static const struct wl_message tizen_surface_extension_requests[] = { - { "get_tizen_resource", "no", types + 2 }, + { "get_tizen_resource", "no", types + 1 }, }; WL_EXPORT const struct wl_interface tizen_surface_extension_interface = { @@ -36,16 +35,3 @@ WL_EXPORT const struct wl_interface tizen_surface_extension_interface = { 0, NULL, }; -static const struct wl_message tizen_transient_for_requests[] = { - { "set", "uu", 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, - 1, tizen_transient_for_requests, - 1, tizen_transient_for_events, -}; -- 2.7.4