summaryrefslogtreecommitdiffstats
path: root/homescreen/src/main.cpp
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-11-22 13:27:35 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2017-11-22 13:27:35 +0000
commit2c179df8e22fd1434c88b8595ddd65ec0ed48622 (patch)
treea695520d513218943271e63b7bb626acaca5350c /homescreen/src/main.cpp
parent2fa542a8c95b196020e5f27f96cbffa7c44e72e9 (diff)
parentbf3c9fb7ae0f39d6df454807dcfaccc97715fbcf (diff)
Merge "Change libwindowmanager to qlibwindowmanager"eel_4.99.3eel/4.99.34.99.3
Diffstat (limited to 'homescreen/src/main.cpp')
-rw-r--r--homescreen/src/main.cpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp
index 45a7c0f..e0850d6 100644
--- a/homescreen/src/main.cpp
+++ b/homescreen/src/main.cpp
@@ -23,7 +23,7 @@
#include <QtQml/qqml.h>
#include <QQuickWindow>
-#include "layouthandler.h"
+#include <qlibwindowmanager.h>
#include "applicationlauncher.h"
#include "statusbarmodel.h"
#include "applicationmodel.h"
@@ -96,8 +96,18 @@ int main(int argc, char *argv[])
qDBusRegisterMetaType<AppInfo>();
qDBusRegisterMetaType<QList<AppInfo> >();
- LayoutHandler* layoutHandler = new LayoutHandler();
- layoutHandler->init(port, token.toStdString().c_str());
+ QLibWindowmanager* layoutHandler = new QLibWindowmanager();
+ if(layoutHandler->init(port,token) != 0){
+ exit(EXIT_FAILURE);
+ }
+
+ if (layoutHandler->requestSurface(QString("HomeScreen")) != 0) {
+ exit(EXIT_FAILURE);
+ }
+
+ layoutHandler->set_event_handler(QLibWindowmanager::Event_SyncDraw, [layoutHandler](json_object *object) {
+ layoutHandler->endDraw(QString("HomeScreen"));
+ });
HomescreenHandler* homescreenHandler = new HomescreenHandler();
homescreenHandler->init(port, token.toStdString().c_str());
@@ -111,7 +121,6 @@ int main(int argc, char *argv[])
QObject *root = engine.rootObjects().first();
QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
QObject::connect(window, SIGNAL(frameSwapped()), layoutHandler, SLOT(slotActivateSurface()));
- QObject::connect(homescreenHandler, SIGNAL(homeButton()), layoutHandler, SLOT(slotHomeButton()));
return a.exec();
}