From b3a0b1bac538614b63f272edc0d6c5e57942760e Mon Sep 17 00:00:00 2001 From: "JunSeok, Kim" Date: Mon, 18 Sep 2017 15:49:54 +0900 Subject: [PATCH] tizen_policy: change version of tizen_policy to 7 Changing version of tizen_policy to 7 because of tizen_extension version up. And implements dumy callback function for highter version. Change-Id: I7cd938f25d59b7a94c7a27a879dca894542d011a --- src/video/tizen/indicator/SDL_tizenindicator.c | 2 +- src/video/wayland/SDL_waylandvideo.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/video/tizen/indicator/SDL_tizenindicator.c b/src/video/tizen/indicator/SDL_tizenindicator.c index ccfdaad..02eb11b 100644 --- a/src/video/tizen/indicator/SDL_tizenindicator.c +++ b/src/video/tizen/indicator/SDL_tizenindicator.c @@ -30,7 +30,7 @@ _tizen_set_transient_for (appdata_s *ad, uint32_t child_id, uint32_t parent_id) EINA_INLIST_FOREACH(globals, global) { if (!strcmp(global->interface, "tizen_policy")) - ad->tizen_policy = wl_registry_bind(registry, global->id, &tizen_policy_interface, 1); + ad->tizen_policy = wl_registry_bind(registry, global->id, &tizen_policy_interface, 7); } if (!ad->tizen_policy) return EINA_FALSE; diff --git a/src/video/wayland/SDL_waylandvideo.c b/src/video/wayland/SDL_waylandvideo.c index 1521107..4500a8c 100644 --- a/src/video/wayland/SDL_waylandvideo.c +++ b/src/video/wayland/SDL_waylandvideo.c @@ -507,6 +507,11 @@ _wl_cb_aux_message(void *data , struct tizen_policy *tizen_policy , struct wl_su #endif } +static void +_wl_cb_conformant_region(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) +{ + ; // nothing to do. +} static const struct tizen_policy_listener _tizen_policy_listener = { @@ -519,6 +524,7 @@ static const struct tizen_policy_listener _tizen_policy_listener = _wl_cb_supported_aux_hints, _wl_cb_allowed_aux_hint, _wl_cb_aux_message, + _wl_cb_conformant_region, }; static void @@ -567,8 +573,8 @@ _display_handle_global(void *data, struct wl_registry *registry, uint32_t id, d->data_device_manager = wl_registry_bind(registry, id, &wl_data_device_manager_interface, 1); } else if (!strcmp(interface, "tizen_policy")) { - if (version >= 3) - client_version = 3; + if (version >= 7) + client_version = 7; else client_version = version; -- 2.7.4