X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=94b46ad5deabf62df0db8256e6a501fa78b5bc4c;hb=8e822732230d9a0498cd581dd5bb53bfa7e029a1;hp=57c731e8152343e9d5cbed30af1b9aed771966cd;hpb=4f843a3f37537aa9a3969c7cb33eb429ddeb5ddd;p=apps%2Fhvac.git

diff --git a/app/main.cpp b/app/main.cpp
index 57c731e..94b46ad 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -14,91 +14,59 @@
  * limitations under the License.
  */
 
-#include <QtCore/QDebug>
-#include <QtCore/QCommandLineParser>
-#include <QtCore/QUrlQuery>
 #include <QtGui/QGuiApplication>
+#include <QDebug>
+#include <QUrlQuery>
+#include <QCommandLineParser>
 #include <QtQml/QQmlApplicationEngine>
+#include <hvac.h>
 #include <QtQml/QQmlContext>
-#include <QtQuickControls2/QQuickStyle>
-#include <QQuickWindow>
-#include <libhomescreen.hpp>
-#include <qlibwindowmanager.h>
+
+#include "translator.h"
 
 int main(int argc, char *argv[])
 {
-    QString myname = QString("HVAC");
+	setenv("QT_QPA_PLATFORM", "wayland", 1);
+	int port;
+	QString token;
 
-    QGuiApplication app(argc, argv);
-    app.setApplicationVersion(QStringLiteral("0.1.0"));
-    app.setOrganizationDomain(QStringLiteral("automotivelinux.org"));
-    app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux"));
+	QCommandLineParser parser;
+	QGuiApplication app(argc, argv);
 
-    QQuickStyle::setStyle("AGL");
+	parser.addPositionalArgument("port",
+		app.translate("main", "port for binding"));
+	parser.addPositionalArgument("secret",
+		app.translate("main", "secret for binding"));
 
-    QCommandLineParser parser;
-    parser.addPositionalArgument("port", app.translate("main", "port for binding"));
-    parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));
-    parser.addHelpOption();
-    parser.addVersionOption();
-    parser.process(app);
-    QStringList positionalArguments = parser.positionalArguments();
+        parser.addHelpOption();
+        parser.addVersionOption();
+        parser.process(app);
+        QStringList positionalArguments = parser.positionalArguments();
 
-    QQmlApplicationEngine engine;
-    if (positionalArguments.length() == 2) {
-        int port = positionalArguments.takeFirst().toInt();
-        QString secret = positionalArguments.takeFirst();
-        QUrl bindingAddress;
-        bindingAddress.setScheme(QStringLiteral("ws"));
-        bindingAddress.setHost(QStringLiteral("localhost"));
-        bindingAddress.setPort(port);
-        bindingAddress.setPath(QStringLiteral("/api"));
-        QUrlQuery query;
-        query.addQueryItem(QStringLiteral("token"), secret);
-        bindingAddress.setQuery(query);
-        QQmlContext *context = engine.rootContext();
-        context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
+	if (positionalArguments.length() == 2) {
+		port = positionalArguments.takeFirst().toInt();
+		token = positionalArguments.takeFirst();
+		qInfo() << "setting port:" << port << ", token:" << token;
+	} else {
+		qInfo() << "Need to specify port and token";
+		exit(EXIT_FAILURE);
+	}
 
-        std::string token = secret.toStdString();
-        LibHomeScreen* hs = new LibHomeScreen();
-        QLibWindowmanager* qwm = new QLibWindowmanager();
+	QUrl bindingAddress;
+	bindingAddress.setScheme(QStringLiteral("ws"));
+	bindingAddress.setHost(QStringLiteral("localhost"));
+	bindingAddress.setPort(port);
+	bindingAddress.setPath(QStringLiteral("/api"));
 
-        // 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 callbnewack 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);
-        });
+	QUrlQuery query;
+	query.addQueryItem(QStringLiteral("token"), token);
+	bindingAddress.setQuery(query);
 
-        // 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);
-                }
-            }
-        });
+	QQmlApplicationEngine engine;
+	engine.rootContext()->setContextProperty("bindingAddress", bindingAddress);
+        engine.rootContext()->setContextProperty("hvac", new HVAC(bindingAddress));
+	qmlRegisterType<Translator>("Translator", 1, 0, "Translator");
+	engine.load(QUrl(QStringLiteral("qrc:/HVAC.qml")));
 
-        engine.load(QUrl(QStringLiteral("qrc:/HVAC.qml")));
-        QObject *root = engine.rootObjects().first();
-        QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-        QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()
-        ));
-    }
-    return app.exec();
+	return app.exec();
 }
-