*/
#include <json-c/json.h>
+#include <algorithm>
#include "wm_client.hpp"
#include "hmi-debug.h"
WMClient::WMClient(const string &appid, unsigned layer, unsigned surface, const string &role)
: id(appid), layer(layer),
- role2surface(0)
+ service2surfaces(0)
{
- role2surface[role] = surface;
+ service2surfaces[role] = surface;
for (auto x : kWMEvents)
{
#if GTEST_ENABLED
#else
afb_event ev = afb_daemon_make_event(x.c_str());
#endif
- event2list[x] = ev;
+ evname2afb_event[x] = ev;
}
}
WMClient::WMClient(const string &appid, const string &role)
: id(appid),
layer(0),
- role2surface(0),
- event2list(0)
+ service2surfaces(0),
+ evname2afb_event(0)
{
- role2surface[role] = INVALID_SURFACE_ID;
+ service2surfaces[role] = INVALID_SURFACE_ID;
for (auto x : kWMEvents)
{
#if GTEST_ENABLED
#else
afb_event ev = afb_daemon_make_event(x.c_str());
#endif
- event2list[x] = ev;
+ evname2afb_event[x] = ev;
}
}
-WMClient::~WMClient()
-{
-}
+// WMClient::~WMClient()
+// {
+// }
string WMClient::appID() const
{
return this->id;
}
-unsigned WMClient::surfaceID(const string &role) const
+vector<unsigned> WMClient::renderOrder() const
{
- if (0 == this->role2surface.count(role))
- {
- return INVALID_SURFACE_ID;
- }
- return this->role2surface.at(role);
+ return this->surface_render_order;
}
-std::string WMClient::role(unsigned surface) const
+const vector<std::string>& WMClient::roles() const
{
- for(const auto& x : this->role2surface)
- {
- if(x.second == surface)
- {
- return x.first;
- }
- }
- return std::string("");
+ return this->role_list;
}
unsigned WMClient::layerID() const
return this->layer;
}
+unsigned WMClient::surfaceID() const
+{
+ return this->surface;
+}
+
+const string& WMClient::getWMLayerName()
+{
+ return this->wm_layer_name;
+}
+
+void WMClient::setRole(const string& role)
+{
+ this->role_list.push_back(role);
+}
+
/**
* Set layerID the client belongs to
*
}
/**
- * Add the pair of role and surface to the client
+ * Add the pair of name and surface of surface to the client
*
* This function set the pair of role and surface to the client.
* This function is used for the client which has multi surfaces.
* is changed, this function will be changed
* Current Window Manager doesn't use this function.
*
- * @param string[in] role
+ * @param string[in] name
* @param unsigned[in] surface
* @return true
*/
-bool WMClient::addSurface(const string &role, unsigned surface)
+void WMClient::attachServiceSurface(const string &name, unsigned surface)
{
- HMI_DEBUG("wm", "Add role %s with surface %d", role.c_str(), surface);
- if (0 != this->role2surface.count(role))
+ HMI_DEBUG("wm", "Add surface name %s with surface %d", name.c_str(), surface);
+ if (0 != this->service2surfaces.count(name))
{
- HMI_NOTICE("wm", "override surfaceID %d with %d", this->role2surface[role], surface);
+ HMI_NOTICE("wm", "override surfaceID %d with %d", this->service2surfaces[name], surface);
}
- this->role2surface[role] = surface;
- return true;
+ this->service2surfaces[name] = surface;
}
-bool WMClient::removeSurfaceIfExist(unsigned surface)
+void WMClient::removeServiceSurface(const std::string &name)
{
- bool ret = false;
- for (auto &x : this->role2surface)
+ for (auto &x : this->service2surfaces)
{
- if (surface == x.second)
+ if (name == x.first)
{
- HMI_INFO("wm", "Remove surface from client %s: role %s, surface: %d",
- this->id.c_str(), x.first.c_str(), x.second);
- this->role2surface.erase(x.first);
- ret = true;
- break;
+ HMI_INFO("wm", "Remove surface from client %s: service surface name %s, surface: %d",
+ this->id.c_str(), x.first.c_str(), x.second);
+ this->service2surfaces.erase(name);
}
}
- return ret;
+ // re_asign render order
+ this->setRenderOrder(this->surface_render_order);
+}
+
+void WMClient::setArea(const std::string& area)
+{
+ this->area = area;
+ // TODO: implementation
+}
+
+void WMClient::setRenderOrder()
+{
+ // use private surface_render_order
+}
+
+void WMClient::setRenderOrder(const vector<string> &render_order)
+{
+ // TODO: implement LM
+}
+
+void WMClient::setRenderOrder(const vector<unsigned> &render_order)
+{
+ // TODO implement LM
}
-bool WMClient::removeRole(const string &role)
+bool WMClient::removeSurfaceIfExist(unsigned surface)
{
bool ret = false;
- if (this->role2surface.count(role) != 0)
+ auto fwd_itr = std::remove_if(
+ this->surface_render_order.begin(), this->surface_render_order.end(),
+ [surface, &ret](unsigned x) {
+ ret = true;
+ return x == surface;
+ });
+ this->surface_render_order.erase(fwd_itr, this->surface_render_order.end());
+ if(ret)
{
- this->role2surface.erase(role);
- ret = true;
+ for(auto &y : this->service2surfaces)
+ {
+ if(y.second == surface)
+ {
+ HMI_INFO("wm", "Remove surface from client %s: role %s, surface: %d",
+ this->id.c_str(), y.first.c_str(), y.second);
+ this->service2surfaces.erase(y.first);
+ }
+ }
+ if(this->surface == surface)
+ {
+ this->surface = INVALID_SURFACE_ID;
+ // TODO: If main surface vanishes, how do we treat?
+ // Window Manager doesn't know it's means dead or on purpose.
+ // option1: remove service surface and notify to the service.
+ // option2: waiting the application calls deallocate.
+ HMI_INFO("wm", "Main surface vanishes");
+ }
}
return ret;
}
-#ifndef GTEST_ENABLED
+void WMClient::removeRole(const string &role)
+{
+ auto fwd_itr = std::remove_if(
+ this->role_list.begin(), this->role_list.end(),
+ [&role](string x) {
+ return x == role;
+ });
+ this->role_list.erase(fwd_itr, this->role_list.end());
+}
+
+#if GTEST_ENABLED
bool WMClient::subscribe(afb_req req, const string &evname)
{
if(evname != kKeyError){
HMI_DEBUG("wm", "error is only enabeled for now");
return false;
}
- int ret = afb_req_subscribe(req, this->event2list[evname]);
+ int ret = afb_req_subscribe(req, this->evname2afb_event[evname]);
if (ret)
{
HMI_DEBUG("wm", "Failed to subscribe %s", evname.c_str());
void WMClient::emitError(WM_CLIENT_ERROR_EVENT ev)
{
- if (!afb_event_is_valid(this->event2list[kKeyError])){
+ if (!afb_event_is_valid(this->evname2afb_event[kKeyError])){
HMI_ERROR("wm", "event err is not valid");
return;
}
json_object_object_add(j, kKeyErrorDesc, json_object_new_string(kErrorDescription[ev].c_str()));
HMI_DEBUG("wm", "error: %d, description:%s", ev, kErrorDescription[ev].c_str());
- int ret = afb_event_push(this->event2list[kKeyError], j);
+ int ret = afb_event_push(this->evname2afb_event[kKeyError], j);
if (ret != 0)
{
HMI_DEBUG("wm", "afb_event_push failed: %m");
void WMClient::dumpInfo()
{
- DUMP("APPID : %s", id.c_str());
- DUMP(" LAYER : %d", layer);
- for (const auto &x : this->role2surface)
+ DUMP("APPID : %s", this->id.c_str());
+ DUMP(" LAYER : %d", this->layer);
+ for (const auto &x : this->role_list)
+ {
+ DUMP(" ROLE : %s , SURFACE : %d", x.c_str());
+ }
+ DUMP(" MAIN SURFACE : %d", this->surface);
+ string ro = "";
+ for (const auto &x : this->surface_render_order)
{
- DUMP(" ROLE : %s , SURFACE : %d", x.first.c_str(), x.second);
+ ro += x;
+ ro += " ,";
}
+ DUMP(" RENDER ORDER : %s", ro.c_str());
}
} // namespace wm
\ No newline at end of file
Code Review / apps / agl-service-windowmanager-2017.git / blobdiff