-/*
+/*;
* Copyright (c) 2017 TOYOTA MOTOR CORPORATION
*
* Licensed under the Apache License, Version 2.0 (the "License");
#include <algorithm>
#include <mutex>
#include <json.h>
-#include "../include/json.hpp"
-#include "app.hpp"
+#include <stdlib.h>
+#include <vector>
+#include "util.hpp"
+#include "window_manager.hpp"
#include "json_helper.hpp"
-#include "wayland_ivi_wm.hpp"
extern "C"
{
struct afb_instance
{
- std::unique_ptr<wl::display> display;
- wm::App app;
+ wm::WindowManager wmgr;
- afb_instance() : display{new wl::display}, app{this->display.get()} {}
+ afb_instance() : wmgr() {}
+ ~afb_instance() = default;
int init();
+
+ bool testFlg;
};
struct afb_instance *g_afb_instance;
int afb_instance::init()
{
- return this->app.init();
-}
-
-int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events,
- void * /*data*/)
-{
- ST();
-
- if ((events & EPOLLHUP) != 0)
- {
- HMI_ERROR("wm", "The compositor hung up, dying now.");
- delete g_afb_instance;
- g_afb_instance = nullptr;
- goto error;
- }
-
- if ((events & EPOLLIN) != 0u)
- {
- {
- STN(display_read_events);
- g_afb_instance->app.display->read_events();
- g_afb_instance->app.set_pending_events();
- }
- {
- // We want do dispatch pending wayland events from within
- // the API context
- STN(winman_ping_api_call);
- afb_service_call("windowmanager", "ping", json_object_new_object(),
- [](void *c, int st, json_object *j) {
- STN(winman_ping_api_call_return);
- },
- nullptr);
- }
- }
-
- return 0;
-
-error:
- sd_event_source_unref(evs);
- if (getenv("WINMAN_EXIT_ON_HANGUP") != nullptr)
- {
- exit(1);
- }
- return -1;
+ return this->wmgr.init();
}
int _binding_init()
{
- HMI_NOTICE("wm", "WinMan ver. %s", WINMAN_VERSION_STRING);
+ HMI_NOTICE("WinMan ver. %s", WINMAN_VERSION_STRING);
- if (g_afb_instance != nullptr)
- {
- HMI_ERROR("wm", "Wayland context already initialized?");
- return 0;
- }
-
- if (getenv("XDG_RUNTIME_DIR") == nullptr)
- {
- HMI_ERROR("wm", "Environment variable XDG_RUNTIME_DIR not set");
- goto error;
- }
-
- {
- // wait until wayland compositor starts up.
- int cnt = 0;
- g_afb_instance = new afb_instance;
- while (!g_afb_instance->display->ok())
- {
- cnt++;
- if (20 <= cnt)
- {
- HMI_ERROR("wm", "Could not connect to compositor");
- goto error;
- }
- HMI_ERROR("wm", "Wait to start weston ...");
- sleep(1);
- delete g_afb_instance;
- g_afb_instance = new afb_instance;
- }
- }
+ g_afb_instance = new afb_instance;
if (g_afb_instance->init() == -1)
{
- HMI_ERROR("wm", "Could not connect to compositor");
+ HMI_ERROR("Could not connect to compositor");
goto error;
}
- {
- int ret = sd_event_add_io(afb_daemon_get_event_loop(), nullptr,
- g_afb_instance->display->get_fd(), EPOLLIN,
- display_event_callback, g_afb_instance);
- if (ret < 0)
- {
- HMI_ERROR("wm", "Could not initialize afb_instance event handler: %d", -ret);
- goto error;
- }
- }
+ g_afb_instance->testFlg = false;
atexit([] { delete g_afb_instance; });
}
catch (std::exception &e)
{
- HMI_ERROR("wm", "Uncaught exception in binding_init(): %s", e.what());
+ HMI_ERROR("Uncaught exception in binding_init(): %s", e.what());
}
return -1;
}
-static bool checkFirstReq(afb_req req)
-{
- WMClientCtxt *ctxt = (WMClientCtxt *)afb_req_context_get(req);
- return (ctxt) ? false : true;
-}
-
static void cbRemoveClientCtxt(void *data)
{
WMClientCtxt *ctxt = (WMClientCtxt *)data;
{
return;
}
- HMI_DEBUG("wm", "remove app %s", ctxt->name.c_str());
- // Lookup surfaceID and remove it because App is dead.
- auto pSid = g_afb_instance->app.id_alloc.lookup(ctxt->role.c_str());
- if (pSid)
+ HMI_DEBUG("remove app %s", ctxt->name.c_str());
+
+ // Policy Manager does not know this app was killed,
+ // so notify it by deactivate request.
+ g_afb_instance->wmgr.api_deactivate_window(
+ ctxt->name.c_str(), ctxt->role.c_str(),
+ [](const char *) {});
+
+ g_afb_instance->wmgr.removeClient(ctxt->name);
+ delete ctxt;
+}
+
+static void createSecurityContext(afb_req req, const char* appid, const char* role)
+{
+ WMClientCtxt *ctxt = (WMClientCtxt *)afb_req_context_get(req);
+ if (!ctxt)
{
- auto sid = *pSid;
- auto o_state = *g_afb_instance->app.layers.get_layout_state(sid);
- if (o_state != nullptr)
- {
- if (o_state->main == sid)
- {
- o_state->main = -1;
- }
- else if (o_state->sub == sid)
- {
- o_state->sub = -1;
- }
- }
- g_afb_instance->app.id_alloc.remove_id(sid);
- g_afb_instance->app.layers.remove_surface(sid);
- g_afb_instance->app.controller->sprops.erase(sid);
- g_afb_instance->app.controller->surfaces.erase(sid);
- HMI_DEBUG("wm", "delete surfaceID %d", sid);
+ // Create Security Context at first time
+ const char *new_role = g_afb_instance->wmgr.convertRoleOldToNew(role);
+ WMClientCtxt *ctxt = new WMClientCtxt(appid, new_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);
}
- g_afb_instance->app.removeClient(ctxt->name);
- delete ctxt;
}
void windowmanager_requestsurface(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
return;
}
- /* Create Security Context */
- bool isFirstReq = checkFirstReq(req);
- if (!isFirstReq)
+ char *appid = afb_req_get_application_id(req);
+ if(appid)
{
- WMClientCtxt *ctxt = (WMClientCtxt *)afb_req_context_get(req);
- HMI_DEBUG("wm", "You're %s.", ctxt->name.c_str());
- if (ctxt->name != std::string(a_drawing_name))
+ auto ret = g_afb_instance->wmgr.api_request_surface(
+ appid, a_drawing_name);
+ if (ret.is_err())
{
- afb_req_fail_f(req, "failed", "Dont request with other name: %s for now", a_drawing_name);
- HMI_DEBUG("wm", "Don't request with other name: %s for now", a_drawing_name);
- return;
+ afb_req_fail(req, "failed", ret.unwrap_err());
}
- }
-
- auto ret = g_afb_instance->app.api_request_surface(
- afb_req_get_application_id(req), a_drawing_name);
-
- if (isFirstReq)
- {
- WMClientCtxt *ctxt = new WMClientCtxt(afb_req_get_application_id(req), a_drawing_name);
- HMI_DEBUG("wm", "create session for %s", ctxt->name.c_str());
- afb_req_session_set_LOA(req, 1);
- afb_req_context_set(req, ctxt, cbRemoveClientCtxt);
+ else
+ {
+ createSecurityContext(req, appid, a_drawing_name);
+ afb_req_success(req, json_object_new_int(ret.unwrap()), "success");
+ }
+ free(appid);
}
else
{
- HMI_DEBUG("wm", "session already created for %s", a_drawing_name);
+ afb_req_fail(req, "failed", nullptr);
}
-
- if (ret.is_err())
- {
- afb_req_fail(req, "failed", ret.unwrap_err());
- return;
- }
-
- afb_req_success(req, json_object_new_int(ret.unwrap()), "success");
}
catch (std::exception &e)
{
void windowmanager_requestsurfacexdg(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
return;
}
char const *a_ivi_id = json_object_get_string(j_ivi_id);
+ char *appid = afb_req_get_application_id(req);
+ if(appid)
+ {
+ auto ret = g_afb_instance->wmgr.api_request_surface(
+ appid, 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)
+ if (ret != nullptr)
+ {
+ afb_req_fail(req, "failed", ret);
+ }
+ else
+ {
+ createSecurityContext(req, appid, a_drawing_name);
+ afb_req_success(req, NULL, "success");
+ }
+ free(appid);
+ }
+ }
+ catch (std::exception &e)
+ {
+ afb_req_fail_f(req, "failed", "Uncaught exception while calling requestsurfacexdg: %s", e.what());
+ return;
+ }
+}
+
+void windowmanager_setrole(afb_req 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;
+ }
+ try
+ {
+ json_object *jreq = afb_req_json(req);
+
+ json_object *j_role = nullptr;
+ if (!json_object_object_get_ex(jreq, "role", &j_role))
{
- afb_req_fail(req, "failed", ret);
+ afb_req_fail(req, "failed", "Need char const* argument role");
return;
}
+ char const *a_role = json_object_get_string(j_role);
+ char *appid = afb_req_get_application_id(req);
- afb_req_success(req, NULL, "success");
+ if(appid)
+ {
+ auto ret = g_afb_instance->wmgr.api_set_role(appid, a_role);
+ if (!ret)
+ {
+ afb_req_fail(req, "failed", "Couldn't register");
+ }
+ else
+ {
+ createSecurityContext(req, appid, a_role);
+ afb_req_success(req, NULL, "success");
+ }
+ free(appid);
+ }
}
catch (std::exception &e)
{
}
}
-void windowmanager_activatesurface(afb_req req) noexcept
+void windowmanager_activatewindow(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
return;
}
- g_afb_instance->app.api_activate_surface(
- afb_req_get_application_id(req),
- a_drawing_name, a_drawing_area,
- [&req](const char *errmsg) {
+ char* appid = afb_req_get_application_id(req);
+ if(appid)
+ {
+ auto reply = [&req](const char *errmsg) {
if (errmsg != nullptr)
{
- HMI_ERROR("wm", errmsg);
+ HMI_ERROR(errmsg);
afb_req_fail(req, "failed", errmsg);
return;
}
afb_req_success(req, NULL, "success");
- });
+ };
+
+ HMI_DEBUG("activateWindow role:%s area:%s", appid, a_drawing_area);
+
+#if 0
+ std::string appidString = appid;
+ HMI_DEBUG("flg: %d", g_afb_instance->testFlg);
+ if ((appidString == "dashboard" && g_afb_instance->testFlg) || appidString == "hudspeed")
+ {
+ HMI_DEBUG("%s is remote transfer", appid);
+ g_afb_instance->wmgr.api_activate_surface_to_master(
+ appid, a_drawing_name, "hud.upper.left", reply);
+
+ g_afb_instance->testFlg = false;
+ return;
+ }
+
+#endif
+ if (!g_afb_instance->wmgr.wmcon.isRemoteArea(a_drawing_area))
+ {
+ g_afb_instance->wmgr.api_activate_window(
+ appid, a_drawing_name, a_drawing_area, reply);
+ }
+ else
+ {
+ std::string ecu_name;
+ ecu_name = g_afb_instance->wmgr.wmcon.getAreaToEcuName(a_drawing_area);
+
+ // TODO: temporarily
+ if (!g_afb_instance->wmgr.wmcon.isConnectionMode())
+ {
+ HMI_ERROR("WM Standalone Mode");
+ afb_req_fail(req, "failed", "Standalone Mode");
+ }
+ else
+ {
+ // If Window Manager is slave and this request is for master,
+ // request activateWindow to master
+ g_afb_instance->wmgr.api_activate_surface_to_master(
+ appid, a_drawing_name, a_drawing_area, reply);
+ }
+ }
+#if 0
+ if (appidString == "dashboard")
+ {
+ g_afb_instance->testFlg = true;
+ }
+#endif
+ free(appid);
+ }
}
catch (std::exception &e)
{
- HMI_WARNING("wm", "failed: Uncaught exception while calling activatesurface: %s", e.what());
- g_afb_instance->app.exceptionProcessForTransition();
+ HMI_WARNING("failed: Uncaught exception while calling activatesurface: %s", e.what());
+ g_afb_instance->wmgr.exceptionProcessForTransition();
return;
}
}
-void windowmanager_deactivatesurface(afb_req req) noexcept
+void windowmanager_deactivatewindow(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
return;
}
- g_afb_instance->app.api_deactivate_surface(
- afb_req_get_application_id(req), a_drawing_name,
- [&req](const char *errmsg) {
+ char* appid = afb_req_get_application_id(req);
+ if(appid)
+ {
+ auto reply = [&req](const char *errmsg) {
if (errmsg != nullptr)
{
- HMI_ERROR("wm", errmsg);
+ HMI_ERROR(errmsg);
afb_req_fail(req, "failed", errmsg);
return;
}
afb_req_success(req, NULL, "success");
- });
+ };
+
+ // TODO: Check whether role is tbtnavi to request remote invisible
+ if (g_afb_instance->wmgr.wmcon.getAppIdToEcuName(appid) == "" ||
+ ("tbtnavi" != std::string(a_drawing_name)))
+ {
+ g_afb_instance->wmgr.api_deactivate_window(
+ appid, a_drawing_name, reply);
+ }
+ else
+ {
+ // If Window Manager is slave and this request is for master,
+ // request deactivateWindow to master
+ g_afb_instance->wmgr.api_deactivate_surface_to_master(
+ appid, a_drawing_name, reply);
+ }
+ free(appid);
+ }
}
catch (std::exception &e)
{
- HMI_WARNING("wm", "failed: Uncaught exception while calling deactivatesurface: %s", e.what());
- g_afb_instance->app.exceptionProcessForTransition();
+ HMI_WARNING("failed: Uncaught exception while calling deactivatesurface: %s", e.what());
+ g_afb_instance->wmgr.exceptionProcessForTransition();
return;
}
}
void windowmanager_enddraw(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
}
afb_req_success(req, NULL, "success");
- g_afb_instance->app.api_enddraw(
- afb_req_get_application_id(req), a_drawing_name);
+ char* appid = afb_req_get_application_id(req);
+
+ if(appid)
+ {
+ if (!g_afb_instance->wmgr.wmcon.isRemoteEcu(appid) ||
+ !g_afb_instance->wmgr.wmcon.isSyncDrawingForRemote(appid))
+ {
+ g_afb_instance->wmgr.api_enddraw(appid, a_drawing_name);
+ }
+ else
+ {
+ // If Window Manager is slave and requesting app is syncDrawing,
+ // request endDraw to master
+ g_afb_instance->wmgr.api_enddraw_for_remote(appid, a_drawing_name);
+ }
+ free(appid);
+ }
}
catch (std::exception &e)
{
- HMI_WARNING("wm", "failed: Uncaught exception while calling enddraw: %s", e.what());
- g_afb_instance->app.exceptionProcessForTransition();
+ HMI_WARNING("failed: Uncaught exception while calling enddraw: %s", e.what());
+ g_afb_instance->wmgr.exceptionProcessForTransition();
return;
}
}
void windowmanager_getdisplayinfo_thunk(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
try
{
- auto ret = g_afb_instance->app.api_get_display_info();
+ auto ret = g_afb_instance->wmgr.api_get_display_info();
if (ret.is_err())
{
afb_req_fail(req, "failed", ret.unwrap_err());
void windowmanager_getareainfo_thunk(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
}
char const *a_drawing_name = json_object_get_string(j_drawing_name);
- auto ret = g_afb_instance->app.api_get_area_info(a_drawing_name);
+ auto ret = g_afb_instance->wmgr.api_get_area_info(a_drawing_name);
if (ret.is_err())
{
afb_req_fail(req, "failed", ret.unwrap_err());
}
}
-void windowmanager_wm_subscribe(afb_req req) noexcept
+void windowmanager_getcarinfo_thunk(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
try
{
json_object *jreq = afb_req_json(req);
- json_object *j = nullptr;
- if (!json_object_object_get_ex(jreq, "event", &j))
+
+ json_object *j_label = nullptr;
+ if (! json_object_object_get_ex(jreq, "label", &j_label))
{
- afb_req_fail(req, "failed", "Need char const* argument event");
+ afb_req_fail(req, "failed", "Need char const* argument label");
return;
}
- int event_type = json_object_get_int(j);
- const char *event_name = g_afb_instance->app.kListEventName[event_type];
- struct afb_event event = g_afb_instance->app.map_afb_event[event_name];
- int ret = afb_req_subscribe(req, event);
- if (ret)
+ char const* a_label = json_object_get_string(j_label);
+
+ auto ret = g_afb_instance->wmgr.api_get_car_info(a_label);
+ if (ret.is_err())
{
- afb_req_fail(req, "failed", "Error: afb_req_subscribe()");
+ afb_req_fail(req, "failed", ret.unwrap_err());
return;
}
- afb_req_success(req, NULL, "success");
+
+ afb_req_success(req, ret.unwrap(), "success");
}
catch (std::exception &e)
{
- afb_req_fail_f(req, "failed", "Uncaught exception while calling wm_subscribe: %s", e.what());
+ afb_req_fail_f(req, "failed", "Uncaught exception while calling getcarinfo: %s", e.what());
return;
}
}
-void windowmanager_list_drawing_names(afb_req req) noexcept
+void windowmanager_set_render_order(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
return;
}
- try
+ char* appid = afb_req_get_application_id(req);
+ if(appid)
{
-
- nlohmann::json j = g_afb_instance->app.id_alloc.name2id;
- auto ret = wm::Ok(json_tokener_parse(j.dump().c_str()));
- if (ret.is_err())
+ json_object *jreq = afb_req_json(req);
+ json_object *j_ro; // Do not free this. binder frees jreq, then free j_ro
+ if (json_object_object_get_ex(jreq, "render_order", &j_ro))
{
- afb_req_fail(req, "failed", ret.unwrap_err());
- return;
- }
+ int size = json_object_array_length(j_ro);
+ std::vector<std::string> ro(size);
+ for(int i = 0; i < size; i++)
+ {
+ ro[i] = json_object_get_string(json_object_array_get_idx(j_ro, i));
+ }
- afb_req_success(req, ret.unwrap(), "success");
+ auto ret = g_afb_instance->wmgr.api_client_set_render_order(appid, ro);
+ if (!ret)
+ {
+ afb_req_fail(req, "failed", nullptr);
+ }
+ else
+ {
+ afb_req_success(req, nullptr, nullptr);
+ }
+ }
+ free(appid);
}
- catch (std::exception &e)
+ else
{
- afb_req_fail_f(req, "failed", "Uncaught exception while calling list_drawing_names: %s", e.what());
- return;
+ afb_req_fail(req, "failed", nullptr);
}
}
-void windowmanager_ping(afb_req req) noexcept
+void windowmanager_attach_app(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
return;
}
- try
+ char* appid = afb_req_get_application_id(req);
+ if(appid)
{
+ json_object *jreq = afb_req_json(req);
+ json_object *j_dest, *j_id; // Do not free this. binder frees jreq, then free j_ro
+ if (json_object_object_get_ex(jreq, "destination", &j_dest) &&
+ json_object_object_get_ex(jreq, "service_surface", &j_id))
+ {
+ const char* dest_app = json_object_get_string(j_dest);
+ const char* service = json_object_get_string(j_id);
- g_afb_instance->app.api_ping();
-
- afb_req_success(req, NULL, "success");
+ std::string uuid = g_afb_instance->wmgr.api_client_attach_service_surface(appid, dest_app, service);
+ if (uuid.empty())
+ {
+ afb_req_fail(req, "failed", nullptr);
+ }
+ else
+ {
+ json_object *resp = json_object_new_object();
+ json_object_object_add(resp, "uuid", json_object_new_string(uuid.c_str()));
+ afb_req_success(req, resp, nullptr);
+ }
+ }
+ free(appid);
}
- catch (std::exception &e)
+ else
{
- afb_req_fail_f(req, "failed", "Uncaught exception while calling ping: %s", e.what());
- return;
+ afb_req_fail(req, "failed", nullptr);
}
}
-void windowmanager_debug_status(afb_req req) noexcept
+void windowmanager_get_area_list(afb_req 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 req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
return;
}
- try
+ char* appid = afb_req_get_application_id(req);
+ if(appid)
{
-
- json_object *jr = json_object_new_object();
- json_object_object_add(jr, "surfaces",
- to_json(g_afb_instance->app.controller->sprops));
- json_object_object_add(jr, "layers", to_json(g_afb_instance->app.controller->lprops));
-
- afb_req_success(req, jr, "success");
+ 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);
}
- catch (std::exception &e)
+ else
{
- afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_status: %s", e.what());
- return;
+ afb_req_fail(req, "failed", nullptr);
}
}
-void windowmanager_debug_layers(afb_req req) noexcept
+void windowmanager_wm_subscribe(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
try
{
- auto ret = wm::Ok(json_tokener_parse(g_afb_instance->app.layers.to_json().dump().c_str()));
+ json_object *jreq = afb_req_json(req);
+ json_object *j = nullptr;
+ if (!json_object_object_get_ex(jreq, "event", &j))
+ {
+ 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);
+
+ if (ret)
+ {
+ afb_req_fail(req, "failed", "Error: afb_req_subscribe()");
+ return;
+ }
+ afb_req_success(req, NULL, "success");
- afb_req_success(req, ret, "success");
+ if (event_id == 7)
+ {
+ //g_afb_instance->wmgr.api_handshake();
+ g_afb_instance->wmgr.setSubscribed(true);
+ }
}
catch (std::exception &e)
{
- afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_layers: %s", e.what());
+ afb_req_fail_f(req, "failed", "Uncaught exception while calling wm_subscribe: %s", e.what());
return;
}
}
-void windowmanager_debug_surfaces(afb_req req) noexcept
+void windowmanager_connect(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
+
+ HMI_DEBUG("WM - HS Connect");
+
if (g_afb_instance == nullptr)
{
- afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
+ afb_req_fail(req, "Failed", "Not Start WindowManager");
return;
}
-
- try
+ else
{
+ afb_req_success(req, NULL, "success");
+ }
+}
- auto ret = wm::Ok(to_json(g_afb_instance->app.controller->sprops));
- if (ret.is_err())
- {
- afb_req_fail(req, "failed", ret.unwrap_err());
- return;
- }
+void windowmanager_ping(afb_req req) noexcept
+{
+ std::lock_guard<std::mutex> guard(binding_m);
- afb_req_success(req, ret.unwrap(), "success");
- }
- catch (std::exception &e)
+ if (g_afb_instance == nullptr)
{
- afb_req_fail_f(req, "failed", "Uncaught exception while calling debug_surfaces: %s", e.what());
+ afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
return;
}
+ else
+ {
+ afb_req_success(req, NULL, "success");
+ }
}
void windowmanager_debug_terminate(afb_req req) noexcept
{
std::lock_guard<std::mutex> guard(binding_m);
-#ifdef ST
- ST();
-#endif
if (g_afb_instance == nullptr)
{
afb_req_fail(req, "failed", "Binding not initialized, did the compositor die?");
}
}
+void on_event(const char *event, struct json_object *object)
+{
+ g_afb_instance->wmgr.analyzeReceivedEvent(event, object);
+}
+
const struct afb_verb_v2 windowmanager_verbs[] = {
- {"requestsurface", windowmanager_requestsurface, nullptr, nullptr, AFB_SESSION_NONE},
- {"requestsurfacexdg", windowmanager_requestsurfacexdg, nullptr, nullptr, AFB_SESSION_NONE},
- {"activatesurface", windowmanager_activatesurface, nullptr, nullptr, AFB_SESSION_NONE},
- {"deactivatesurface", windowmanager_deactivatesurface, 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},
+ {"requestSurface", windowmanager_requestsurface, nullptr, nullptr, AFB_SESSION_NONE},
+ {"requestSurfaceXdg", windowmanager_requestsurfacexdg, nullptr, nullptr, AFB_SESSION_NONE},
+ {"setRole", windowmanager_setrole, 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},
+ {"getCarInfo", windowmanager_getcarinfo_thunk, nullptr, nullptr, AFB_SESSION_NONE },
+ {"setRenderOrder", windowmanager_set_render_order, nullptr, nullptr, AFB_SESSION_NONE},
+ {"changeAreaSize", windowmanager_change_area_size, nullptr, nullptr, AFB_SESSION_NONE},
+ {"getAreaList", windowmanager_get_area_list, nullptr, nullptr, AFB_SESSION_NONE},
+ {"attachApp", windowmanager_attach_app, nullptr, nullptr, AFB_SESSION_NONE},
{"wm_subscribe", windowmanager_wm_subscribe, nullptr, nullptr, AFB_SESSION_NONE},
- {"list_drawing_names", windowmanager_list_drawing_names, nullptr, nullptr, AFB_SESSION_NONE},
+ {"wm_connect", windowmanager_connect, nullptr, nullptr, AFB_SESSION_NONE},
{"ping", windowmanager_ping, nullptr, nullptr, AFB_SESSION_NONE},
- {"debug_status", windowmanager_debug_status, nullptr, nullptr, AFB_SESSION_NONE},
- {"debug_layers", windowmanager_debug_layers, nullptr, nullptr, AFB_SESSION_NONE},
- {"debug_surfaces", windowmanager_debug_surfaces, 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};
+ "windowmanager", nullptr, nullptr, windowmanager_verbs, nullptr, binding_init, on_event, 0};
Code Review / apps / agl-service-windowmanager.git / blobdiff