From 1192dc0f3ddeacb4a73367025f573e6f97c1860c Mon Sep 17 00:00:00 2001 From: "JunSeok, Kim" Date: Mon, 14 Aug 2017 14:41:48 +0900 Subject: [PATCH] e_mod_main: add implementation for version 3 of tizen_gesture The desturctor added to tizen_gesture so add the implementation of server side. Change-Id: I18a71240785863fd69c9b89518d9f7dd4ade97bc --- src/e_mod_main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/e_mod_main.c b/src/e_mod_main.c index a351fc8..c350d77 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -1377,6 +1377,12 @@ _e_gesture_cb_activate_set(struct wl_client *client, tizen_gesture_send_activate_notify(resource, surface, type, active, ret); } +static void +_e_gesture_cb_destroy(struct wl_client *client, struct wl_resource *resource) +{ + wl_resource_destroy(resource); +} + static const struct tizen_gesture_interface _e_gesture_implementation = { _e_gesture_cb_grab_edge_swipe, _e_gesture_cb_ungrab_edge_swipe, @@ -1389,15 +1395,9 @@ static const struct tizen_gesture_interface _e_gesture_implementation = { _e_gesture_cb_select_palm_cover, _e_gesture_cb_deselect_palm_cover, _e_gesture_cb_activate_set, + _e_gesture_cb_destroy, }; -/* tizen_gesture global object destroy function */ -static void -_e_gesture_cb_destory(struct wl_resource *resource) -{ - /* TODO : destroy resources if exist */ -} - /* tizen_gesture global object bind function */ static void _e_gesture_cb_bind(struct wl_client *client, void *data, uint32_t version, uint32_t id) @@ -1405,7 +1405,7 @@ _e_gesture_cb_bind(struct wl_client *client, void *data, uint32_t version, uint3 E_GesturePtr gesture_instance = data; struct wl_resource *resource; - resource = wl_resource_create(client, &tizen_gesture_interface, MAX(version, 1), id); + resource = wl_resource_create(client, &tizen_gesture_interface, MIN(version, 3), id); GTDBG("wl_resource_create(...,tizen_gesture_interface,...)\n"); @@ -1416,7 +1416,7 @@ _e_gesture_cb_bind(struct wl_client *client, void *data, uint32_t version, uint3 return; } - wl_resource_set_implementation(resource, &_e_gesture_implementation, gesture_instance, _e_gesture_cb_destory); + wl_resource_set_implementation(resource, &_e_gesture_implementation, gesture_instance, _e_gesture_cb_destroy); } static Eina_Bool @@ -1635,7 +1635,7 @@ _e_gesture_init(E_Module *m) GTDBG("pan time_start: %lf, moving_range: %d\n", gconfig->conf->pan.time_start, gconfig->conf->pan.moving_range); GTDBG("pinch moving_distance_range: %lf\n", gconfig->conf->pinch.moving_distance_range); - gesture->global = wl_global_create(e_comp_wl->wl.disp, &tizen_gesture_interface, 2, gesture, _e_gesture_cb_bind); + gesture->global = wl_global_create(e_comp_wl->wl.disp, &tizen_gesture_interface, 3, gesture, _e_gesture_cb_bind); if (!gesture->global) { GTERR("Failed to create global !\n"); -- 2.7.4