3 files changed, 47 insertions, 21 deletions

diff --git a/app/app.pri b/app/app.pri
index 014646f..e535cbc 100644
--- a/app/app.pri
+++ b/app/app.pri
@@ -1,12 +1,5 @@
 TEMPLATE = app
 
 load(configure)
-qtCompileTest(libhomescreen)
-
-config_libhomescreen {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += homescreen
-    DEFINES += HAVE_LIBHOMESCREEN
-}
 
 DESTDIR = $${OUT_PWD}/../package/root/bin
diff --git a/app/app.pro b/app/app.pro
index 6e768d5..9599de1 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 += \
     dashboard.qrc \
     images/images.qrc
diff --git a/app/main.cpp b/app/main.cpp
index 1d73689..9649b82 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -21,24 +21,16 @@
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlApplicationEngine>
 #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("Dashboard");
 
     QGuiApplication app(argc, argv);
-    app.setApplicationName(QStringLiteral("Dashboard"));
+    app.setApplicationName(myname);
     app.setApplicationVersion(QStringLiteral("3.99.3"));
     app.setOrganizationDomain(QStringLiteral("automotivelinux.org"));
     app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux"));
@@ -67,9 +59,47 @@ int main(int argc, char *argv[])
         bindingAddress.setQuery(query);
         QQmlContext *context = engine.rootContext();
         context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
-    }
-    engine.load(QUrl(QStringLiteral("qrc:/Dashboard.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:/Dashboard.qml")));
+        QObject *root = engine.rootObjects().first();
+        QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
+        QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()
+        ));
+    }
     return app.exec();
 }