From 58561703d4053dfd454fe564b59215ce025c4a12 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Fri, 31 Aug 2018 11:42:33 +0900 Subject: Update wm_layer * Set Area when layoutChange * Implement hasRole Change-Id: I684f3bce700d0bb6f4d4a6ef1a3e5242856c192b Signed-off-by: Kazumasa Mitsunari --- src/wm_layer.cpp | 55 ++- src/wm_layer.hpp | 10 +- src/wm_layer_control.cpp | 1185 +++++++++++++++++++++++----------------------- src/wm_layer_control.hpp | 3 +- 4 files changed, 653 insertions(+), 600 deletions(-) diff --git a/src/wm_layer.cpp b/src/wm_layer.cpp index f02a5b6..d74418a 100644 --- a/src/wm_layer.cpp +++ b/src/wm_layer.cpp @@ -41,7 +41,7 @@ void LayerState::attachIdToArea(const string& area, const WMClient& client) this->render_order.push_back(client.layerID()); } -const unordered_map LayerState::popCurrentState() +const unordered_map LayerState::popCurrentState() { unordered_map tmp = this->area2appid; this->area2appid.clear(); @@ -49,7 +49,7 @@ const unordered_map LayerState::popCurrentState() return tmp; } -const unordered_map LayerState::getCurrentState() +const unordered_map LayerState::getCurrentState() { return this->area2appid; } @@ -59,6 +59,27 @@ const vector LayerState::getIviIdList() return this->render_order; } +void LayerState::addLayer(unsigned layer) +{ + this->render_order.push_back(layer); +} + +void LayerState::removeLayer(unsigned layer) +{ + auto fwd_itr = std::remove_if( + this->render_order.begin(), this->render_order.end(), + [layer](unsigned elm) { + return elm == layer; + } + ); + this->render_order.erase(fwd_itr, this->render_order.end()); +} + +void LayerState::setArea(const string& app, const string& area) +{ + this->area2appid[area] = app; +} + WMLayer::WMLayer(json_object* j) : before_state(), state() { this->name = jh::getStringFromJson(j, "name"); @@ -84,15 +105,14 @@ WMLayer::WMLayer(json_object* j) : before_state(), state() unsigned WMLayer::getNewLayerID(const string& role) { unsigned ret = 0; - auto re = std::regex(this->role_list); - if (std::regex_match(role, re)) + + // generate new layer id; + if(this->hasRole(role)) { - // generate new layer id; ret = this->id_list.back() + 1; - HMI_DEBUG("role %s matches layer %d, new layerID %d", role.c_str(), this->name.c_str(), ret); + HMI_INFO("Generate new id: %d", ret); } - - if(ret == 0) + else { return ret; } @@ -150,9 +170,24 @@ void WMLayer::removeLayerID(unsigned id) this->id_list.erase(fwd_itr, this->id_list.end()); } -bool WMLayer::checkIDBelongTo(unsigned id) +bool WMLayer::hasLayerID(unsigned id) { - return (id > this->idBegin() && id < this->idEnd()); + bool ret = (id > this->idBegin() && id < this->idEnd()); + if(!ret) + return ret; + auto itr = std::find(this->id_list.begin(), this->id_list.end(), id); + return (itr != this->id_list.end()) ? true : false; +} + +bool WMLayer::hasRole(const string& role) +{ + auto re = std::regex(this->role_list); + if (std::regex_match(role, re)) + { + HMI_DEBUG("role %s matches layer %d", role.c_str(), this->name.c_str()); + return true; + } + return false; } /* WMError WMLayer::commitChange() diff --git a/src/wm_layer.hpp b/src/wm_layer.hpp index 3362ba7..2a5f9bd 100644 --- a/src/wm_layer.hpp +++ b/src/wm_layer.hpp @@ -38,6 +38,9 @@ class LayerState const std::unordered_map popCurrentState(); const std::unordered_map getCurrentState(); const std::vector getIviIdList(); + void addLayer(unsigned layer); + void removeLayer(unsigned layer); + void setArea(const std::string& app, const std::string& area); private: std::vector render_order; @@ -62,9 +65,10 @@ class WMLayer MANAGEMENT_TYPE layerType() { return this->type; } void appendArea(const std::string& area); void removeLayerID(unsigned id); - LayerState getLayerState() const { return before_state; } - WMError setLayerState(const LayerState& l); - bool checkIDBelongTo(unsigned id); + LayerState& getLayerState() { return before_state; } + WMError setLayerState(const LayerState& l); + bool hasLayerID(unsigned id); + bool hasRole(const std::string& role); private: LayerState before_state; LayerState state; diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp index 9ac1ffc..86616e8 100644 --- a/src/wm_layer_control.cpp +++ b/src/wm_layer_control.cpp @@ -1,586 +1,601 @@ -/* - * Copyright (c) 2017 TOYOTA MOTOR CORPORATION - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include -#include -#include "wm_layer_control.hpp" -#include "wm_layer.hpp" -#include "wm_client.hpp" -#include "request.hpp" -#include "json_helper.hpp" - -#define LC_AREA_PATH "/etc/areas.db" -#define LC_LAYER_SETTING_PATH "/etc/layer_setting.json" -#define LC_DEFAULT_AREA "normal.full" - -using std::string; -using std::vector; -using std::shared_ptr; - -namespace wm { - -LayerControl* g_lc_ctxt; - -static void createCallback_static(ilmObjectType object, - t_ilm_uint id, - t_ilm_bool created, - void* data) -{ - static_cast(data)->dispatchCreateEvent(object, id, created); -} - -static void surfaceCallback_static(t_ilm_surface surface, - struct ilmSurfaceProperties* surface_prop, - t_ilm_notification_mask mask) -{ - g_lc_ctxt->dispatchPropertyChangeEvent(surface, surface_prop, mask); -} - -static void layerCallback_static(t_ilm_layer layer, - struct ilmLayerProperties* layer_prop, - t_ilm_notification_mask mask) -{ - g_lc_ctxt->dispatchPropertyChangeEvent(layer, layer_prop, mask); -} - -LayerControl::LayerControl(const std::string& root) -{ - string area_path = root + LC_AREA_PATH; - string layer_path= root + LC_LAYER_SETTING_PATH; - // load layers.setting.json - WMError ret = this->loadLayerSetting(layer_path); - assert(ret == WMError::SUCCESS); - // load area.db - ret = this->loadAreaDb(area_path); - assert(ret == WMError::SUCCESS); -} - -WMError LayerControl::init(const LayerControlCallbacks& cb) -{ - ilmErrorTypes rc = ilm_init(); - t_ilm_uint num = 0; - t_ilm_uint *ids; - int cnt = 0; - - while (rc != ILM_SUCCESS) - { - cnt++; - if (20 <= cnt) - { - HMI_ERROR("Could not connect to compositor"); - goto lc_init_error; - } - HMI_ERROR("Wait to start weston ..."); - sleep(1); - ilm_init(); - } - if(rc != ILM_SUCCESS) goto lc_init_error; - - // Get current screen setting - rc = ilm_getScreenIDs(&num, &ids); - - if(rc != ILM_SUCCESS) goto lc_init_error; - - for(unsigned i = 0; i < num; i++) - { - HMI_INFO("get screen: %d", ids[i]); - } - // Currently, 0 is only available - this->screenID = ids[0]; - - rc = ilm_getPropertiesOfScreen(this->screenID, &this->screen_prop); - - if(rc != ILM_SUCCESS) goto lc_init_error; - - // Register Callback from ILM - this->cb = cb; - ilm_registerNotification(createCallback_static, this); - - return WMError::SUCCESS; - -lc_init_error: - HMI_ERROR("Failed to initialize. Terminate WM"); - - return WMError::FAIL; -} - -void LayerControl::createNewLayer(unsigned id) -{ - HMI_INFO("create new ID :%d", id); - struct rect rct = this->area2size[LC_DEFAULT_AREA]; - ilm_layerCreateWithDimension(&id, rct.w, rct.h); - ilm_layerSetSourceRectangle(id, rct.x, rct.y, rct.w, rct.h); - ilm_layerSetDestinationRectangle(id, rct.x, rct.y, rct.w, rct.h); - ilm_layerSetOpacity(id, 1.0); - ilm_layerSetVisibility(id, ILM_TRUE); - ilm_commitChanges(); -} - -unsigned LayerControl::getNewLayerID(const string& role, string* layer_name) -{ - unsigned ret = 0; - for(const auto& l: this->wm_layers) - { - ret = l->getNewLayerID(role); - if(ret != 0) - { - *layer_name = l->layerName(); - break; - } - } - return ret; -} - -struct rect LayerControl::getAreaSize(const std::string& area) -{ - return area2size[area]; -} - -void LayerControl::setupArea(double scaling) -{ - struct rect rct; - this->scaling = scaling; - - rct = this->area2size["normal.full"]; - this->area2size["normalfull"] = rct; - this->area2size["normal"] = rct; - - for (auto &i : this->area2size) - { - i.second.x = static_cast(scaling * i.second.x + 0.5); - i.second.y = static_cast(scaling * i.second.y + 0.5); - i.second.w = static_cast(scaling * i.second.w + 0.5); - i.second.h = static_cast(scaling * i.second.h + 0.5); - - HMI_DEBUG("wm:lm", "area:%s size(after) : x:%d y:%d w:%d h:%d", - i.first.c_str(), i.second.x, i.second.y, i.second.w, i.second.h); - } -} - -Screen LayerControl::getScreenInfo() -{ - return Screen(this->screen_prop.screenWidth, this->screen_prop.screenHeight); -} - -double LayerControl::scale() -{ - return this->scaling; -} - -WMError LayerControl::updateLayer(LayerState& layer_state) -{ - return WMError::SUCCESS; -} - -WMError LayerControl::commitChange() -{ - WMError rc = WMError::SUCCESS; - vector ivi_l_ids; - for(const auto& l : this->wm_layers) - { - auto state = l->getLayerState(); - for(const auto& id : state.getIviIdList()) - { - ivi_l_ids.push_back(id); - } - } - t_ilm_layer* id_array = new t_ilm_layer[ivi_l_ids.size()]; - if(id_array == nullptr) - { - HMI_WARNING("short memory"); - this->undoUpdate(); - return WMError::FAIL; - } - int count = 0; - for(const auto& i : ivi_l_ids) - { - id_array[count] = i; - } - - ilmErrorTypes ret = ilm_displaySetRenderOrder(this->screenID, id_array, ivi_l_ids.size()); - if(ret != ILM_SUCCESS) - { - this->undoUpdate(); - rc = WMError::FAIL; - } - delete id_array; - return rc; -} - -void LayerControl::undoUpdate() {} - -WMError LayerControl::loadLayerSetting(const string &path) -{ - HMI_DEBUG("loading WMLayer(Application Containers) Setting from %s", path); - - json_object *json_obj, *json_cfg; - int ret = jh::inputJsonFilie(path.c_str(), &json_obj); - if (0 > ret) - { - HMI_DEBUG("Could not open %s, so use default area information", path.c_str()); - return WMError::FAIL; - } - HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj)); - - if (!json_object_object_get_ex(json_obj, "mappings", &json_cfg)) - { - HMI_ERROR("Parse Error!!"); - return WMError::FAIL; - } - - int len = json_object_array_length(json_cfg); - HMI_DEBUG("json_cfg len:%d", len); - - for (int i = 0; i < len; i++) - { - json_object *json_tmp = json_object_array_get_idx(json_cfg, i); - HMI_DEBUG("> json_tmp dump:%s", json_object_get_string(json_tmp)); - - this->wm_layers.emplace_back(std::make_shared(json_tmp)); - } - - return WMError::SUCCESS; -} - -WMError LayerControl::loadAreaDb(const std::string& path) -{ - // Load area.db - json_object *json_obj; - int ret = jh::inputJsonFilie(path.c_str(), &json_obj); - if (0 > ret) - { - HMI_DEBUG("Could not open %s, so use default area information", path.c_str()); - return WMError::FAIL; - } - HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj)); - - // Perse areas - json_object *json_cfg; - if (!json_object_object_get_ex(json_obj, "areas", &json_cfg)) - { - HMI_ERROR("Parse Error!!"); - return WMError::FAIL; - } - - int len = json_object_array_length(json_cfg); - HMI_DEBUG("json_cfg len:%d", len); - - const char *area; - for (int i = 0; i < len; i++) - { - json_object *json_tmp = json_object_array_get_idx(json_cfg, i); - HMI_DEBUG("> json_tmp dump:%s", json_object_get_string(json_tmp)); - - area = jh::getStringFromJson(json_tmp, "name"); - if (nullptr == area) - { - HMI_ERROR("Parse Error!!"); - return WMError::FAIL; - } - HMI_DEBUG("> area:%s", area); - - json_object *json_rect; - if (!json_object_object_get_ex(json_tmp, "rect", &json_rect)) - { - HMI_ERROR("Parse Error!!"); - return WMError::FAIL; - } - HMI_DEBUG("> json_rect dump:%s", json_object_get_string(json_rect)); - - struct rect area_size; - area_size.x = jh::getIntFromJson(json_rect, "x"); - area_size.y = jh::getIntFromJson(json_rect, "y"); - area_size.w = jh::getIntFromJson(json_rect, "w"); - area_size.h = jh::getIntFromJson(json_rect, "h"); - - this->area2size[area] = area_size; - } - - // Check - for (const auto& itr : this->area2size) - { - HMI_DEBUG("area:%s x:%d y:%d w:%d h:%d", - itr.first.c_str(), itr.second.x, itr.second.y, - itr.second.w, itr.second.h); - } - - // Release json_object - json_object_put(json_obj); - - return WMError::SUCCESS; -} - -WMError LayerControl::layoutChange(const WMAction& action) -{ - WMError ret = WMError::FAIL; - if (action.visible == TaskVisible::INVISIBLE) - { - // Visibility is not change -> no redraw is required - return WMError::SUCCESS; - } - if(action.client == nullptr) - { - HMI_SEQ_ERROR(action.req_num, "client may vanish"); - return WMError::NOT_REGISTERED; - } - unsigned layer = action.client->layerID(); - - // Layout Manager - // WMError ret = this->setLayerSize(layer, action.area); - auto rect = this->getAreaSize(action.area); - ilmErrorTypes err = ilm_layerSetDestinationRectangle(layer, rect.x, rect.y, rect.w, rect.h); - if(err == ILM_SUCCESS) - { - ret = WMError::SUCCESS; - } - return ret; -} - -WMError LayerControl::visibilityChange(const WMAction& action) -{ - WMError ret = WMError::FAIL; - if(action.client == nullptr) - { - HMI_SEQ_ERROR(action.req_num, "client may vanish"); - return WMError::NOT_REGISTERED; - } - - if (action.visible != TaskVisible::INVISIBLE) - { - ret = this->makeVisible(action.client); - } - else - { - ret = this->makeInvisible(action.client); - } - return ret; -} - -void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool created) -{ - this->cb.test(id); - if (ILM_SURFACE == object) - { - if (created) - { - ilmSurfaceProperties sp; - ilmErrorTypes rc; - rc = ilm_getPropertiesOfSurface(id, &sp); - if(rc != ILM_SUCCESS) - return; - // this->cb->surfaceCreated(pid, id); - ilm_surfaceAddNotification(id, surfaceCallback_static); - ilm_surfaceSetSourceRectangle(id, 0, 0, sp.origSourceWidth, sp.origSourceHeight); - } - else - { - // this->cb->surfaceDestroyed(id); - } - } - if (ILM_LAYER == object) - { - if(created) - { - ilm_layerAddNotification(id, layerCallback_static); - // this->cb->layerCreated(id); - } - else - { - // this->cb->layerDestroyed(id); // Means Application is dead. - } - } -} - -void LayerControl::dispatchPropertyChangeEvent(unsigned id, - struct ilmSurfaceProperties* sprop, - t_ilm_notification_mask mask) -{ - pid_t pid = sprop->creatorPid; - HMI_DEBUG("pid : %d", pid); - - if (ILM_NOTIFICATION_VISIBILITY & mask) - { - //this->cb->surfaceVisibilityChanged(id, sprop->visibility); - } - if (ILM_NOTIFICATION_OPACITY & mask) - { - } - if (ILM_NOTIFICATION_ORIENTATION & mask) - { - } - if (ILM_NOTIFICATION_SOURCE_RECT & mask) - { - // this->cb->surfaceSourceRectChanged(id, ) - } - if (ILM_NOTIFICATION_DEST_RECT & mask) - { - // this->cb->surfaceSourceRectChanged(id, ) - } - if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask) - { - } - if (ILM_NOTIFICATION_CONTENT_REMOVED & mask) - { - /* application being down */ - // m_appLayers.remove(pid); - } - if (ILM_NOTIFICATION_CONFIGURED & mask) - { - /* qDebug("ILM_NOTIFICATION_CONFIGURED"); - qDebug(" surfaceProperties %d", surface); - qDebug(" surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth); - qDebug(" surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight); - - if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) { - addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN); - configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight); - } else { - ilmErrorTypes result; - t_ilm_layer layer = addSurfaceToAppLayer(pid, surface); - - if (layer != 0) { - configureAppSurface(surface, - surfaceProperties->origSourceWidth, - surfaceProperties->origSourceHeight); - - result = ilm_layerAddSurface(layer, surface); - if (result != ILM_SUCCESS) { - qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface); - } - ilm_commitChanges(); - } - } - updateScreen(); */ - } -} - -void LayerControl::dispatchPropertyChangeEvent(unsigned id, - struct ilmLayerProperties* lprop, - t_ilm_notification_mask mask) -{ - if (ILM_NOTIFICATION_VISIBILITY & mask) - { - //this->cb->layerVisibilityChanged(id, sprop->visibility); - } - if (ILM_NOTIFICATION_OPACITY & mask) - { - } - if (ILM_NOTIFICATION_ORIENTATION & mask) - { - } - if (ILM_NOTIFICATION_SOURCE_RECT & mask) - { - // this->cb->surfaceSourceRectChanged(id, ) - } - if (ILM_NOTIFICATION_DEST_RECT & mask) - { - // this->cb->surfaceSourceRectChanged(id, ) - } - if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask) - { - } - if (ILM_NOTIFICATION_CONTENT_REMOVED & mask) - { - /* application being down */ - // m_appLayers.remove(pid); - } - if (ILM_NOTIFICATION_CONFIGURED & mask) - { - /* qDebug("ILM_NOTIFICATION_CONFIGURED"); - qDebug(" surfaceProperties %d", surface); - qDebug(" surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth); - qDebug(" surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight); - - if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) { - addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN); - configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight); - } else { - ilmErrorTypes result; - t_ilm_layer layer = addSurfaceToAppLayer(pid, surface); - - if (layer != 0) { - configureAppSurface(surface, - surfaceProperties->origSourceWidth, - surfaceProperties->origSourceHeight); - - result = ilm_layerAddSurface(layer, surface); - if (result != ILM_SUCCESS) { - qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface); - } - ilm_commitChanges(); - } - } - updateScreen(); */ - } -} - -WMError LayerControl::makeVisible(const shared_ptr client) -{ - WMError ret = WMError::FAIL; - // Don't check here the client is not nullptr - unsigned layer = client->layerID(); - bool contains;// = this->checkBackGround(action.client->role()); - if(contains) - { - shared_ptr l; - // Move background from back ground layer - for(const auto& wm_layer : this->wm_layers) - { - if(wm_layer->layerName() == "BackGroundLayer") - { - //wm_layer.removeLayer(layer); - } - else - { - if(wm_layer->checkIDBelongTo(layer)) - { - l = wm_layer; - } - } - } - if(l != nullptr) - { - // make invisible first - ilm_layerSetVisibility(layer, 0); - ilm_commitChanges(); - //l->addLayer(layer); - } - } - for(const auto& wm_layer : this->wm_layers) - { - // make visible - //l->makeVisible(layer); - } - - return ret; -} - -WMError LayerControl::makeInvisible(const shared_ptr client) -{ - WMError ret = WMError::FAIL; - // Don't check here the client is not nullptr - unsigned layer = client->layerID(); - bool contains;// = this->checkBackGround(client->role()); - if(contains) - { - // Pop from background - } - else - { - - } - return ret; -} +/* + * Copyright (c) 2017 TOYOTA MOTOR CORPORATION + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include +#include +#include "wm_layer_control.hpp" +#include "wm_layer.hpp" +#include "wm_client.hpp" +#include "request.hpp" +#include "json_helper.hpp" + +#define LC_AREA_PATH "/etc/areas.db" +#define LC_LAYER_SETTING_PATH "/etc/layers_setting.json" +#define LC_DEFAULT_AREA "normal.full" + +using std::string; +using std::vector; +using std::shared_ptr; + +namespace wm { + +LayerControl* g_lc_ctxt; + +static void createCallback_static(ilmObjectType object, + t_ilm_uint id, + t_ilm_bool created, + void* data) +{ + static_cast(data)->dispatchCreateEvent(object, id, created); +} + +static void surfaceCallback_static(t_ilm_surface surface, + struct ilmSurfaceProperties* surface_prop, + t_ilm_notification_mask mask) +{ + g_lc_ctxt->dispatchPropertyChangeEvent(surface, surface_prop, mask); +} + +static void layerCallback_static(t_ilm_layer layer, + struct ilmLayerProperties* layer_prop, + t_ilm_notification_mask mask) +{ + g_lc_ctxt->dispatchPropertyChangeEvent(layer, layer_prop, mask); +} + +LayerControl::LayerControl(const std::string& root) +{ + string area_path = root + LC_AREA_PATH; + string layer_path= root + LC_LAYER_SETTING_PATH; + // load layers.setting.json + WMError ret = this->loadLayerSetting(layer_path); + assert(ret == WMError::SUCCESS); + // load area.db + ret = this->loadAreaDb(area_path); + assert(ret == WMError::SUCCESS); +} + +WMError LayerControl::init(const LayerControlCallbacks& cb) +{ + ilmErrorTypes rc = ilm_init(); + t_ilm_uint num = 0; + t_ilm_uint *ids; + int cnt = 0; + + while (rc != ILM_SUCCESS) + { + cnt++; + if (20 <= cnt) + { + HMI_ERROR("Could not connect to compositor"); + goto lc_init_error; + } + HMI_ERROR("Wait to start weston ..."); + sleep(1); + ilm_init(); + } + if(rc != ILM_SUCCESS) goto lc_init_error; + + // Get current screen setting + rc = ilm_getScreenIDs(&num, &ids); + + if(rc != ILM_SUCCESS) goto lc_init_error; + + for(unsigned i = 0; i < num; i++) + { + HMI_INFO("get screen: %d", ids[i]); + } + // Currently, 0 is only available + this->screenID = ids[0]; + + rc = ilm_getPropertiesOfScreen(this->screenID, &this->screen_prop); + + if(rc != ILM_SUCCESS) goto lc_init_error; + + // Register Callback from ILM + this->cb = cb; + ilm_registerNotification(createCallback_static, this); + + return WMError::SUCCESS; + +lc_init_error: + HMI_ERROR("Failed to initialize. Terminate WM"); + + return WMError::FAIL; +} + +void LayerControl::createNewLayer(unsigned id) +{ + HMI_INFO("create new ID :%d", id); + struct rect rct = this->area2size[LC_DEFAULT_AREA]; + ilm_layerCreateWithDimension(&id, rct.w, rct.h); + ilm_layerSetSourceRectangle(id, rct.x, rct.y, rct.w, rct.h); + //ilm_layerSetDestinationRectangle(id, rct.x, rct.y, rct.w, rct.h); + ilm_layerSetOpacity(id, 1.0); + ilm_layerSetVisibility(id, ILM_TRUE); + ilm_commitChanges(); +} + +unsigned LayerControl::getNewLayerID(const string& role, string* layer_name) +{ + unsigned ret = 0; + for(const auto& l: this->wm_layers) + { + ret = l->getNewLayerID(role); + if(ret != 0) + { + *layer_name = l->layerName(); + break; + } + } + return ret; +} + +struct rect LayerControl::getAreaSize(const std::string& area) +{ + return area2size[area]; +} + +void LayerControl::setupArea(double scaling) +{ + struct rect rct; + this->scaling = scaling; + + rct = this->area2size["normal.full"]; + this->area2size["normalfull"] = rct; + this->area2size["normal"] = rct; + + for (auto &i : this->area2size) + { + i.second.x = static_cast(scaling * i.second.x + 0.5); + i.second.y = static_cast(scaling * i.second.y + 0.5); + i.second.w = static_cast(scaling * i.second.w + 0.5); + i.second.h = static_cast(scaling * i.second.h + 0.5); + + HMI_DEBUG("wm:lm", "area:%s size(after) : x:%d y:%d w:%d h:%d", + i.first.c_str(), i.second.x, i.second.y, i.second.w, i.second.h); + } +} + +Screen LayerControl::getScreenInfo() +{ + return Screen(this->screen_prop.screenWidth, this->screen_prop.screenHeight); +} + +double LayerControl::scale() +{ + return this->scaling; +} + +WMError LayerControl::updateLayer(LayerState& layer_state) +{ + return WMError::SUCCESS; +} + +WMError LayerControl::commitChange() +{ + WMError rc = WMError::SUCCESS; + vector ivi_l_ids; + for(const auto& l : this->wm_layers) + { + auto state = l->getLayerState(); + for(const auto& id : state.getIviIdList()) + { + ivi_l_ids.push_back(id); + } + } + t_ilm_layer* id_array = new t_ilm_layer[ivi_l_ids.size()]; + if(id_array == nullptr) + { + HMI_WARNING("short memory"); + this->undoUpdate(); + return WMError::FAIL; + } + int count = 0; + for(const auto& i : ivi_l_ids) + { + id_array[count] = i; + ++count; + } + + ilmErrorTypes ret = ilm_displaySetRenderOrder(this->screenID, id_array, ivi_l_ids.size()); + if(ret != ILM_SUCCESS) + { + this->undoUpdate(); + rc = WMError::FAIL; + } + delete id_array; + return rc; +} + +void LayerControl::undoUpdate() {} + +WMError LayerControl::loadLayerSetting(const string &path) +{ + HMI_DEBUG("loading WMLayer(Application Containers) Setting from %s", path); + + json_object *json_obj, *json_cfg; + int ret = jh::inputJsonFilie(path.c_str(), &json_obj); + if (0 > ret) + { + HMI_DEBUG("Could not open %s, so use default area information", path.c_str()); + return WMError::FAIL; + } + HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj)); + + if (!json_object_object_get_ex(json_obj, "mappings", &json_cfg)) + { + HMI_ERROR("Parse Error!!"); + return WMError::FAIL; + } + + int len = json_object_array_length(json_cfg); + HMI_DEBUG("json_cfg len:%d", len); + + for (int i = 0; i < len; i++) + { + json_object *json_tmp = json_object_array_get_idx(json_cfg, i); + HMI_DEBUG("> json_tmp dump:%s", json_object_get_string(json_tmp)); + + this->wm_layers.emplace_back(std::make_shared(json_tmp)); + } + + return WMError::SUCCESS; +} + +WMError LayerControl::loadAreaDb(const std::string& path) +{ + // Load area.db + json_object *json_obj; + int ret = jh::inputJsonFilie(path.c_str(), &json_obj); + if (0 > ret) + { + HMI_DEBUG("Could not open %s, so use default area information", path.c_str()); + return WMError::FAIL; + } + HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj)); + + // Perse areas + json_object *json_cfg; + if (!json_object_object_get_ex(json_obj, "areas", &json_cfg)) + { + HMI_ERROR("Parse Error!!"); + return WMError::FAIL; + } + + int len = json_object_array_length(json_cfg); + HMI_DEBUG("json_cfg len:%d", len); + + const char *area; + for (int i = 0; i < len; i++) + { + json_object *json_tmp = json_object_array_get_idx(json_cfg, i); + HMI_DEBUG("> json_tmp dump:%s", json_object_get_string(json_tmp)); + + area = jh::getStringFromJson(json_tmp, "name"); + if (nullptr == area) + { + HMI_ERROR("Parse Error!!"); + return WMError::FAIL; + } + HMI_DEBUG("> area:%s", area); + + json_object *json_rect; + if (!json_object_object_get_ex(json_tmp, "rect", &json_rect)) + { + HMI_ERROR("Parse Error!!"); + return WMError::FAIL; + } + HMI_DEBUG("> json_rect dump:%s", json_object_get_string(json_rect)); + + struct rect area_size; + area_size.x = jh::getIntFromJson(json_rect, "x"); + area_size.y = jh::getIntFromJson(json_rect, "y"); + area_size.w = jh::getIntFromJson(json_rect, "w"); + area_size.h = jh::getIntFromJson(json_rect, "h"); + + this->area2size[area] = area_size; + } + + // Check + for (const auto& itr : this->area2size) + { + HMI_DEBUG("area:%s x:%d y:%d w:%d h:%d", + itr.first.c_str(), itr.second.x, itr.second.y, + itr.second.w, itr.second.h); + } + + // Release json_object + json_object_put(json_obj); + + return WMError::SUCCESS; +} + +WMError LayerControl::layoutChange(const WMAction& action) +{ + WMError ret = WMError::FAIL; + if (action.visible == TaskVisible::INVISIBLE) + { + // Visibility is not change -> no redraw is required + return WMError::SUCCESS; + } + if(action.client == nullptr) + { + HMI_SEQ_ERROR(action.req_num, "client may vanish"); + return WMError::NOT_REGISTERED; + } + unsigned layer = action.client->layerID(); + + // Layout Manager + // WMError ret = this->setLayerSize(layer, action.area); + auto rect = this->getAreaSize(action.area); + ilmErrorTypes err = ilm_layerSetDestinationRectangle(layer, rect.x, rect.y, rect.w, rect.h); + for(auto &wm_layer: this->wm_layers) + { + if(wm_layer->hasLayerID(layer)) + { + LayerState ls = wm_layer->getLayerState(); + ls.setArea(action.client->appID(), action.area); + } + } + if(err == ILM_SUCCESS) + { + ret = WMError::SUCCESS; + } + return ret; +} + +WMError LayerControl::visibilityChange(const WMAction& action) +{ + WMError ret = WMError::FAIL; + if(action.client == nullptr) + { + HMI_SEQ_ERROR(action.req_num, "client may vanish"); + return WMError::NOT_REGISTERED; + } + + if (action.visible != TaskVisible::INVISIBLE) + { + ret = this->makeVisible(action.client); + } + else + { + ret = this->makeInvisible(action.client); + } + return ret; +} + +void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool created) +{ + this->cb.test(id); + if (ILM_SURFACE == object) + { + if (created) + { + ilmSurfaceProperties sp; + ilmErrorTypes rc; + rc = ilm_getPropertiesOfSurface(id, &sp); + if(rc != ILM_SUCCESS) + return; + // this->cb->surfaceCreated(pid, id); + ilm_surfaceAddNotification(id, surfaceCallback_static); + ilm_surfaceSetSourceRectangle(id, 0, 0, sp.origSourceWidth, sp.origSourceHeight); + } + else + { + // this->cb->surfaceDestroyed(id); + } + } + if (ILM_LAYER == object) + { + if(created) + { + ilm_layerAddNotification(id, layerCallback_static); + // this->cb->layerCreated(id); + } + else + { + // this->cb->layerDestroyed(id); // Means Application is dead. + } + } +} + +void LayerControl::dispatchPropertyChangeEvent(unsigned id, + struct ilmSurfaceProperties* sprop, + t_ilm_notification_mask mask) +{ + pid_t pid = sprop->creatorPid; + HMI_DEBUG("pid : %d", pid); + + if (ILM_NOTIFICATION_VISIBILITY & mask) + { + //this->cb->surfaceVisibilityChanged(id, sprop->visibility); + } + if (ILM_NOTIFICATION_OPACITY & mask) + { + } + if (ILM_NOTIFICATION_ORIENTATION & mask) + { + } + if (ILM_NOTIFICATION_SOURCE_RECT & mask) + { + // this->cb->surfaceSourceRectChanged(id, ) + } + if (ILM_NOTIFICATION_DEST_RECT & mask) + { + // this->cb->surfaceSourceRectChanged(id, ) + } + if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask) + { + } + if (ILM_NOTIFICATION_CONTENT_REMOVED & mask) + { + /* application being down */ + // m_appLayers.remove(pid); + } + if (ILM_NOTIFICATION_CONFIGURED & mask) + { + /* qDebug("ILM_NOTIFICATION_CONFIGURED"); + qDebug(" surfaceProperties %d", surface); + qDebug(" surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth); + qDebug(" surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight); + + if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) { + addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN); + configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight); + } else { + ilmErrorTypes result; + t_ilm_layer layer = addSurfaceToAppLayer(pid, surface); + + if (layer != 0) { + configureAppSurface(surface, + surfaceProperties->origSourceWidth, + surfaceProperties->origSourceHeight); + + result = ilm_layerAddSurface(layer, surface); + if (result != ILM_SUCCESS) { + qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface); + } + ilm_commitChanges(); + } + } + updateScreen(); */ + } +} + +void LayerControl::dispatchPropertyChangeEvent(unsigned id, + struct ilmLayerProperties* lprop, + t_ilm_notification_mask mask) +{ + if (ILM_NOTIFICATION_VISIBILITY & mask) + { + //this->cb->layerVisibilityChanged(id, sprop->visibility); + } + if (ILM_NOTIFICATION_OPACITY & mask) + { + } + if (ILM_NOTIFICATION_ORIENTATION & mask) + { + } + if (ILM_NOTIFICATION_SOURCE_RECT & mask) + { + // this->cb->surfaceSourceRectChanged(id, ) + } + if (ILM_NOTIFICATION_DEST_RECT & mask) + { + // this->cb->surfaceSourceRectChanged(id, ) + } + if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask) + { + } + if (ILM_NOTIFICATION_CONTENT_REMOVED & mask) + { + /* application being down */ + // m_appLayers.remove(pid); + } + if (ILM_NOTIFICATION_CONFIGURED & mask) + { + /* qDebug("ILM_NOTIFICATION_CONFIGURED"); + qDebug(" surfaceProperties %d", surface); + qDebug(" surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth); + qDebug(" surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight); + + if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) { + addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN); + configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight); + } else { + ilmErrorTypes result; + t_ilm_layer layer = addSurfaceToAppLayer(pid, surface); + + if (layer != 0) { + configureAppSurface(surface, + surfaceProperties->origSourceWidth, + surfaceProperties->origSourceHeight); + + result = ilm_layerAddSurface(layer, surface); + if (result != ILM_SUCCESS) { + qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface); + } + ilm_commitChanges(); + } + } + updateScreen(); */ + } +} + +WMError LayerControl::makeVisible(const shared_ptr client) +{ + WMError ret = WMError::SUCCESS; + // Don't check here the client is not nullptr + unsigned layer = client->layerID(); + + for(auto& wm_layer : this->wm_layers) + { + if(wm_layer->hasLayerID(layer)) + { + LayerState ls = wm_layer->getLayerState(); + ls.addLayer(layer);; + } + } + + // Move foreground from back ground layer + for(auto& wm_layer : this->wm_layers) + { + if(wm_layer->layerName() == "BackGroundLayer") + { + if(wm_layer->hasRole(client->role())) + { + LayerState ls = wm_layer->getLayerState(); + ls.removeLayer(layer); + } + break; + } + } + + return ret; +} + +WMError LayerControl::makeInvisible(const shared_ptr client) +{ + WMError ret = WMError::SUCCESS; + // Don't check here the client is not nullptr + unsigned layer = client->layerID(); + + for(auto& wm_layer : this->wm_layers) + { + if(wm_layer->hasLayerID(layer)) + { + LayerState ls = wm_layer->getLayerState(); + ls.removeLayer(layer);; + } + } + + // Move foreground from back ground layer + for(auto& wm_layer : this->wm_layers) + { + if(wm_layer->layerName() == "BackGroundLayer") + { + if(wm_layer->hasRole(client->role())) + { + LayerState ls = wm_layer->getLayerState(); + ls.addLayer(layer); + } + break; + } + } + + return ret; +} } // namespace wm \ No newline at end of file diff --git a/src/wm_layer_control.hpp b/src/wm_layer_control.hpp index e2c4b18..7752fc4 100644 --- a/src/wm_layer_control.hpp +++ b/src/wm_layer_control.hpp @@ -27,8 +27,7 @@ namespace wm { class Screen { public: - Screen(unsigned w, unsigned h); - ~Screen(); + Screen(unsigned w, unsigned h) : _width(w), _height(h){} unsigned width() { return _width; } unsigned height() { return _height; } private: -- cgit 1.2.3-korg