#include <algorithm>
#include <mutex>
#include <json.h>
-#include <json.hpp>
-#include "app.hpp"
-#include "result.hpp"
+#include "../include/json.hpp"
+#include "window_manager.hpp"
#include "json_helper.hpp"
-#include "util.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() : display{new wl::display}, wmgr{this->display.get()} {}
int init();
};
int afb_instance::init()
{
- return this->app.init();
+ return this->wmgr.init();
}
int display_event_callback(sd_event_source *evs, int /*fd*/, uint32_t events,
{
{
STN(display_read_events);
- g_afb_instance->app.display->read_events();
- g_afb_instance->app.set_pending_events();
+ g_afb_instance->wmgr.display->read_events();
+ g_afb_instance->wmgr.set_pending_events();
}
{
// We want do dispatch pending wayland events from within
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;
}
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());
+ auto pSid = g_afb_instance->wmgr.id_alloc.lookup(ctxt->role.c_str());
if (pSid)
{
auto sid = *pSid;
- 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);
+ auto o_state = *g_afb_instance->wmgr.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->wmgr.id_alloc.remove_id(sid);
+ g_afb_instance->wmgr.layers.remove_surface(sid);
+ g_afb_instance->wmgr.controller->sprops.erase(sid);
+ g_afb_instance->wmgr.controller->surfaces.erase(sid);
HMI_DEBUG("wm", "delete surfaceID %d", sid);
}
+ 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)
+ {
+ // 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("wm", "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
{
std::lock_guard<std::mutex> guard(binding_m);
return;
}
- /* Create Security Context */
- bool isFirstReq = checkFirstReq(req);
- if (!isFirstReq)
- {
- 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))
- {
- afb_req_fail_f(req, "failed", "Don't 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;
- }
- }
-
- auto ret = g_afb_instance->app.api_request_surface(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
- {
- HMI_DEBUG("wm", "session already created for %s", a_drawing_name);
- }
-
+ const char *appid = afb_req_get_application_id(req);
+ auto ret = g_afb_instance->wmgr.api_request_surface(
+ appid, a_drawing_name);
if (ret.is_err())
{
afb_req_fail(req, "failed", ret.unwrap_err());
return;
}
+ createSecurityContext(req, appid, a_drawing_name);
+
afb_req_success(req, json_object_new_int(ret.unwrap()), "success");
}
catch (std::exception &e)
return;
}
char const *a_ivi_id = json_object_get_string(j_ivi_id);
+ char const *appid = afb_req_get_application_id(req);
+ 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(a_drawing_name, a_ivi_id);
if (ret != nullptr)
{
afb_req_fail(req, "failed", ret);
return;
}
+ createSecurityContext(req, appid, a_drawing_name);
+
+ afb_req_success(req, NULL, "success");
+ }
+ 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
+ {
+ unsigned pid = 0;
+ char const *appid = afb_req_get_application_id(req);
+ 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", "Need char const* argument role");
+ return;
+ }
+ char const *a_role = json_object_get_string(j_role);
+
+ json_object *j_pid = nullptr;
+ if (json_object_object_get_ex(jreq, "pid", &j_pid))
+ {
+ HMI_DEBUG("wm", "PID is set");
+ char const *a_pid = json_object_get_string(j_pid);
+ pid = std::stol(a_pid);
+ }
+
+ auto ret = g_afb_instance->wmgr.api_set_role(appid, a_role, pid);
+ if (!ret)
+ {
+ afb_req_fail(req, "failed", "Couldn't register");
+ return;
+ }
+
+ createSecurityContext(req, appid, a_role);
+
afb_req_success(req, NULL, "success");
}
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
return;
}
- g_afb_instance->app.api_activate_surface(a_drawing_name, a_drawing_area,
- [&req](const char *errmsg) {
- if (errmsg != nullptr)
- {
- HMI_ERROR("wm", errmsg);
- afb_req_fail(req, "failed", errmsg);
- return;
- }
- afb_req_success(req, NULL, "success");
- });
+ g_afb_instance->wmgr.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);
+ afb_req_fail(req, "failed", errmsg);
+ return;
+ }
+ afb_req_success(req, NULL, "success");
+ });
}
catch (std::exception &e)
{
- HMI_WARNING("wm", "failed", "Uncaught exception while calling activatesurface: %s", e.what());
+ HMI_WARNING("wm", "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
return;
}
- g_afb_instance->app.api_deactivate_surface(a_drawing_name,
- [&req](const char *errmsg) {
- if (errmsg != nullptr)
- {
- HMI_ERROR("wm", errmsg);
- afb_req_fail(req, "failed", errmsg);
- return;
- }
- afb_req_success(req, NULL, "success");
- });
+ g_afb_instance->wmgr.api_deactivate_surface(
+ afb_req_get_application_id(req), a_drawing_name,
+ [&req](const char *errmsg) {
+ if (errmsg != nullptr)
+ {
+ HMI_ERROR("wm", errmsg);
+ afb_req_fail(req, "failed", errmsg);
+ return;
+ }
+ afb_req_success(req, NULL, "success");
+ });
}
catch (std::exception &e)
{
- HMI_WARNING("wm", "Uncaught exception while calling deactivatesurface: %s", e.what());
+ HMI_WARNING("wm", "failed: Uncaught exception while calling deactivatesurface: %s", e.what());
+ g_afb_instance->wmgr.exceptionProcessForTransition();
return;
}
}
}
afb_req_success(req, NULL, "success");
- g_afb_instance->app.api_enddraw(a_drawing_name);
+ g_afb_instance->wmgr.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());
+ HMI_WARNING("wm", "failed: Uncaught exception while calling enddraw: %s", e.what());
+ g_afb_instance->wmgr.exceptionProcessForTransition();
return;
}
}
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());
}
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());
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];
+ const char *event_name = g_afb_instance->wmgr.kListEventName[event_type];
+ struct afb_event event = g_afb_instance->wmgr.map_afb_event[event_name];
int ret = afb_req_subscribe(req, event);
if (ret)
{
try
{
- nlohmann::json j = g_afb_instance->app.id_alloc.name2id;
+ nlohmann::json j = g_afb_instance->wmgr.id_alloc.name2id;
auto ret = wm::Ok(json_tokener_parse(j.dump().c_str()));
if (ret.is_err())
{
try
{
- g_afb_instance->app.api_ping();
+ g_afb_instance->wmgr.api_ping();
afb_req_success(req, NULL, "success");
}
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));
+ to_json(g_afb_instance->wmgr.controller->sprops));
+ json_object_object_add(jr, "layers", to_json(g_afb_instance->wmgr.controller->lprops));
afb_req_success(req, jr, "success");
}
try
{
- auto ret = wm::Ok(json_tokener_parse(g_afb_instance->app.layers.to_json().dump().c_str()));
+ auto ret = wm::Ok(json_tokener_parse(g_afb_instance->wmgr.layers.to_json().dump().c_str()));
afb_req_success(req, ret, "success");
}
try
{
- auto ret = wm::Ok(to_json(g_afb_instance->app.controller->sprops));
+ auto ret = wm::Ok(to_json(g_afb_instance->wmgr.controller->sprops));
if (ret.is_err())
{
afb_req_fail(req, "failed", ret.unwrap_err());
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},
+ {"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},