From 0602a4156ef549a2a229ba32b141f508230b43ad Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Thu, 31 May 2018 19:26:01 +0900 Subject: Rename windowmanager-client Change-Id: I601f0b542d530b1b72198b56b8bd98322836e469 Signed-off-by: Kazumasa Mitsunari --- src/CMakeLists.txt | 2 +- src/app.cpp | 2 +- src/applist.hpp | 2 +- src/windowmanager-client.cpp | 126 ------------------------------------------- src/windowmanager-client.hpp | 62 --------------------- src/wm-client.cpp | 126 +++++++++++++++++++++++++++++++++++++++++++ src/wm-client.hpp | 62 +++++++++++++++++++++ test/test.cpp | 2 +- 8 files changed, 192 insertions(+), 192 deletions(-) delete mode 100644 src/windowmanager-client.cpp delete mode 100644 src/windowmanager-client.hpp create mode 100644 src/wm-client.cpp create mode 100644 src/wm-client.hpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f2ae36b..f811be3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -44,7 +44,7 @@ add_library(${TARGETS_WM} MODULE config.cpp config.hpp policy.hpp - windowmanager-client.cpp + wm-client.cpp applist.cpp request.cpp) diff --git a/src/app.cpp b/src/app.cpp index 00f391a..be53808 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -35,7 +35,7 @@ #include #include -#include "windowmanager-client.hpp" +#include "wm-client.hpp" #include "applist.hpp" extern "C" diff --git a/src/applist.hpp b/src/applist.hpp index d2a5971..241f153 100644 --- a/src/applist.hpp +++ b/src/applist.hpp @@ -21,7 +21,7 @@ #include #include //#include -#include "windowmanager-client.hpp" +#include "wm-client.hpp" #include "request.hpp" namespace wm diff --git a/src/windowmanager-client.cpp b/src/windowmanager-client.cpp deleted file mode 100644 index 1bda793..0000000 --- a/src/windowmanager-client.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/* - * 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 "windowmanager-client.hpp" -#include "hmi-debug.h" - -#define INVALID_SURFACE_ID 0 - -using std::string; -using std::vector; - -namespace wm -{ - - -const vector wm_events = { - // Private event for applications - "syncDraw", "flushDraw", "visible", "invisible", "active", "inactive", "error"}; - -static const char key_drawing_name[] = "drawing_name"; -static const char key_role[] = "role"; - -WMClient::WMClient(const string &appid, unsigned layerID, unsigned surfaceID, const string &role) - : layer(layerID), - id(appid), - role2surface(0) -{ - role2surface[role] = surfaceID; - for (auto x : wm_events) - { -#if GTEST_ENABLED - string ev = x; -#else - afb_event ev = afb_daemon_make_event(x.c_str()); -#endif - event_list[x] = ev; - } -} - -WMClient::WMClient(const string &appid, const string &role) - : id(appid), - layer(0), - role2surface(0), - event_list(0) -{ - role2surface[role] = INVALID_SURFACE_ID; - for (auto x : wm_events) - { -#if GTEST_ENABLED - string ev = x; -#else - afb_event ev = afb_daemon_make_event(x.c_str()); -#endif - event_list[x] = ev; - } -} - -WMClient::~WMClient() -{ -} - -string WMClient::appID() -{ - return this->id; -} - -void WMClient::registerLayer(unsigned layerID) -{ - this->layer = layerID; -} - -bool WMClient::addSurface(const string &role, unsigned surface) -{ - HMI_DEBUG("wm", "Add role %s with surface %d", role.c_str(), surface); - if(0 != role2surface.count(role)){ - HMI_NOTICE("wm", "override surfaceID %d with %d", role2surface[role], surface); - } - role2surface[role] = surface; - return true; -} - -bool WMClient::removeSurfaceIfExist(unsigned surfaceID){ - bool ret = false; - for (auto &x : role2surface) - { - if(surfaceID == x.second){ - role2surface.erase(x.first); - ret = true; - break; - } - } - return ret; -} - -bool WMClient::removeRole(const string& role){ - bool ret = false; - if (role2surface.count(role) != 0) - { - role2surface.erase(role); - ret = true; - } - return ret; -} - -void WMClient::dumpInfo(){ - DUMP("APPID : %s", id.c_str()); - DUMP(" LAYER : %d", layer); - for(const auto& x : role2surface){ - DUMP(" ROLE : %s , SURFACE : %d", x.first.c_str(), x.second); - } -} - -} // namespace wm \ No newline at end of file diff --git a/src/windowmanager-client.hpp b/src/windowmanager-client.hpp deleted file mode 100644 index 33024b0..0000000 --- a/src/windowmanager-client.hpp +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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 WINDOWMANAGER_CLIENT_HPP -#define WINDOWMANAGER_CLIENT_HPP - -#include -#include -#include - -extern "C" -{ -#define AFB_BINDING_VERSION 2 -#include -} - -namespace wm -{ - -class WMClient -{ - public: - WMClient(); - WMClient(const std::string &appid, unsigned layerID, unsigned surfaceID, const std::string &role); - WMClient(const std::string &appid, const std::string &role); - virtual ~WMClient(); - - std::string appID(); - void registerLayer(unsigned layerID); - bool addSurface(const std::string& role, unsigned surface); - bool removeSurfaceIfExist(unsigned surfaceID); - bool removeRole(const std::string& role); - - void dumpInfo(); - - private: - unsigned layer; - std::string id; - std::unordered_map role2surface; -#if GTEST_ENABLED - // This is for unit test. afb_make_event occurs sig11 if call not in afb-binding - std::unordered_map event_list; -#else - std::unordered_map event_list; -#endif -}; -} // namespace wm - -#endif \ No newline at end of file diff --git a/src/wm-client.cpp b/src/wm-client.cpp new file mode 100644 index 0000000..4e0ff01 --- /dev/null +++ b/src/wm-client.cpp @@ -0,0 +1,126 @@ +/* + * 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 "wm-client.hpp" +#include "hmi-debug.h" + +#define INVALID_SURFACE_ID 0 + +using std::string; +using std::vector; + +namespace wm +{ + + +const vector wm_events = { + // Private event for applications + "syncDraw", "flushDraw", "visible", "invisible", "active", "inactive", "error"}; + +static const char key_drawing_name[] = "drawing_name"; +static const char key_role[] = "role"; + +WMClient::WMClient(const string &appid, unsigned layerID, unsigned surfaceID, const string &role) + : layer(layerID), + id(appid), + role2surface(0) +{ + role2surface[role] = surfaceID; + for (auto x : wm_events) + { +#if GTEST_ENABLED + string ev = x; +#else + afb_event ev = afb_daemon_make_event(x.c_str()); +#endif + event_list[x] = ev; + } +} + +WMClient::WMClient(const string &appid, const string &role) + : id(appid), + layer(0), + role2surface(0), + event_list(0) +{ + role2surface[role] = INVALID_SURFACE_ID; + for (auto x : wm_events) + { +#if GTEST_ENABLED + string ev = x; +#else + afb_event ev = afb_daemon_make_event(x.c_str()); +#endif + event_list[x] = ev; + } +} + +WMClient::~WMClient() +{ +} + +string WMClient::appID() +{ + return this->id; +} + +void WMClient::registerLayer(unsigned layerID) +{ + this->layer = layerID; +} + +bool WMClient::addSurface(const string &role, unsigned surface) +{ + HMI_DEBUG("wm", "Add role %s with surface %d", role.c_str(), surface); + if(0 != role2surface.count(role)){ + HMI_NOTICE("wm", "override surfaceID %d with %d", role2surface[role], surface); + } + role2surface[role] = surface; + return true; +} + +bool WMClient::removeSurfaceIfExist(unsigned surfaceID){ + bool ret = false; + for (auto &x : role2surface) + { + if(surfaceID == x.second){ + role2surface.erase(x.first); + ret = true; + break; + } + } + return ret; +} + +bool WMClient::removeRole(const string& role){ + bool ret = false; + if (role2surface.count(role) != 0) + { + role2surface.erase(role); + ret = true; + } + return ret; +} + +void WMClient::dumpInfo(){ + DUMP("APPID : %s", id.c_str()); + DUMP(" LAYER : %d", layer); + for(const auto& x : role2surface){ + DUMP(" ROLE : %s , SURFACE : %d", x.first.c_str(), x.second); + } +} + +} // namespace wm \ No newline at end of file diff --git a/src/wm-client.hpp b/src/wm-client.hpp new file mode 100644 index 0000000..33024b0 --- /dev/null +++ b/src/wm-client.hpp @@ -0,0 +1,62 @@ +/* + * 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 WINDOWMANAGER_CLIENT_HPP +#define WINDOWMANAGER_CLIENT_HPP + +#include +#include +#include + +extern "C" +{ +#define AFB_BINDING_VERSION 2 +#include +} + +namespace wm +{ + +class WMClient +{ + public: + WMClient(); + WMClient(const std::string &appid, unsigned layerID, unsigned surfaceID, const std::string &role); + WMClient(const std::string &appid, const std::string &role); + virtual ~WMClient(); + + std::string appID(); + void registerLayer(unsigned layerID); + bool addSurface(const std::string& role, unsigned surface); + bool removeSurfaceIfExist(unsigned surfaceID); + bool removeRole(const std::string& role); + + void dumpInfo(); + + private: + unsigned layer; + std::string id; + std::unordered_map role2surface; +#if GTEST_ENABLED + // This is for unit test. afb_make_event occurs sig11 if call not in afb-binding + std::unordered_map event_list; +#else + std::unordered_map event_list; +#endif +}; +} // namespace wm + +#endif \ No newline at end of file diff --git a/test/test.cpp b/test/test.cpp index 716f0ef..a4e630c 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -3,7 +3,7 @@ #include #include #include "applist.hpp" -#include "windowmanager-client.hpp" +#include "wm-client.hpp" // テストグループの定義 TEST_GROUP(group) // フィクスチャの準備 -- cgit 1.2.3-korg