#include <unistd.h>\r
#include "wm_layer_control.hpp"\r
#include "wm_layer.hpp"\r
+#include "json_helper.hpp"\r
\r
-#define LC_AREA_PATH "/etc/area.db"\r
+#define LC_AREA_PATH "/etc/areas.db"\r
#define LC_LAYER_SETTING_PATH "/etc/layer_setting.json"\r
\r
using std::string;\r
+using std::vector;\r
\r
namespace wm {\r
\r
-static void notification_static(ilmObjectType object,\r
+LayerControl* g_lc_ctxt;\r
+\r
+static void createCallback_static(ilmObjectType object,\r
t_ilm_uint id,\r
t_ilm_bool created,\r
void* data)\r
{\r
- static_cast<LayerControl*>(data)->dispatchILMEvent(object, id, created);\r
+ static_cast<LayerControl*>(data)->dispatchCreateEvent(object, id, created);\r
+}\r
+\r
+static void surfaceCallback_static(t_ilm_surface surface,\r
+ struct ilmSurfaceProperties* surface_prop,\r
+ t_ilm_notification_mask mask)\r
+{\r
+ g_lc_ctxt->dispatchPropertyChangeEvent(surface, surface_prop, mask);\r
+}\r
+\r
+static void layerCallback_static(t_ilm_layer layer,\r
+ struct ilmLayerProperties* layer_prop,\r
+ t_ilm_notification_mask mask)\r
+{\r
+ g_lc_ctxt->dispatchPropertyChangeEvent(layer, layer_prop, mask);\r
}\r
\r
LayerControl::LayerControl(const std::string& root)\r
string area_path = root + LC_AREA_PATH;\r
string layer_path= root + LC_LAYER_SETTING_PATH;\r
// load layers.setting.json\r
+ WMError ret = this->loadLayerSetting(layer_path);\r
+ assert(ret == WMError::SUCCESS);\r
// load area.db\r
+ ret = this->loadAreaDb(area_path);\r
+ assert(ret == WMError::SUCCESS);\r
}\r
\r
-WMError LayerControl::init()\r
+WMError LayerControl::init(const LayerControlCallbacks& cb)\r
{\r
ilmErrorTypes rc = ilm_init();\r
t_ilm_uint num = 0;\r
}\r
if(rc != ILM_SUCCESS) goto lc_init_error;\r
\r
+ // Get current screen setting\r
rc = ilm_getScreenIDs(&num, &ids);\r
\r
if(rc != ILM_SUCCESS) goto lc_init_error;\r
if(rc != ILM_SUCCESS) goto lc_init_error;\r
\r
// Register Callback from ILM\r
- ilm_registerNotification(notification_static, this);\r
+ this->cb = cb;\r
+ ilm_registerNotification(createCallback_static, this);\r
\r
return WMError::SUCCESS;\r
\r
return ret;\r
}\r
\r
-WMError LayerControl::updateLayer(WMLayer& wm_layer)\r
+WMError LayerControl::updateLayer(LayerState& layer_state)\r
{\r
return WMError::SUCCESS;\r
}\r
\r
-void LayerControl::commitChange() {}\r
+WMError LayerControl::commitChange()\r
+{\r
+ WMError rc = WMError::SUCCESS;\r
+ vector<unsigned> ivi_l_ids;\r
+ for(const auto& l : this->wm_layers)\r
+ {\r
+ auto state = l->getLayerState();\r
+ for(const auto& id : state.getIviIdList())\r
+ {\r
+ ivi_l_ids.push_back(id);\r
+ }\r
+ }\r
+ t_ilm_layer* id_array = new t_ilm_layer[ivi_l_ids.size()];\r
+ if(id_array == nullptr)\r
+ {\r
+ HMI_WARNING("short memory");\r
+ this->undoUpdate();\r
+ return WMError::FAIL;\r
+ }\r
+ int count = 0;\r
+ for(const auto& i : ivi_l_ids)\r
+ {\r
+ id_array[count] = i;\r
+ }\r
+\r
+ ilmErrorTypes ret = ilm_displaySetRenderOrder(this->screenID, id_array, ivi_l_ids.size());\r
+ if(ret != ILM_SUCCESS)\r
+ {\r
+ this->undoUpdate();\r
+ rc = WMError::FAIL;\r
+ }\r
+ delete id_array;\r
+ return rc;\r
+}\r
\r
void LayerControl::undoUpdate() {}\r
\r
-WMError LayerControl::load(const string &path)\r
+WMError LayerControl::loadLayerSetting(const string &path)\r
{\r
+ HMI_DEBUG("loading WMLayer(Application Containers) Setting from %s", path);\r
+\r
+ json_object *json_obj, *json_cfg;\r
+ int ret = jh::inputJsonFilie(path.c_str(), &json_obj);\r
+ if (0 > ret)\r
+ {\r
+ HMI_DEBUG("Could not open %s, so use default area information", path.c_str());\r
+ return WMError::FAIL;\r
+ }\r
+ HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj));\r
+\r
+ if (!json_object_object_get_ex(json_obj, "mappings", &json_cfg))\r
+ {\r
+ HMI_ERROR("Parse Error!!");\r
+ return WMError::FAIL;\r
+ }\r
+\r
+ int len = json_object_array_length(json_cfg);\r
+ HMI_DEBUG("json_cfg len:%d", len);\r
+\r
+ for (int i = 0; i < len; i++)\r
+ {\r
+ json_object *json_tmp = json_object_array_get_idx(json_cfg, i);\r
+ HMI_DEBUG("> json_tmp dump:%s", json_object_get_string(json_tmp));\r
+\r
+ this->wm_layers.emplace_back(std::make_shared<WMLayer>(json_tmp));\r
+ }\r
+\r
return WMError::SUCCESS;\r
}\r
\r
-void LayerControl::dispatchILMEvent(ilmObjectType object, t_ilm_uint id, t_ilm_bool created)\r
+WMError LayerControl::loadAreaDb(const std::string& path)\r
{\r
- ;\r
+ // Load area.db\r
+ json_object *json_obj;\r
+ int ret = jh::inputJsonFilie(path.c_str(), &json_obj);\r
+ if (0 > ret)\r
+ {\r
+ HMI_DEBUG("Could not open %s, so use default area information", path.c_str());\r
+ return WMError::FAIL;\r
+ }\r
+ HMI_INFO("json_obj dump:%s", json_object_get_string(json_obj));\r
+\r
+ // Perse areas\r
+ json_object *json_cfg;\r
+ if (!json_object_object_get_ex(json_obj, "areas", &json_cfg))\r
+ {\r
+ HMI_ERROR("Parse Error!!");\r
+ return WMError::FAIL;\r
+ }\r
+\r
+ int len = json_object_array_length(json_cfg);\r
+ HMI_DEBUG("json_cfg len:%d", len);\r
+\r
+ const char *area;\r
+ for (int i = 0; i < len; i++)\r
+ {\r
+ json_object *json_tmp = json_object_array_get_idx(json_cfg, i);\r
+ HMI_DEBUG("> json_tmp dump:%s", json_object_get_string(json_tmp));\r
+\r
+ area = jh::getStringFromJson(json_tmp, "name");\r
+ if (nullptr == area)\r
+ {\r
+ HMI_ERROR("Parse Error!!");\r
+ return WMError::FAIL;\r
+ }\r
+ HMI_DEBUG("> area:%s", area);\r
+\r
+ json_object *json_rect;\r
+ if (!json_object_object_get_ex(json_tmp, "rect", &json_rect))\r
+ {\r
+ HMI_ERROR("Parse Error!!");\r
+ return WMError::FAIL;\r
+ }\r
+ HMI_DEBUG("> json_rect dump:%s", json_object_get_string(json_rect));\r
+\r
+ struct rect area_size;\r
+ area_size.x = jh::getIntFromJson(json_rect, "x");\r
+ area_size.y = jh::getIntFromJson(json_rect, "y");\r
+ area_size.w = jh::getIntFromJson(json_rect, "w");\r
+ area_size.h = jh::getIntFromJson(json_rect, "h");\r
+\r
+ this->area2size[area] = area_size;\r
+ }\r
+\r
+ // Check\r
+ for (const auto& itr : this->area2size)\r
+ {\r
+ HMI_DEBUG("area:%s x:%d y:%d w:%d h:%d",\r
+ itr.first.c_str(), itr.second.x, itr.second.y,\r
+ itr.second.w, itr.second.h);\r
+ }\r
+\r
+ // Release json_object\r
+ json_object_put(json_obj);\r
+\r
+ return WMError::SUCCESS;\r
+}\r
+\r
+void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool created)\r
+{\r
+ this->cb.test(id);\r
+ if (ILM_SURFACE == object)\r
+ {\r
+ if (created)\r
+ {\r
+ ilmSurfaceProperties sp;\r
+ ilmErrorTypes rc;\r
+ rc = ilm_getPropertiesOfSurface(id, &sp);\r
+ if(rc != ILM_SUCCESS)\r
+ return;\r
+ // this->cb->surfaceCreated(pid, id);\r
+ ilm_surfaceAddNotification(id, surfaceCallback_static);\r
+ ilm_surfaceSetSourceRectangle(id, 0, 0, sp.origSourceWidth, sp.origSourceHeight);\r
+ }\r
+ else\r
+ {\r
+ // this->cb->surfaceDestroyed(id);\r
+ }\r
+ }\r
+ if (ILM_LAYER == object)\r
+ {\r
+ if(created)\r
+ {\r
+ ilm_layerAddNotification(id, layerCallback_static);\r
+ // this->cb->layerCreated(id);\r
+ }\r
+ else\r
+ {\r
+ // this->cb->layerDestroyed(id); // Means Application is dead.\r
+ }\r
+ }\r
+}\r
+\r
+void LayerControl::dispatchPropertyChangeEvent(unsigned id,\r
+ struct ilmSurfaceProperties* sprop,\r
+ t_ilm_notification_mask mask)\r
+{\r
+ pid_t pid = sprop->creatorPid;\r
+ HMI_DEBUG("pid : %d", pid);\r
+\r
+ if (ILM_NOTIFICATION_VISIBILITY & mask)\r
+ {\r
+ //this->cb->surfaceVisibilityChanged(id, sprop->visibility);\r
+ }\r
+ if (ILM_NOTIFICATION_OPACITY & mask)\r
+ {\r
+ }\r
+ if (ILM_NOTIFICATION_ORIENTATION & mask)\r
+ {\r
+ }\r
+ if (ILM_NOTIFICATION_SOURCE_RECT & mask)\r
+ {\r
+ // this->cb->surfaceSourceRectChanged(id, )\r
+ }\r
+ if (ILM_NOTIFICATION_DEST_RECT & mask)\r
+ {\r
+ // this->cb->surfaceSourceRectChanged(id, )\r
+ }\r
+ if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask)\r
+ {\r
+ }\r
+ if (ILM_NOTIFICATION_CONTENT_REMOVED & mask)\r
+ {\r
+ /* application being down */\r
+ // m_appLayers.remove(pid);\r
+ }\r
+ if (ILM_NOTIFICATION_CONFIGURED & mask)\r
+ {\r
+ /* qDebug("ILM_NOTIFICATION_CONFIGURED");\r
+ qDebug(" surfaceProperties %d", surface);\r
+ qDebug(" surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth);\r
+ qDebug(" surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight);\r
+\r
+ if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) {\r
+ addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN);\r
+ configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight);\r
+ } else {\r
+ ilmErrorTypes result;\r
+ t_ilm_layer layer = addSurfaceToAppLayer(pid, surface);\r
+\r
+ if (layer != 0) {\r
+ configureAppSurface(surface,\r
+ surfaceProperties->origSourceWidth,\r
+ surfaceProperties->origSourceHeight);\r
+\r
+ result = ilm_layerAddSurface(layer, surface);\r
+ if (result != ILM_SUCCESS) {\r
+ qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface);\r
+ }\r
+ ilm_commitChanges();\r
+ }\r
+ }\r
+ updateScreen(); */\r
+ }\r
+}\r
+\r
+void LayerControl::dispatchPropertyChangeEvent(unsigned id,\r
+ struct ilmLayerProperties* lprop,\r
+ t_ilm_notification_mask mask)\r
+{\r
+ if (ILM_NOTIFICATION_VISIBILITY & mask)\r
+ {\r
+ //this->cb->layerVisibilityChanged(id, sprop->visibility);\r
+ }\r
+ if (ILM_NOTIFICATION_OPACITY & mask)\r
+ {\r
+ }\r
+ if (ILM_NOTIFICATION_ORIENTATION & mask)\r
+ {\r
+ }\r
+ if (ILM_NOTIFICATION_SOURCE_RECT & mask)\r
+ {\r
+ // this->cb->surfaceSourceRectChanged(id, )\r
+ }\r
+ if (ILM_NOTIFICATION_DEST_RECT & mask)\r
+ {\r
+ // this->cb->surfaceSourceRectChanged(id, )\r
+ }\r
+ if (ILM_NOTIFICATION_CONTENT_AVAILABLE & mask)\r
+ {\r
+ }\r
+ if (ILM_NOTIFICATION_CONTENT_REMOVED & mask)\r
+ {\r
+ /* application being down */\r
+ // m_appLayers.remove(pid);\r
+ }\r
+ if (ILM_NOTIFICATION_CONFIGURED & mask)\r
+ {\r
+ /* qDebug("ILM_NOTIFICATION_CONFIGURED");\r
+ qDebug(" surfaceProperties %d", surface);\r
+ qDebug(" surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth);\r
+ qDebug(" surfaceProperties.origSourceHeight: %d", surfaceProperties->origSourceHeight);\r
+\r
+ if (surface == WINDOWMANAGER_HOMESCREEN_MAIN_SURFACE_ID) {\r
+ addSurfaceToLayer(surface, WINDOWMANAGER_LAYER_HOMESCREEN);\r
+ configureHomeScreenMainSurface(surface, surfaceProperties->origSourceWidth, surfaceProperties->origSourceHeight);\r
+ } else {\r
+ ilmErrorTypes result;\r
+ t_ilm_layer layer = addSurfaceToAppLayer(pid, surface);\r
+\r
+ if (layer != 0) {\r
+ configureAppSurface(surface,\r
+ surfaceProperties->origSourceWidth,\r
+ surfaceProperties->origSourceHeight);\r
+\r
+ result = ilm_layerAddSurface(layer, surface);\r
+ if (result != ILM_SUCCESS) {\r
+ qDebug("ilm_layerAddSurface(%d,%d) failed.", layer, surface);\r
+ }\r
+ ilm_commitChanges();\r
+ }\r
+ }\r
+ updateScreen(); */\r
+ }\r
}\r
\r
} // namespace wm
\ No newline at end of file
Code Review / apps / agl-service-windowmanager.git / blobdiff