X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwm_layer_control.cpp;h=31f6c4f7c3f4bdbcaea5bca716b6bef190cbd0eb;hb=380bf1289c2dc9df91044cfc1dfb5554211b58fa;hp=62fe91dbf7eac9a5964a67d990a7e61268fa2917;hpb=2ce7162980b40cf5587ed8a0247f3e9bd3407ad7;p=apps%2Fagl-service-windowmanager.git diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp index 62fe91d..31f6c4f 100644 --- a/src/wm_layer_control.cpp +++ b/src/wm_layer_control.cpp @@ -130,7 +130,7 @@ void LayerControl::createNewLayer(unsigned id) ilm_commitChanges(); auto wm_layer = getWMLayer(id); wm_layer->addLayerToState(id); - this->commitChange(); + this->renderLayers(); } unsigned LayerControl::getNewLayerID(const string& role, string* layer_name) @@ -209,10 +209,12 @@ WMError LayerControl::updateLayer(LayerState& layer_state) return WMError::SUCCESS; } -WMError LayerControl::commitChange() +WMError LayerControl::renderLayers() { HMI_INFO("Commit change"); WMError rc = WMError::SUCCESS; + + // Check the number of layers vector ivi_l_ids; for(auto& l : this->wm_layers) { @@ -224,6 +226,8 @@ WMError LayerControl::commitChange() ivi_l_ids.push_back(id); } } + + // Create render order t_ilm_layer* id_array = new t_ilm_layer[ivi_l_ids.size()]; if(id_array == nullptr) { @@ -235,10 +239,10 @@ WMError LayerControl::commitChange() for(const auto& i : ivi_l_ids) { id_array[count] = i; - HMI_DEBUG("check render order %d", i); ++count; } + // Display ilmErrorTypes ret = ilm_displaySetRenderOrder(this->screenID, id_array, ivi_l_ids.size()); if(ret != ILM_SUCCESS) { @@ -249,7 +253,7 @@ WMError LayerControl::commitChange() { for(auto& l : this->wm_layers) { - l->commitChange(); + l->update(); } } ilm_commitChanges(); @@ -257,7 +261,13 @@ WMError LayerControl::commitChange() return rc; } -void LayerControl::undoUpdate() {} +void LayerControl::undoUpdate() +{ + for(auto& l : this->wm_layers) + { + l->undo(); + } +} WMError LayerControl::loadLayerSetting(const string &path) { @@ -267,7 +277,7 @@ WMError LayerControl::loadLayerSetting(const string &path) 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()); + HMI_ERROR("Could not open %s", path.c_str()); return WMError::FAIL; } HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj)); @@ -300,7 +310,7 @@ WMError LayerControl::loadAreaDb(const std::string& path) 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()); + HMI_ERROR("Could not open %s", path.c_str()); return WMError::FAIL; } HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj)); @@ -387,8 +397,11 @@ WMError LayerControl::layoutChange(const WMAction& action) { if(wm_layer->hasLayerID(layer)) { + wm_layer->setAreaToState(action.client->appID(), action.area); + /* TODO: manipulate state directly LayerState ls = wm_layer->getLayerState(); ls.setArea(action.client->appID(), action.area); + wm_layer->dump(); */ } } @@ -415,6 +428,14 @@ WMError LayerControl::visibilityChange(const WMAction& action) return ret; } +void LayerControl::terminateApp(const shared_ptr client) +{ + for(auto& l : this->wm_layers) + { + l->terminateApp(client->layerID()); + } +} + void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool created) { if (ILM_SURFACE == object) @@ -425,7 +446,10 @@ void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool c ilmErrorTypes rc; rc = ilm_getPropertiesOfSurface(id, &sp); if(rc != ILM_SUCCESS) + { + HMI_ERROR("Failed to get surface %d property due to %d", id, ilm_getError()); return; + } this->cb.surfaceCreated(sp.creatorPid, id); ilm_surfaceAddNotification(id, surfaceCallback_static); ilm_surfaceSetVisibility(id, ILM_TRUE); @@ -440,11 +464,12 @@ void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool c if(created) { ilm_layerAddNotification(id, layerCallback_static); - // this->cb->layerCreated(id); } else { - // this->cb->layerDestroyed(id); // Means Application is dead. + // Ignore here. Nothing to do currently. + // Process of application dead is handled by Window Manager + // from binder notification } } } @@ -453,65 +478,32 @@ void LayerControl::dispatchPropertyChangeEvent(unsigned id, struct ilmSurfaceProperties* sprop, t_ilm_notification_mask mask) { - pid_t pid = sprop->creatorPid; - HMI_DEBUG("pid : %d", pid); - + /* + ILM_NOTIFICATION_CONTENT_AVAILABLE & ILM_NOTIFICATION_CONTENT_REMOVED + are not handled here, handled in create/destroy event + */ if (ILM_NOTIFICATION_VISIBILITY & mask) { - //this->cb->surfaceVisibilityChanged(id, sprop->visibility); + HMI_DEBUG("surface %d turns visibility %d", id, sprop->visibility); } if (ILM_NOTIFICATION_OPACITY & mask) { - } - if (ILM_NOTIFICATION_ORIENTATION & mask) - { + HMI_DEBUG("surface %d turns opacity %f", id, sprop->opacity); } if (ILM_NOTIFICATION_SOURCE_RECT & mask) { - // this->cb->surfaceSourceRectChanged(id, ) + HMI_DEBUG("surface %d source rect changes", 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); + HMI_DEBUG("surface %d dest rect changes", id); } if (ILM_NOTIFICATION_CONFIGURED & mask) { - HMI_DEBUG("surface %d available", id); + HMI_DEBUG("surface %d size %d, %d, %d, %d", id, + sprop->sourceX, sprop->sourceY, sprop->origSourceWidth, sprop->origSourceHeight); ilm_surfaceSetSourceRectangle(id, 0, 0, sprop->origSourceWidth, sprop->origSourceHeight); ilm_surfaceSetDestinationRectangle(id, 0, 0, sprop->origSourceWidth, sprop->origSourceHeight); - /* 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(); */ } } @@ -519,59 +511,25 @@ void LayerControl::dispatchPropertyChangeEvent(unsigned id, struct ilmLayerProperties* lprop, t_ilm_notification_mask mask) { + /* + ILM_NOTIFICATION_CONTENT_AVAILABLE & ILM_NOTIFICATION_CONTENT_REMOVED + are not handled here, handled in create/destroy event + */ if (ILM_NOTIFICATION_VISIBILITY & mask) { - //this->cb->layerVisibilityChanged(id, sprop->visibility); + HMI_DEBUG("layer %d turns visibility %d", id, lprop->visibility); } if (ILM_NOTIFICATION_OPACITY & mask) { - } - if (ILM_NOTIFICATION_ORIENTATION & mask) - { + HMI_DEBUG("layer %d turns opacity %f", id, lprop->opacity); } if (ILM_NOTIFICATION_SOURCE_RECT & mask) { - // this->cb->surfaceSourceRectChanged(id, ) + HMI_DEBUG("layer %d source rect changes", 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(); */ + HMI_DEBUG("layer %d dest rect changes", id); } }