From 807c2bc45bf19059021eb3d94e2c1693a9c940b6 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Fri, 18 May 2018 19:49:26 +0900 Subject: [Local]:4th step for blocking sequence Change-Id: If4f01a177f4947780d448aaa214f863af2124b0f Signed-off-by: Kazumasa Mitsunari --- src/main.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index bd591a4..4954abf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -209,7 +209,8 @@ void windowmanager_requestsurface(afb_req req) noexcept { } } - auto ret = g_afb_instance->app.api_request_surface(a_drawing_name, afb_req_get_application_id(req), 0); + auto ret = g_afb_instance->app.api_request_surface( + afb_req_get_application_id(req), a_drawing_name); if(isFirstReq){ wmClientCtxt* ctxt = new wmClientCtxt(a_drawing_name); @@ -262,7 +263,8 @@ void windowmanager_requestsurfacexdg(afb_req req) noexcept { } char const* a_ivi_id = json_object_get_string(j_ivi_id); - auto ret = g_afb_instance->app.api_request_surface(a_drawing_name, a_ivi_id); + auto ret = g_afb_instance->app.api_request_surface( + afb_req_get_application_id(req), a_drawing_name, a_ivi_id); if (ret != nullptr) { afb_req_fail(req, "failed", ret); return; @@ -298,7 +300,9 @@ void windowmanager_activatesurface(afb_req req) noexcept { return; } - g_afb_instance->app.api_activate_surface(a_drawing_name, a_drawing_area, + g_afb_instance->app.api_activate_surface( + afb_req_get_application_id(req), + a_drawing_name, a_drawing_area, [&req](const char* errmsg){ if (errmsg != nullptr) { HMI_ERROR("wm", errmsg); @@ -332,7 +336,8 @@ void windowmanager_deactivatesurface(afb_req req) noexcept { return; } - g_afb_instance->app.api_deactivate_surface(a_drawing_name, + g_afb_instance->app.api_deactivate_surface( + afb_req_get_application_id(req), a_drawing_name, [&req](const char* errmsg){ if (errmsg != nullptr) { HMI_ERROR("wm", errmsg); @@ -366,7 +371,8 @@ void windowmanager_enddraw(afb_req req) noexcept { } afb_req_success(req, NULL, "success"); - g_afb_instance->app.api_enddraw(a_drawing_name); + g_afb_instance->app.api_enddraw( + afb_req_get_application_id(req), a_drawing_name); } catch (std::exception &e) { HMI_WARNING("wm", "failed", "Uncaught exception while calling enddraw: %s", e.what()); -- cgit 1.2.3-korg