X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwm_layer_control.cpp;h=3f39d65660dc60bf266e142df4ebe8fc8b120d7e;hb=3a9996eb359accdbadb0e5eaa5259c910b7ae46a;hp=30e013fd164538d4495665cb324f66d456f25ad4;hpb=838d50406889ecd96271153ed9ec3a8160bcfe16;p=apps%2Fagl-service-windowmanager.git diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp index 30e013f..3f39d65 100644 --- a/src/wm_layer_control.cpp +++ b/src/wm_layer_control.cpp @@ -13,26 +13,121 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include -#include "layers.hpp" -#include "wm_layer.hpp" +#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; namespace wm { -LayerControl::LayerControl(const string& path) : wm_layers() +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) { - WMError ret = this->load(path); + 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); } -LayerControl::~LayerControl() -{} +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); -unsigned LayerControl::getNewLayerID(const string& role) + 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) @@ -40,24 +135,451 @@ unsigned LayerControl::getNewLayerID(const string& role) ret = l->getNewLayerID(role); if(ret != 0) { + *layer_name = l->layerName(); break; } } return ret; } -WMError LayerControl::updateLayer(WMLayer& wm_layer) +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; } -void LayerControl::commitChange() {} +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::load(const string &path) +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.get()); + } + else + { + ret = this->makeInvisible(action.client.get()); + } + 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 WMClient* 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) + { + std::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 WMClient* 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; +} } // namespace wm \ No newline at end of file