From c19969f65fb1441fea3920f5ab5acae09b37397f Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Sun, 10 Jun 2018 19:12:32 +0900 Subject: Rename files to use "_" instead of "-" Change-Id: I24b7be71af682946a4abde928e8bb46bf5104041 Signed-off-by: Kazumasa Mitsunari --- src/CMakeLists.txt | 4 +- src/app.cpp | 2 +- src/app.hpp | 2 +- src/applist.hpp | 4 +- src/wm-client.cpp | 183 ----------------------------------------------------- src/wm-client.hpp | 72 --------------------- src/wm-error.cpp | 44 ------------- src/wm-error.h | 40 ------------ src/wm_client.cpp | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/wm_client.hpp | 72 +++++++++++++++++++++ src/wm_error.cpp | 44 +++++++++++++ src/wm_error.hpp | 40 ++++++++++++ test/test.cpp | 2 +- 13 files changed, 346 insertions(+), 346 deletions(-) delete mode 100644 src/wm-client.cpp delete mode 100644 src/wm-client.hpp delete mode 100644 src/wm-error.cpp delete mode 100644 src/wm-error.h create mode 100644 src/wm_client.cpp create mode 100644 src/wm_client.hpp create mode 100644 src/wm_error.cpp create mode 100644 src/wm_error.hpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6c39170..597a610 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -44,8 +44,8 @@ add_library(${TARGETS_WM} MODULE config.cpp config.hpp policy.hpp - wm-client.cpp - wm-error.cpp + wm_client.cpp + wm_error.cpp applist.cpp request.cpp) diff --git a/src/app.cpp b/src/app.cpp index 936a8bc..7dbf397 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -36,7 +36,7 @@ #include #include -#include "wm-client.hpp" +#include "wm_client.hpp" extern "C" diff --git a/src/app.hpp b/src/app.hpp index 0816732..c46512f 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -33,7 +33,7 @@ #include "wayland_ivi_wm.hpp" #include "hmi-debug.h" #include "request.hpp" -#include "wm-error.h" +#include "wm_error.hpp" namespace wl { diff --git a/src/applist.hpp b/src/applist.hpp index b25ca19..23d6b5a 100644 --- a/src/applist.hpp +++ b/src/applist.hpp @@ -20,9 +20,9 @@ #include #include #include -#include "wm-client.hpp" +#include "wm_client.hpp" #include "request.hpp" -#include "wm-error.h" +#include "wm_error.hpp" namespace wm { diff --git a/src/wm-client.cpp b/src/wm-client.cpp deleted file mode 100644 index 753b1d0..0000000 --- a/src/wm-client.cpp +++ /dev/null @@ -1,183 +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 -#include "wm-client.hpp" -#include "hmi-debug.h" - -#define INVALID_SURFACE_ID 0 - -using std::string; -using std::vector; - -namespace wm -{ - -const vector kWMEvents = { - // Private event for applications - "syncDraw", "flushDraw", "visible", "invisible", "active", "inactive", "error"}; -const vector kErrorDescription = { - "unknown-error"}; - -static const char kKeyDrawingName[] = "drawing_name"; -static const char kKeyrole[] = "role"; -static const char kKeyError[] = "error"; -static const char kKeyErrorDesc[] = "kErrorDescription"; - -WMClient::WMClient(const string &appid, unsigned layer, unsigned surface, const string &role) - : id(appid), layer(layer), - role2surface(0) -{ - role2surface[role] = surface; - for (auto x : kWMEvents) - { -#if GTEST_ENABLED - string ev = x; -#else - afb_event ev = afb_daemon_make_event(x.c_str()); -#endif - event2list[x] = ev; - } -} - -WMClient::WMClient(const string &appid, const string &role) - : id(appid), - layer(0), - role2surface(0), - event2list(0) -{ - role2surface[role] = INVALID_SURFACE_ID; - for (auto x : kWMEvents) - { -#if GTEST_ENABLED - string ev = x; -#else - afb_event ev = afb_daemon_make_event(x.c_str()); -#endif - event2list[x] = ev; - } -} - -WMClient::~WMClient() -{ -} - -string WMClient::appID() const -{ - return this->id; -} - -unsigned WMClient::surfaceID(const string &role) const -{ - if (0 == this->role2surface.count(role)) - { - HMI_WARNING("wm", "invalid role"); - return INVALID_SURFACE_ID; - } - return this->role2surface.at(role); -} - -unsigned WMClient::layerID() const -{ - return this->layer; -} - -void WMClient::registerLayer(unsigned layer) -{ - this->layer = layer; -} - -bool WMClient::addSurface(const string &role, unsigned surface) -{ - HMI_DEBUG("wm", "Add role %s with surface %d", role.c_str(), surface); - if (0 != this->role2surface.count(role)) - { - HMI_NOTICE("wm", "override surfaceID %d with %d", this->role2surface[role], surface); - } - this->role2surface[role] = surface; - return true; -} - -bool WMClient::removeSurfaceIfExist(unsigned surface) -{ - bool ret = false; - for (auto &x : this->role2surface) - { - if (surface == x.second) - { - this->role2surface.erase(x.first); - ret = true; - break; - } - } - return ret; -} - -bool WMClient::removeRole(const string &role) -{ - bool ret = false; - if (this->role2surface.count(role) != 0) - { - this->role2surface.erase(role); - ret = true; - } - return ret; -} - -bool WMClient::subscribe(afb_req req, const string &evname) -{ - if(evname != kKeyError){ - HMI_DEBUG("wm", "error is only enabeled for now"); - return false; - } - int ret = afb_req_subscribe(req, this->event2list[evname]); - if (ret) - { - HMI_DEBUG("wm", "Failed to subscribe %s", evname.c_str()); - return false; - } - return true; -} - -void WMClient::emitError(WM_CLIENT_ERROR_EVENT ev) -{ - if (!afb_event_is_valid(this->event2list[kKeyError])){ - HMI_ERROR("wm", "event err is not valid"); - return; - } - json_object *j = json_object_new_object(); - json_object_object_add(j, kKeyError, json_object_new_int(ev)); - json_object_object_add(j, kKeyErrorDesc, json_object_new_string(kErrorDescription[ev].c_str())); - HMI_DEBUG("wm", "error: %d, description:%s", ev, kErrorDescription[ev].c_str()); - - int ret = afb_event_push(this->event2list[kKeyError], j); - if (ret != 0) - { - HMI_DEBUG("wm", "afb_event_push failed: %m"); - } -} - -void WMClient::dumpInfo() -{ - DUMP("APPID : %s", id.c_str()); - DUMP(" LAYER : %d", layer); - for (const auto &x : this->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 deleted file mode 100644 index 5fa9444..0000000 --- a/src/wm-client.hpp +++ /dev/null @@ -1,72 +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 -{ - -enum WM_CLIENT_ERROR_EVENT -{ - UNKNOWN_ERROR -}; - -class WMClient -{ - public: - WMClient(); - WMClient(const std::string &appid, unsigned layer, unsigned surface, const std::string &role); - WMClient(const std::string &appid, const std::string &role); - virtual ~WMClient(); - - std::string appID() const; - unsigned surfaceID(const std::string &role) const; - unsigned layerID() const; - void registerLayer(unsigned layer); - bool addSurface(const std::string& role, unsigned surface); - bool removeSurfaceIfExist(unsigned surface); - bool removeRole(const std::string& role); - - bool subscribe(afb_req req, const std::string &event_name); - void emitError(WM_CLIENT_ERROR_EVENT ev); - - void dumpInfo(); - - private: - std::string id; - unsigned layer; - 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 event2list; -#else - std::unordered_map event2list; -#endif -}; -} // namespace wm - -#endif \ No newline at end of file diff --git a/src/wm-error.cpp b/src/wm-error.cpp deleted file mode 100644 index 4b01922..0000000 --- a/src/wm-error.cpp +++ /dev/null @@ -1,44 +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 "wm-error.h" - -namespace wm { - -const char *errorDescription(WMError enum_error_number) -{ - switch (enum_error_number){ - case SUCCESS: - return "Success"; - case FAIL: - return "Request failed"; - case REQ_REJECTED: - return "Request is rejected, due to the policy rejection of the request."; - case REQ_DROPPED: - return "Request is dropped, because the high priority request is done"; - case NOT_REGISTERED: - return "Not registered"; - case TIMEOUT_EXPIRED: - return "Request is dropped, due to time out expiring"; - case LAYOUT_CHANGE_FAIL: - return "Layout change fails, due to some reasons"; - case NO_ENTRY: - return "No element"; - default: - return "Unknown error number. Window manager bug."; - } -} - -} \ No newline at end of file diff --git a/src/wm-error.h b/src/wm-error.h deleted file mode 100644 index 155d791..0000000 --- a/src/wm-error.h +++ /dev/null @@ -1,40 +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 WINDOW_MANAGER_ERROR -#define WINDOW_MANAGER_ERROR - -namespace wm { - -typedef enum WINDOWMANAGER_ERROR -{ - SUCCESS = 0, - FAIL, - REQ_REJECTED, - REQ_DROPPED, - TIMEOUT_EXPIRED, - NOT_REGISTERED, - LAYOUT_CHANGE_FAIL, - NO_ENTRY, - UNKNOWN, - ERR_MAX = UNKNOWN -} -WMError; - -const char *errorDescription(WMError enum_error_number); - -} -#endif // WINDOW_MANAGER_ERROR \ No newline at end of file diff --git a/src/wm_client.cpp b/src/wm_client.cpp new file mode 100644 index 0000000..6f1aa20 --- /dev/null +++ b/src/wm_client.cpp @@ -0,0 +1,183 @@ +/* + * 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 "wm_client.hpp" +#include "hmi-debug.h" + +#define INVALID_SURFACE_ID 0 + +using std::string; +using std::vector; + +namespace wm +{ + +const vector kWMEvents = { + // Private event for applications + "syncDraw", "flushDraw", "visible", "invisible", "active", "inactive", "error"}; +const vector kErrorDescription = { + "unknown-error"}; + +static const char kKeyDrawingName[] = "drawing_name"; +static const char kKeyrole[] = "role"; +static const char kKeyError[] = "error"; +static const char kKeyErrorDesc[] = "kErrorDescription"; + +WMClient::WMClient(const string &appid, unsigned layer, unsigned surface, const string &role) + : id(appid), layer(layer), + role2surface(0) +{ + role2surface[role] = surface; + for (auto x : kWMEvents) + { +#if GTEST_ENABLED + string ev = x; +#else + afb_event ev = afb_daemon_make_event(x.c_str()); +#endif + event2list[x] = ev; + } +} + +WMClient::WMClient(const string &appid, const string &role) + : id(appid), + layer(0), + role2surface(0), + event2list(0) +{ + role2surface[role] = INVALID_SURFACE_ID; + for (auto x : kWMEvents) + { +#if GTEST_ENABLED + string ev = x; +#else + afb_event ev = afb_daemon_make_event(x.c_str()); +#endif + event2list[x] = ev; + } +} + +WMClient::~WMClient() +{ +} + +string WMClient::appID() const +{ + return this->id; +} + +unsigned WMClient::surfaceID(const string &role) const +{ + if (0 == this->role2surface.count(role)) + { + HMI_WARNING("wm", "invalid role"); + return INVALID_SURFACE_ID; + } + return this->role2surface.at(role); +} + +unsigned WMClient::layerID() const +{ + return this->layer; +} + +void WMClient::registerLayer(unsigned layer) +{ + this->layer = layer; +} + +bool WMClient::addSurface(const string &role, unsigned surface) +{ + HMI_DEBUG("wm", "Add role %s with surface %d", role.c_str(), surface); + if (0 != this->role2surface.count(role)) + { + HMI_NOTICE("wm", "override surfaceID %d with %d", this->role2surface[role], surface); + } + this->role2surface[role] = surface; + return true; +} + +bool WMClient::removeSurfaceIfExist(unsigned surface) +{ + bool ret = false; + for (auto &x : this->role2surface) + { + if (surface == x.second) + { + this->role2surface.erase(x.first); + ret = true; + break; + } + } + return ret; +} + +bool WMClient::removeRole(const string &role) +{ + bool ret = false; + if (this->role2surface.count(role) != 0) + { + this->role2surface.erase(role); + ret = true; + } + return ret; +} + +bool WMClient::subscribe(afb_req req, const string &evname) +{ + if(evname != kKeyError){ + HMI_DEBUG("wm", "error is only enabeled for now"); + return false; + } + int ret = afb_req_subscribe(req, this->event2list[evname]); + if (ret) + { + HMI_DEBUG("wm", "Failed to subscribe %s", evname.c_str()); + return false; + } + return true; +} + +void WMClient::emitError(WM_CLIENT_ERROR_EVENT ev) +{ + if (!afb_event_is_valid(this->event2list[kKeyError])){ + HMI_ERROR("wm", "event err is not valid"); + return; + } + json_object *j = json_object_new_object(); + json_object_object_add(j, kKeyError, json_object_new_int(ev)); + json_object_object_add(j, kKeyErrorDesc, json_object_new_string(kErrorDescription[ev].c_str())); + HMI_DEBUG("wm", "error: %d, description:%s", ev, kErrorDescription[ev].c_str()); + + int ret = afb_event_push(this->event2list[kKeyError], j); + if (ret != 0) + { + HMI_DEBUG("wm", "afb_event_push failed: %m"); + } +} + +void WMClient::dumpInfo() +{ + DUMP("APPID : %s", id.c_str()); + DUMP(" LAYER : %d", layer); + for (const auto &x : this->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..5fa9444 --- /dev/null +++ b/src/wm_client.hpp @@ -0,0 +1,72 @@ +/* + * 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 +{ + +enum WM_CLIENT_ERROR_EVENT +{ + UNKNOWN_ERROR +}; + +class WMClient +{ + public: + WMClient(); + WMClient(const std::string &appid, unsigned layer, unsigned surface, const std::string &role); + WMClient(const std::string &appid, const std::string &role); + virtual ~WMClient(); + + std::string appID() const; + unsigned surfaceID(const std::string &role) const; + unsigned layerID() const; + void registerLayer(unsigned layer); + bool addSurface(const std::string& role, unsigned surface); + bool removeSurfaceIfExist(unsigned surface); + bool removeRole(const std::string& role); + + bool subscribe(afb_req req, const std::string &event_name); + void emitError(WM_CLIENT_ERROR_EVENT ev); + + void dumpInfo(); + + private: + std::string id; + unsigned layer; + 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 event2list; +#else + std::unordered_map event2list; +#endif +}; +} // namespace wm + +#endif \ No newline at end of file diff --git a/src/wm_error.cpp b/src/wm_error.cpp new file mode 100644 index 0000000..460b166 --- /dev/null +++ b/src/wm_error.cpp @@ -0,0 +1,44 @@ +/* + * 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_error.hpp" + +namespace wm { + +const char *errorDescription(WMError enum_error_number) +{ + switch (enum_error_number){ + case SUCCESS: + return "Success"; + case FAIL: + return "Request failed"; + case REQ_REJECTED: + return "Request is rejected, due to the policy rejection of the request."; + case REQ_DROPPED: + return "Request is dropped, because the high priority request is done"; + case NOT_REGISTERED: + return "Not registered"; + case TIMEOUT_EXPIRED: + return "Request is dropped, due to time out expiring"; + case LAYOUT_CHANGE_FAIL: + return "Layout change fails, due to some reasons"; + case NO_ENTRY: + return "No element"; + default: + return "Unknown error number. Window manager bug."; + } +} + +} \ No newline at end of file diff --git a/src/wm_error.hpp b/src/wm_error.hpp new file mode 100644 index 0000000..155d791 --- /dev/null +++ b/src/wm_error.hpp @@ -0,0 +1,40 @@ +/* + * 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 WINDOW_MANAGER_ERROR +#define WINDOW_MANAGER_ERROR + +namespace wm { + +typedef enum WINDOWMANAGER_ERROR +{ + SUCCESS = 0, + FAIL, + REQ_REJECTED, + REQ_DROPPED, + TIMEOUT_EXPIRED, + NOT_REGISTERED, + LAYOUT_CHANGE_FAIL, + NO_ENTRY, + UNKNOWN, + ERR_MAX = UNKNOWN +} +WMError; + +const char *errorDescription(WMError enum_error_number); + +} +#endif // WINDOW_MANAGER_ERROR \ No newline at end of file diff --git a/test/test.cpp b/test/test.cpp index a4e630c..46195b6 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -3,7 +3,7 @@ #include #include #include "applist.hpp" -#include "wm-client.hpp" +#include "wm_client.hpp" // テストグループの定義 TEST_GROUP(group) // フィクスチャの準備 -- cgit 1.2.3-korg