diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/app.pro | 3 | ||||
| -rw-r--r-- | app/main.cpp | 55 |
2 files changed, 45 insertions, 13 deletions
diff --git a/app/app.pro b/app/app.pro index 52bd496..9bdcaab 100644 --- a/app/app.pro +++ b/app/app.pro @@ -3,6 +3,9 @@ QT = quickcontrols2 SOURCES = main.cpp +CONFIG += link_pkgconfig +PKGCONFIG += libhomescreen qlibwindowmanager + RESOURCES += \ mediaplayer.qrc \ images/images.qrc diff --git a/app/main.cpp b/app/main.cpp index c3e0fb0..145d9d1 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2017 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,21 +25,13 @@ #include <QtQml/QQmlContext> #include <QtQml/qqml.h> #include <QtQuickControls2/QQuickStyle> - -#ifdef HAVE_LIBHOMESCREEN +#include <QQuickWindow> #include <libhomescreen.hpp> -#endif +#include <qlibwindowmanager.h> 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("MediaPlayer"); QGuiApplication app(argc, argv); @@ -67,9 +60,45 @@ int main(int argc, char *argv[]) query.addQueryItem(QStringLiteral("token"), secret); bindingAddress.setQuery(query); context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress); - } + 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); + }); - engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml"))); + // 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:/MediaPlayer.qml"))); + QObject *root = engine.rootObjects().first(); + QQuickWindow *window = qobject_cast<QQuickWindow *>(root); + QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface() + )); + } return app.exec(); } |