From: Heeyong Song Date: Mon, 4 Dec 2017 02:53:31 +0000 (+0900) Subject: Revert "[4.0] update tizen_policy version and add functions for tizen_policy_listener" X-Git-Tag: submit/tizen_4.0/20171205.071939~3 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=0a67430e3b2777d64998b50e79e125b34a8f399b Revert "[4.0] update tizen_policy version and add functions for tizen_policy_listener" This reverts commit eb2d361e5ea294a7515ce0ab2afd96fdadc90a68. Change-Id: If2aa6da6cb6d4c85ddd1de4bbfda651752d33dfb --- diff --git a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp index b01f5b0..d4265b4 100644 --- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp +++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp @@ -264,13 +264,7 @@ struct Window::EventHandler if( strcmp( interface, tizen_policy_interface.name ) == 0 ) { - uint32_t client_version = 0; - if (version >= 7) - client_version = 7; - else - client_version = version; - - eventHandler->mTizenPolicy = static_cast< tizen_policy* >( wl_registry_bind( registry, name, &tizen_policy_interface, client_version ) ); + eventHandler->mTizenPolicy = static_cast< tizen_policy* >( wl_registry_bind( registry, name, &tizen_policy_interface, version ) ); if( !eventHandler->mTizenPolicy ) { DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window::EventHandler::RegistryGlobalCallback: wl_registry_bind(tizen_policy_interface) is failed.\n" ); @@ -303,14 +297,6 @@ struct Window::EventHandler eventHandler->mTizenDisplayPolicy = NULL; } - static void TizenPolicyConformant( void *data, struct tizen_policy *tizen_policy,struct wl_surface *surface, uint32_t is_conformant ) - { - } - - static void TizenPolicyConformantArea( void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface, uint32_t conformant_part, uint32_t state, int32_t x, int32_t y, int32_t w, int32_t h ) - { - } - static void TizenPolicyNotificationChangeDone(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, int32_t level, uint32_t state ) { Window::EventHandler* eventHandler = static_cast< Window::EventHandler* >( data ); @@ -322,10 +308,6 @@ struct Window::EventHandler DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window::EventHandler::TizenPolicyNotificationChangeDone: level = %d, state = %d\n", level, state ); } - static void TizenPolicyTransientForDone( void *data, struct tizen_policy *tizen_policy, uint32_t child_id ) - { - } - static void TizenPolicyScreenModeChangeDone(void* data, struct tizen_policy* tizenPolicy, struct wl_surface* surface, uint32_t mode, uint32_t state ) { Window::EventHandler* eventHandler = static_cast< Window::EventHandler* >( data ); @@ -337,26 +319,6 @@ struct Window::EventHandler DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window::EventHandler::TizenPolicyScreenModeChangeDone: mode = %d, state = %d\n", mode, state ); } - static void TizenPolicyIconifyStateChanged( void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, uint32_t iconified, uint32_t force ) - { - } - - static void TizenPolicySupportedAuxHints( void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, struct wl_array *hints, uint32_t num_hints ) - { - } - - static void TizenPolicyAllowedAuxHint( void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, int id ) - { - } - - static void TizenPolicyAuxMessage( void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, const char *key, const char *val, struct wl_array *options ) - { - } - - static void TizenPolicyConformantRegion( void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface, uint32_t conformant_part, uint32_t state, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t serial ) - { - } - static void DisplayPolicyBrightnessChangeDone(void* data, struct tizen_display_policy *displayPolicy, struct wl_surface* surface, int32_t brightness, uint32_t state ) { Window::EventHandler* eventHandler = static_cast< Window::EventHandler* >( data ); @@ -376,16 +338,15 @@ struct Window::EventHandler const struct tizen_policy_listener mTizenPolicyListener = { - TizenPolicyConformant, - TizenPolicyConformantArea, + NULL, + NULL, TizenPolicyNotificationChangeDone, - TizenPolicyTransientForDone, + NULL, TizenPolicyScreenModeChangeDone, - TizenPolicyIconifyStateChanged, - TizenPolicySupportedAuxHints, - TizenPolicyAllowedAuxHint, - TizenPolicyAuxMessage, - TizenPolicyConformantRegion + NULL, + NULL, + NULL, + NULL }; const struct tizen_display_policy_listener mTizenDisplayPolicyListener =