From 259c66b9ebde64e857f36d8d1d7050bec2e8f41d Mon Sep 17 00:00:00 2001
From: Marius Vlad <marius.vlad@collabora.com>
Date: Wed, 29 Apr 2020 01:21:44 +0300
Subject: agl-compositor: New adaptation to using the agl-shell-desktop proto

Bug-AGL: SPEC-3447

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I3fc7375a7a8716cc1352658cfc194645bf7f638c
---
 launcher/src/main.cpp | 46 +++++++++-------------------------------------
 1 file changed, 9 insertions(+), 37 deletions(-)

(limited to 'launcher/src/main.cpp')

diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp
index 5a44cc7..22e600e 100644
--- a/launcher/src/main.cpp
+++ b/launcher/src/main.cpp
@@ -25,21 +25,24 @@
 #include <QQuickWindow>
 #include <QThread>
 
-#include <qlibwindowmanager.h>
 #include "applicationmodel.h"
 #include "appinfo.h"
 #include "homescreenhandler.h"
 #include "hmi-debug.h"
+#include "shell-desktop.h"
 
 int main(int argc, char *argv[])
 {
     QString myname = QString("launcher");
     QGuiApplication a(argc, argv);
 
-    QCoreApplication::setOrganizationDomain("LinuxFoundation");
-    QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
-    QCoreApplication::setApplicationName(myname);
-    QCoreApplication::setApplicationVersion("0.1.0");
+    //QCoreApplication::setOrganizationDomain("LinuxFoundation");
+    //QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
+    //QCoreApplication::setApplicationName(myname);
+    //QCoreApplication::setApplicationVersion("0.1.0");
+
+    // necessary to identify correctly by app_id
+    a.setDesktopFileName(myname);
 
     QCommandLineParser parser;
     parser.addPositionalArgument("port", a.translate("main", "port for binding"));
@@ -62,23 +65,8 @@ int main(int argc, char *argv[])
     // import C++ class to QML
     qmlRegisterType<ApplicationModel>("AppModel", 1, 0, "ApplicationModel");
 
-    QLibWindowmanager* layoutHandler = new QLibWindowmanager();
-    if(layoutHandler->init(port,token) != 0){
-        exit(EXIT_FAILURE);
-    }
-
-    AGLScreenInfo screenInfo(layoutHandler->get_scale_factor());
-
-    if (layoutHandler->requestSurface(myname) != 0) {
-        exit(EXIT_FAILURE);
-    }
-
-    layoutHandler->set_event_handler(QLibWindowmanager::Event_SyncDraw, [layoutHandler, myname](json_object *object) {
-        layoutHandler->endDraw(myname);
-    });
-
     HomescreenHandler* homescreenHandler = new HomescreenHandler();
-    homescreenHandler->init(port, token.toStdString().c_str(), layoutHandler, myname);
+    homescreenHandler->init(port, token.toStdString().c_str(), myname);
 
     QUrl bindingAddress;
     bindingAddress.setScheme(QStringLiteral("ws"));
@@ -90,27 +78,11 @@ int main(int argc, char *argv[])
     query.addQueryItem(QStringLiteral("token"), token);
     bindingAddress.setQuery(query);
 
-    const QByteArray hack_delay = qgetenv("HMI_LAUNCHER_STARTUP_DELAY");
-    int delay_time = 1;
-
-    if (!hack_delay.isEmpty()) {
-       delay_time = (QString::fromLocal8Bit(hack_delay)).toInt();
-    }
-
-    QThread::sleep(delay_time);
-    qDebug("Sleep %d sec to resolve race condtion between HomeScreen and Launcher", delay_time);
-
     // mail.qml loading
     QQmlApplicationEngine engine;
-    engine.rootContext()->setContextProperty(QStringLiteral("layoutHandler"), layoutHandler);
     engine.rootContext()->setContextProperty(QStringLiteral("homescreenHandler"), homescreenHandler);
-    engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
     engine.load(QUrl(QStringLiteral("qrc:/Launcher.qml")));
     homescreenHandler->getRunnables();
 
-    QObject *root = engine.rootObjects().first();
-    QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-    QObject::connect(window, SIGNAL(frameSwapped()), layoutHandler, SLOT(slotActivateSurface()));
-
     return a.exec();
 }
-- 
cgit 1.2.3-korg