From 5f9be1b9c8e6a4b6d25d64e6f5ec28deb0525854 Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Wed, 14 Nov 2018 12:39:54 +0900 Subject: Add windowmanager-service and libraries Add windowmanager-service and libraries. Change-Id: I838b149ee8a62c0dbc6cb98e1fe8e45929e19140 Signed-off-by: zheng_wenlong --- demo3/common/libqtwindowmanager/LICENSE | 177 +++++++++++++++++++++ .../libqtwindowmanager/qlibwindowmanager.pro | 17 ++ .../libqtwindowmanager/src/qlibwindowmanager.cpp | 126 +++++++++++++++ .../libqtwindowmanager/src/qlibwindowmanager.h | 131 +++++++++++++++ demo3/common/libqtwindowmanager/src/src.pro | 41 +++++ 5 files changed, 492 insertions(+) create mode 100644 demo3/common/libqtwindowmanager/LICENSE create mode 100644 demo3/common/libqtwindowmanager/qlibwindowmanager.pro create mode 100644 demo3/common/libqtwindowmanager/src/qlibwindowmanager.cpp create mode 100644 demo3/common/libqtwindowmanager/src/qlibwindowmanager.h create mode 100644 demo3/common/libqtwindowmanager/src/src.pro (limited to 'demo3/common/libqtwindowmanager') diff --git a/demo3/common/libqtwindowmanager/LICENSE b/demo3/common/libqtwindowmanager/LICENSE new file mode 100644 index 0000000..f433b1a --- /dev/null +++ b/demo3/common/libqtwindowmanager/LICENSE @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS diff --git a/demo3/common/libqtwindowmanager/qlibwindowmanager.pro b/demo3/common/libqtwindowmanager/qlibwindowmanager.pro new file mode 100644 index 0000000..e5e3fe9 --- /dev/null +++ b/demo3/common/libqtwindowmanager/qlibwindowmanager.pro @@ -0,0 +1,17 @@ +# +# 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. + +TEMPLATE = subdirs +SUBDIRS = src \ No newline at end of file diff --git a/demo3/common/libqtwindowmanager/src/qlibwindowmanager.cpp b/demo3/common/libqtwindowmanager/src/qlibwindowmanager.cpp new file mode 100644 index 0000000..fff99c4 --- /dev/null +++ b/demo3/common/libqtwindowmanager/src/qlibwindowmanager.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 "qlibwindowmanager.h" +#include +#include +#include +#include + +using namespace std; + +int QLibWindowmanager::init(int port, const QString &token) { + string ctoken = token.toStdString(); + int ret_init = this->wm->init(port, ctoken); + + this->screen_info = new AGLScreenInfoPrivate; + + if(ret_init == 0) { + struct Screen scrn = this->wm->getScreenInfo(); + this->screen_info->set_width_dp(scrn.width_dp); + this->screen_info->set_height_dp(scrn.height_dp); + this->screen_info->set_width_mm(scrn.width_mm); + this->screen_info->set_height_mm(scrn.height_mm); + this->screen_info->set_scale_factor(scrn.scale); + } + + return ret_init; +} + +int QLibWindowmanager::requestSurface(const QString &role) { + this->graphic_role = role.toStdString(); + int surface_id = this->wm->requestSurface(this->graphic_role.c_str()); + if(surface_id < 0){ + qDebug("failed to get surfaceID"); + return -1; + } + else{ + qDebug("surfaceID is set to %d", surface_id); + char buf[65]; // surface id is under 64bit(1.84E19,) so 65 is sufficient for buffer + snprintf(buf, 65, "%d", surface_id); + setenv("QT_IVI_SURFACE_ID", buf, 1); + return 0; + } +} + +int QLibWindowmanager::activateWindow(const QString &role) { + string srole = role.toStdString(); + // Request default drawing area "normal.full" in libwindowmanager + return this->wm->activateWindow(srole.c_str()); +} + +int QLibWindowmanager::activateWindow(const QString &role, const QString &area) { + string srole = role.toStdString(); + string sarea = area.toStdString(); + return this->wm->activateWindow(srole.c_str(), sarea.c_str()); +} + +int QLibWindowmanager::deactivateWindow(const QString &role) { + string srole = role.toStdString(); + return this->wm->deactivateWindow(srole.c_str()); +} + +// This API is deprecated, please use new API +int QLibWindowmanager::activateSurface(const QString &role) { + return this->activateWindow(role); +} + +// This API is deprecated, please use new API +int QLibWindowmanager::activateSurface(const QString &role, const QString &area) { + return this->activateWindow(role, area); +} + +// This API is deprecated, please use new API +int QLibWindowmanager::deactivateSurface(const QString &role) { + return this->deactivateWindow(role); +} + +int QLibWindowmanager::endDraw(const QString &role) { + string srole = role.toStdString(); + return this->wm->endDraw(srole.c_str()); + } + +void QLibWindowmanager::set_event_handler(enum QEventType et, + handler_fun f) { + LibWindowmanager::EventType wet = (LibWindowmanager::EventType)et; + return this->wm->set_event_handler(wet, std::move(f)); +} + +void QLibWindowmanager::slotActivateWindow(){ + // This is needed for first rendering when the app is launched + if(!isActive){ + qDebug("Let's show %s", qPrintable(this->graphic_role.c_str())); + isActive = true; + this->activateWindow(this->graphic_role.c_str()); + } +} + +// This API is deprecated, please use new API +void QLibWindowmanager::slotActivateSurface(){ + this->slotActivateWindow(); +} + +QLibWindowmanager::QLibWindowmanager(QObject *parent) + :QObject(parent), isActive(false), screen_info(nullptr) +{ + wm = new LibWindowmanager(); +} + +QLibWindowmanager::~QLibWindowmanager() +{ + delete wm; + delete screen_info; +} \ No newline at end of file diff --git a/demo3/common/libqtwindowmanager/src/qlibwindowmanager.h b/demo3/common/libqtwindowmanager/src/qlibwindowmanager.h new file mode 100644 index 0000000..b736e07 --- /dev/null +++ b/demo3/common/libqtwindowmanager/src/qlibwindowmanager.h @@ -0,0 +1,131 @@ +/* + * 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 QLIBWINDOWMANAGER_H +#define QLIBWINDOWMANAGER_H +#include +#include +#include +#include + +class AGLScreenInfo : public QObject +{ + Q_OBJECT + + public: + AGLScreenInfo(double scale = 1.0) { _scale_factor = scale; }; + + Q_INVOKABLE double scale_factor() const { return _scale_factor; }; + + private: + double _scale_factor; +}; + +class AGLScreenInfoPrivate +{ + public: + unsigned long width_dp(void) const { return _width_dp; }; + unsigned long height_dp(void) const { return _height_dp; }; + unsigned long width_mm(void) const { return _width_mm; }; + unsigned long height_mm(void) const { return _height_mm; }; + double scale_factor(void) const { return _scale; }; + + void set_width_dp(unsigned long w) { _width_dp = w; }; + void set_height_dp(unsigned long h) { _height_dp = h; }; + void set_width_mm(unsigned long w) { _width_mm = w; }; + void set_height_mm(unsigned long h) { _height_mm = h; }; + void set_scale_factor(double scale) { _scale = scale; }; + + private: + unsigned long _width_dp; + unsigned long _height_dp; + unsigned long _width_mm; + unsigned long _height_mm; + double _scale = 1.0; +}; + +class QLibWindowmanager : public QObject{ +Q_OBJECT +public: + explicit QLibWindowmanager(QObject *parent = nullptr); + ~QLibWindowmanager(); + + QLibWindowmanager(const QLibWindowmanager &) = delete; + QLibWindowmanager &operator=(const QLibWindowmanager &) = delete; + +public: + using handler_fun = std::function; + + enum QEventType { + Event_Active = LibWindowmanager::Event_Active, + Event_Inactive, + + Event_Visible, + Event_Invisible, + + Event_SyncDraw, + Event_FlushDraw, + + Event_ScreenUpdated, + + Event_HeadlampOff, + Event_HeadlampOn, + + Event_ParkingBrakeOff, + Event_ParkingBrakeOn, + + Event_LightstatusBrakeOff, + Event_LightstatusBrakeOn, + + Event_CarStop, + Event_CarRun, + + Event_Error, + + Event_Val_Max = Event_Error + }; + + int init(int port, const QString &token); + + // WM API + Q_INVOKABLE int requestSurface(const QString &role); + Q_INVOKABLE int activateWindow(const QString &role); + Q_INVOKABLE int activateWindow(const QString &role, const QString &drawing_area); + Q_INVOKABLE int deactivateWindow(const QString &role); + Q_INVOKABLE int endDraw(const QString &role); + + void set_event_handler(enum QEventType et, handler_fun f); + + double get_scale_factor() const { return screen_info->scale_factor(); }; + + // These APIs are deprecated, please use new API + THIS_FUNCTION_IS_DEPRECATED(Q_INVOKABLE int activateSurface(const QString &role)); + THIS_FUNCTION_IS_DEPRECATED(Q_INVOKABLE int activateSurface(const QString &role, const QString &drawing_area)); + THIS_FUNCTION_IS_DEPRECATED(Q_INVOKABLE int deactivateSurface(const QString &role)); + +public slots: + void slotActivateWindow(); + + // This API is deprecated, please use new API + THIS_FUNCTION_IS_DEPRECATED(void slotActivateSurface()); + +private: + LibWindowmanager* wm; + std::string graphic_role; + bool isActive; + AGLScreenInfoPrivate* screen_info; +}; +#endif // LIBWINDOWMANAGER_H diff --git a/demo3/common/libqtwindowmanager/src/src.pro b/demo3/common/libqtwindowmanager/src/src.pro new file mode 100644 index 0000000..a1c0203 --- /dev/null +++ b/demo3/common/libqtwindowmanager/src/src.pro @@ -0,0 +1,41 @@ +# +# 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. + +TEMPLATE = lib +VERSION = 0.1.0 +TARGET = qtwindowmanager + +HEADERS = qlibwindowmanager.h +SOURCES = qlibwindowmanager.cpp + +headers.path = /usr/include +headers.files = qlibwindowmanager.h + +target.path = /usr/lib + +CONFIG += link_pkgconfig create_pc create_prl no_install_prl + +PKGCONFIG += libwindowmanager + +QMAKE_PKGCONFIG_NAME = qlibwindowmanager +QMAKE_PKGCONFIG_FILE = $${QMAKE_PKGCONFIG_NAME} +QMAKE_PKGCONFIG_VERSION = $${VERSION} +QMAKE_PKGCONFIG_DESCRIPTION = A wrapper interface for libwindowmanager for Qt +QMAKE_PKGCONFIG_LIBDIR = ${prefix}/lib +QMAKE_PKGCONFIG_INCDIR = ${prefix}/include +QMAKE_PKGCONFIG_REQUIRES = libwindowmanager +QMAKE_PKGCONFIG_DESTDIR = pkgconfig + +INSTALLS += target headers -- cgit 1.2.3-korg