+++ /dev/null
-{
- "description": "Settings for window manager",
- "settings" :
- {
- "scaling" : "aspect_fit",
- "options@scaling" : "aspect_fit|display_fit|none"
- }
-}
\ No newline at end of file
layers.cpp
wm_client.cpp
wm_error.cpp
- wm_config.cpp
applist.cpp
request.cpp)
COMMAND cp -f ${PROJECT_SOURCE_DIR}/layers.json ${PROJECT_BINARY_DIR}/package/root/etc
COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/old_roles.db ${PROJECT_BINARY_DIR}/package/root/etc
COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/areas.db ${PROJECT_BINARY_DIR}/package/root/etc
- COMMAND cp -f ${PROJECT_SOURCE_DIR}/conf/setting.json ${PROJECT_BINARY_DIR}/package/root/etc
)
add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root
return j;
}
-compositor::rect layer_map::getAreaSize(const std::string &area)
-{
- return area2size[area];
-}
-
-const compositor::rect layer_map::getScaleDestRect(
- int to_w, int to_h, const std::string &aspect_setting)
+void layer_map::setupArea(int output_w, int output_h)
{
compositor::rect rct;
- rct.x = 0;
- rct.y = 0;
- rct.w = to_w;
- rct.h = to_h;
- HMI_NOTICE("wm:lm",
- "Scaling:'%s'. Check 'fullscreen' is set.", aspect_setting.c_str());
- // Base is "fullscreen". Crash me if "fullscreen" is not set
- compositor::rect base = this->area2size.at("fullscreen");
- HMI_DEBUG("wm:lm", "Output size, width: %d, height: %d / fullscreen width: %d, height: %d",
- to_w, to_h, base.w, base.h);
- // If full_rct.w or full_rct.h == 0, crash me on purpose
- double scale_rate_w = double(to_w) / double(base.w);
- double scale_rate_h = double(to_h) / double(base.h);
- double scale;
- if (scale_rate_h < scale_rate_w)
- {
- scale = scale_rate_h;
- }
- else
- {
- scale = scale_rate_w;
- }
- HMI_DEBUG("wm", "set scale: %5.2f", scale);
- // Scaling
- if (aspect_setting == "aspect_fit")
- {
- // offset
- rct.x = (to_w - scale * base.w) / 2;
- rct.y = (to_h - scale * base.h) / 2;
+ rct = this->area2size["normal.full"];
+ this->area2size["normalfull"] = rct;
+ this->area2size["normal"] = rct;
- // scaling
- rct.w = base.w * scale;
- rct.h = base.h * scale;
- }
- else if (aspect_setting == "display_fit")
+ for (auto &i : this->area2size)
{
- // offset is none
- // scaling
- rct.w = base.w * scale_rate_w;
- rct.h = base.h * scale_rate_h;
+ 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);
}
- HMI_DEBUG("wm:lm", "offset x: %d, y: %d", rct.x, rct.y);
- HMI_DEBUG("wm:lm", "after scaling w: %d, h: %d", rct.w, rct.h);
- return rct;
+}
+
+compositor::rect layer_map::getAreaSize(const std::string &area)
+{
+ return area2size[area];
}
int layer_map::loadAreaDb()
}
json to_json() const;
+ void setupArea(int output_w, int output_h);
compositor::rect getAreaSize(const std::string &area);
- const compositor::rect getScaleDestRect(int output_w, int output_h, const std::string &aspect_setting);
int loadAreaDb();
private:
ivi_wm_set_layer_visibility(this->parent->proxy.get(), this->id, visibility);
}
-void layer::set_source_rectangle(int32_t x, int32_t y, int32_t width, int32_t height)
-{
- ivi_wm_set_layer_source_rectangle(this->parent->proxy.get(), this->id, x, y, width, height);
-}
-
void layer::set_destination_rectangle(int32_t x, int32_t y,
int32_t width, int32_t height)
{
// Requests
void set_visibility(uint32_t visibility);
- void set_source_rectangle(int32_t x, int32_t y, int32_t width, int32_t height);
void set_destination_rectangle(int32_t x, int32_t y,
int32_t width, int32_t height);
void add_surface(uint32_t surface_id);
#include "window_manager.hpp"
#include "json_helper.hpp"
-#include "wm_config.hpp"
#include "applist.hpp"
extern "C"
int WindowManager::init()
{
- int ret;
if (!this->display->ok())
{
return -1;
// Third level objects
this->display->roundtrip();
- ret = init_layers();
- return ret;
+ return init_layers();
}
int WindowManager::dispatch_pending_events()
return -1;
}
- WMConfig wm_config;
- wm_config.loadConfigs();
-
auto &c = this->controller;
auto &o = this->outputs.front();
auto &s = c->screens.begin()->second;
auto &layers = c->layers;
- this->layers.loadAreaDb();
- const compositor::rect base = this->layers.getAreaSize("fullscreen");
-
- const std::string aspect_setting = wm_config.getConfigAspect();
- const compositor::rect scale_rect =
- this->layers.getScaleDestRect(o->width, o->height, aspect_setting);
-
// Write output dimensions to ivi controller...
c->output_size = compositor::size{uint32_t(o->width), uint32_t(o->height)};
c->physical_size = compositor::size{uint32_t(o->physical_width),
// Quick and dirty setup of layers
for (auto const &i : this->layers.mapping)
{
- c->layer_create(i.second.layer_id, scale_rect.w, scale_rect.h);
+ c->layer_create(i.second.layer_id, o->width, o->height);
auto &l = layers[i.second.layer_id];
- l->set_source_rectangle(0, 0, base.w, base.h);
- l->set_destination_rectangle(
- scale_rect.x, scale_rect.y, scale_rect.w, scale_rect.h);
+ l->set_destination_rectangle(0, 0, o->width, o->height);
l->set_visibility(1);
HMI_DEBUG("wm", "Setting up layer %s (%d) for surface role match \"%s\"",
i.second.name.c_str(), i.second.layer_id, i.second.role.c_str());
this->layout_commit();
+ this->layers.loadAreaDb();
+ this->layers.setupArea(o->width, o->height);
+
return 0;
}
* limitations under the License.
*/
-#ifndef WINDOW_MANAGER_HPP
-#define WINDOW_MANAGER_HPP
+#ifndef TMCAGLWM_APP_HPP
+#define TMCAGLWM_APP_HPP
#include <atomic>
#include <memory>
} // namespace wm
-#endif // WINDOW_MANAGER_HPP
+#endif // TMCAGLWM_APP_HPP
+++ /dev/null
-/*
- * 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/hmi-debug.h"
-#include "json_helper.hpp"
-#include "wm_config.hpp"
-
-using std::string;
-
-namespace wm
-{
-
-WMConfig::WMConfig(){}
-
-WMConfig::~WMConfig()
-{
- json_object_put(j_setting_conf);
-}
-
-WMError WMConfig::loadConfigs()
-{
- WMError ret;
- char const *pRoot = getenv("AFM_APP_INSTALL_DIR");
- string root_path = pRoot;
- if (root_path.length() == 0)
- {
- HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined");
- }
- ret = this->loadSetting(root_path);
-
- return ret;
-}
-
-const string WMConfig::getConfigAspect()
-{
- json_object *j;
- string ret;
- if (!json_object_object_get_ex(this->j_setting_conf, "settings", &j))
- {
- ret = "aspect_fit";
- }
- else
- {
- const char* scaling = jh::getStringFromJson(j, "scaling");
- if(scaling == nullptr)
- {
- ret = "aspect_fit";
- }
- else
- {
- ret = scaling;
- }
- }
- return ret;
-}
-
-/*
- ***** Private Functions *****
- */
-
-WMError WMConfig::loadSetting(const string &path)
-{
- string setting_path = path;
- int iret = -1;
- WMError ret = SUCCESS;
-
- if (setting_path.length() != 0)
- {
- setting_path = path + string("/etc/setting.json");
- iret = jh::inputJsonFilie(setting_path.c_str(), &this->j_setting_conf);
- if (iret < 0)
- ret = FAIL;
- }
-
- return ret;
-}
-
-} // namespace wm
+++ /dev/null
-/*
- * 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.
- */
-
-#ifndef WM_CONFIG_HPP
-#define WM_CONFIG_HPP
-#include <string>
-#include "wm_error.hpp"
-
-struct json_object;
-
-namespace wm
-{
-
-class WMConfig {
-public:
- WMConfig();
- ~WMConfig();
- WMConfig(const WMConfig &) = delete;
- WMConfig &operator=(const WMConfig &) = delete;
- WMError loadConfigs();
- const std::string getConfigAspect();
-
- private:
- WMError loadSetting(const std::string &path);
- // private variable
- json_object *j_setting_conf;
-};
-
-} // namespace wm
-#endif // WM_CONFIG_HPP
\ No newline at end of file
Code Review / apps / agl-service-windowmanager-2017.git / commitdiff