return this->wmgr.init();
}
-int _binding_init()
+static int _binding_init()
{
HMI_NOTICE("WinMan ver. %s", WINMAN_VERSION_STRING);
return -1;
}
-int binding_init() noexcept
+static int binding_init (afb_api_t api) noexcept
{
try
{
// Policy Manager does not know this app was killed,
// so notify it by deactivate request.
- g_afb_instance->wmgr.api_deactivate_surface(
+ g_afb_instance->wmgr.api_deactivate_window(
ctxt->name.c_str(), ctxt->role.c_str(),
[](const char *) {});
delete ctxt;
}
-static void createSecurityContext(afb_req req, const char* appid, const char* role)
+static void createSecurityContext(afb_req_t req, const char* appid, const char* role)
{
WMClientCtxt *ctxt = (WMClientCtxt *)afb_req_context_get(req);
if (!ctxt)
{
// Create Security Context at first time
- const char *new_role = g_afb_instance->wmgr.convertRoleOldToNew(role);
- WMClientCtxt *ctxt = new WMClientCtxt(appid, new_role);
+ WMClientCtxt *ctxt = new WMClientCtxt(appid, role);
HMI_DEBUG("create session for %s", ctxt->name.c_str());
afb_req_session_set_LOA(req, 1);
afb_req_context_set(req, ctxt, cbRemoveClientCtxt);
}
}
-void windowmanager_requestsurface(afb_req req) noexcept
+void windowmanager_requestsurface(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
}
}
-void windowmanager_requestsurfacexdg(afb_req req) noexcept
+void windowmanager_requestsurfacexdg(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
}
}
-void windowmanager_activatewindow(afb_req req) noexcept
+void windowmanager_activatewindow(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
char* appid = afb_req_get_application_id(req);
if(appid)
{
- g_afb_instance->wmgr.api_activate_surface(
+ g_afb_instance->wmgr.api_activate_window(
appid, a_drawing_name, a_drawing_area,
[&req](const char *errmsg) {
if (errmsg != nullptr)
}
}
-void windowmanager_deactivatewindow(afb_req req) noexcept
+void windowmanager_deactivatewindow(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
char* appid = afb_req_get_application_id(req);
if(appid)
{
- g_afb_instance->wmgr.api_deactivate_surface(
+ g_afb_instance->wmgr.api_deactivate_window(
appid, a_drawing_name,
[&req](const char *errmsg) {
if (errmsg != nullptr)
}
}
-void windowmanager_enddraw(afb_req req) noexcept
+void windowmanager_enddraw(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
}
}
-void windowmanager_getdisplayinfo_thunk(afb_req req) noexcept
+void windowmanager_getdisplayinfo_thunk(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
}
}
-void windowmanager_getareainfo_thunk(afb_req req) noexcept
+void windowmanager_getareainfo_thunk(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
}
}
-void windowmanager_wm_subscribe(afb_req req) noexcept
+void windowmanager_get_area_list(afb_req_t req) noexcept
+{
+ std::lock_guard<std::mutex> guard(binding_m);
+ json_object* ret = g_afb_instance->wmgr.api_get_area_list();
+ afb_req_success(req, ret, nullptr);
+}
+
+void windowmanager_change_area_size(afb_req_t req) noexcept
+{
+ std::lock_guard<std::mutex> guard(binding_m);
+ if (g_afb_instance == nullptr)
+ {
+ afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+ return;
+ }
+
+ char* appid = afb_req_get_application_id(req);
+ if(appid)
+ {
+ ChangeAreaReq change_req;
+ change_req.appname = appid;
+ change_req.save = false;
+ json_object *jreq = afb_req_json(req);
+ json_object *jsave, *jareas;
+ HMI_INFO("json_check, %s", json_object_get_string(jreq));
+ if(json_object_object_get_ex(jreq, "save", &jsave))
+ {
+ change_req.save = json_object_get_boolean(jsave);
+ }
+ if (json_object_object_get_ex(jreq, "areas", &jareas))
+ {
+ int size = json_object_array_length(jareas);
+ for(int i = 0; i < size; i++)
+ {
+ json_object* elem = json_object_array_get_idx(jareas, i);
+ struct rect rect;
+ std::string name = jh::getStringFromJson(elem, "name");
+ json_object* jrect;
+ if(json_object_object_get_ex(elem, "rect", &jrect))
+ {
+ rect.x = jh::getIntFromJson(jrect, "x");
+ rect.y = jh::getIntFromJson(jrect, "y");
+ rect.w = jh::getIntFromJson(jrect, "w");
+ rect.h = jh::getIntFromJson(jrect, "h");
+ }
+ else
+ {
+ HMI_ERROR("bad request @area name :%s", name.c_str());
+ afb_req_fail(req, "failed", "bad request");
+ return;
+ }
+ change_req.area_req[name] = rect;
+ }
+ if(change_req.area_req.size() != 0)
+ {
+ g_afb_instance->wmgr.api_change_area_size(change_req);
+ }
+ afb_req_success(req, nullptr, nullptr);
+ }
+ free(appid);
+ }
+ else
+ {
+ afb_req_fail(req, "failed", nullptr);
+ }
+}
+
+void windowmanager_wm_subscribe(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
afb_req_fail(req, "failed", "Need char const* argument event");
return;
}
- int event_id = json_object_get_int(j);
- int ret = g_afb_instance->wmgr.api_subscribe(req, event_id);
+ wm::WindowManager::EventType event_id = (wm::WindowManager::EventType)json_object_get_int(j);
+ bool ret = g_afb_instance->wmgr.api_subscribe(req, event_id);
- if (ret)
+ if (!ret)
{
afb_req_fail(req, "failed", "Error: afb_req_subscribe()");
return;
}
}
-void windowmanager_ping(afb_req req) noexcept
+void windowmanager_ping(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
}
}
-void windowmanager_debug_terminate(afb_req req) noexcept
+void windowmanager_debug_terminate(afb_req_t req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
if (g_afb_instance == nullptr)
}
}
-const struct afb_verb_v2 windowmanager_verbs[] = {
- {"requestSurface", windowmanager_requestsurface, nullptr, nullptr, AFB_SESSION_NONE},
- {"requestSurfaceXDG", windowmanager_requestsurfacexdg, nullptr, nullptr, AFB_SESSION_NONE},
- {"activateWindow", windowmanager_activatewindow, nullptr, nullptr, AFB_SESSION_NONE},
- {"deactivateWindow", windowmanager_deactivatewindow, nullptr, nullptr, AFB_SESSION_NONE},
- {"endDraw", windowmanager_enddraw, nullptr, nullptr, AFB_SESSION_NONE},
- {"getDisplayInfo", windowmanager_getdisplayinfo_thunk, nullptr, nullptr, AFB_SESSION_NONE},
- {"getAreaInfo", windowmanager_getareainfo_thunk, nullptr, nullptr, AFB_SESSION_NONE},
- {"wm_subscribe", windowmanager_wm_subscribe, nullptr, nullptr, AFB_SESSION_NONE},
- {"ping", windowmanager_ping, nullptr, nullptr, AFB_SESSION_NONE},
- {"debug_terminate", windowmanager_debug_terminate, nullptr, nullptr, AFB_SESSION_NONE},
- {}};
-
-extern "C" const struct afb_binding_v2 afbBindingV2 = {
- "windowmanager", nullptr, nullptr, windowmanager_verbs, nullptr, binding_init, nullptr, 0};
+const afb_verb_t windowmanager_verbs[] = {
+ { .verb = "requestSurface", .callback = windowmanager_requestsurface },
+ { .verb = "requestSurfaceXDG", .callback = windowmanager_requestsurfacexdg },
+ { .verb = "activateWindow", .callback = windowmanager_activatewindow },
+ { .verb = "deactivateWindow", .callback = windowmanager_deactivatewindow },
+ { .verb = "endDraw", .callback = windowmanager_enddraw },
+ { .verb = "getDisplayInfo", .callback = windowmanager_getdisplayinfo_thunk },
+ { .verb = "getAreaInfo", .callback = windowmanager_getareainfo_thunk },
+ { .verb = "changeAreaSize", .callback = windowmanager_change_area_size },
+ { .verb = "getAreaList", .callback = windowmanager_get_area_list },
+ { .verb = "wm_subscribe", .callback = windowmanager_wm_subscribe },
+ { .verb = "ping", .callback = windowmanager_ping },
+ { .verb = "debug_terminate", .callback = windowmanager_debug_terminate },
+ {} };
+
+extern "C" const afb_binding_t afbBindingExport = {
+ .api = "windowmanager",
+ .specification = "windowmanager",
+ .info = "windowmanager",
+ .verbs = windowmanager_verbs,
+ .preinit = nullptr,
+ .init = binding_init,
+ .onevent = nullptr,
+ .userdata = nullptr,
+ .provide_class = nullptr,
+ .require_class = nullptr,
+ .require_api = nullptr,
+ .noconcurrency = 0
+};
Code Review / apps / agl-service-windowmanager.git / blobdiff