diff options
author | Scott Murray <scott.murray@konsulko.com> | 2017-11-14 22:35:02 +0900 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2017-11-14 22:35:02 +0900 |
commit | f73b7d3c7a127c488ebb544ee247a8ab0dba7166 (patch) | |
tree | c74d76ed7bb17abcb2589a617b6c4941abed94e3 /app/main.cpp | |
parent | c46a56ac144e7399f2172e56a7a22d46d580c830 (diff) |
Porting to new HMI Frameworkeel_4.99.3eel/4.99.34.99.3
Changes following guidelines given in "Kickstart: New HMI Framework"
document at:
https://wiki.automotivelinux.org/_media/kickstart_apps_migration_guide.pdf
Change-Id: Ia3fc024b1f10acf9aa9dab56cd5336db83089019
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'app/main.cpp')
-rw-r--r-- | app/main.cpp | 59 |
1 files changed, 44 insertions, 15 deletions
diff --git a/app/main.cpp b/app/main.cpp index e430099..1d24a8a 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -23,24 +23,15 @@ #include <QtQml/QQmlApplicationEngine> #include <QtQml/QQmlContext> #include <QtQuickControls2/QQuickStyle> +#include <QQuickWindow> +#include <libhomescreen.hpp> +#include <qlibwindowmanager.h> #include <stdlib.h> #include "PresetDataObject.h" - -#ifdef HAVE_LIBHOMESCREEN -#include <libhomescreen.hpp> -#endif - int main(int argc, char *argv[]) { -#ifdef HAVE_LIBHOMESCREEN - LibHomeScreen libHomeScreen; - - if (!libHomeScreen.renderAppToAreaAllowed(0, 1)) { - qWarning() << "renderAppToAreaAllowed is denied"; - return -1; - } -#endif + QString myname = QString("Radio"); QGuiApplication app(argc, argv); @@ -98,8 +89,46 @@ int main(int argc, char *argv[]) query.addQueryItem(QStringLiteral("token"), secret); bindingAddress.setQuery(query); context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress); - } - engine.load(QUrl(QStringLiteral("qrc:/Radio.qml"))); + std::string token = secret.toStdString(); + LibHomeScreen* hs = new LibHomeScreen(); + QLibWindowmanager* qwm = new QLibWindowmanager(); + + // WindowManager + if(qwm->init(port,secret) != 0){ + exit(EXIT_FAILURE); + } + // Request a surface as described in layers.json windowmanager’s file + if (qwm->requestSurface(myname) != 0) { + exit(EXIT_FAILURE); + } + // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs + qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) { + fprintf(stderr, "Surface got syncDraw!\n"); + qwm->endDraw(myname); + }); + + // HomeScreen + hs->init(port, token.c_str()); + // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager + hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){ + json_object *appnameJ = nullptr; + if(json_object_object_get_ex(object, "application_name", &appnameJ)) + { + const char *appname = json_object_get_string(appnameJ); + if(myname == appname) + { + qDebug("Surface %s got tapShortcut\n", appname); + qwm->activateSurface(myname); + } + } + }); + + engine.load(QUrl(QStringLiteral("qrc:/Radio.qml"))); + QObject *root = engine.rootObjects().first(); + QQuickWindow *window = qobject_cast<QQuickWindow *>(root); + QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface() + )); + } return app.exec(); } |