Fixes and rework to allow using with cluster demo

Changes include:
- Remove older libhomescreen and qlibwindowmanager detection and
  configuration from qmake configuration in favor of PKGCONFIG
  usage.
- Rework main.cpp to look more like ondemandnavi, and use
  qlibhomescreen instead of libhomescreen.
- Update file_operation.{h,cpp} with the newer versions from
  ondemandnavi that include OSM configuration.
- Fixed typo in arrived signal name in org.agl.naviapi.xml and
  dbus_client.cpp.
- Change some qDebug messages in dbus_client.cpp to qWarning as it
  seems more appropriate.
- Rework QtLocation plugin configuration in MapWindow.qml to
  support OSM and replace mapboxgl with mapbox, as mapboxgl does not
  seem to work out of the box.
- Tweak various things in MapWindow.qml to try to better match the
  look of ondemandnavi.
- Many commenting and whitespace fixes in MapWindow.qml.
- Update widget config.xml to add now required display permission,
  and add the hidden permission so the application will not show up
  in the launcher.
- Add license files for the various header files in include/mapbox,
  and update README.md to indicate where they come from and what
  files the different licenses apply to.

Bug-AGL: SPEC-2913

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I192efd45ab94ace8234dbe6c8983257a24e51d23

1 files changed, 82 insertions, 109 deletions

diff --git a/app/main.cpp b/app/main.cpp
index 6194c25..d82ca24 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -4,123 +4,96 @@
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QUrlQuery>
 #include <QtGui/QGuiApplication>
+#include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
 #include <QtQuick/QQuickWindow>
 #include <QtDBus/QDBusConnection>
+#include <qlibwindowmanager.h>
+#include <qlibhomescreen.h>
 
 #include "qcheapruler.hpp"
 #include "dbus_client.h"
 #include "file_operation.h"
 
-#ifdef HAVE_LIBHOMESCREEN
-#include <libhomescreen.hpp>
-#endif
-#ifdef HAVE_QLIBWINDOWMANAGER
-#include <qlibwindowmanager.h>
-#endif
-
 int main(int argc, char *argv[])
 {
-    if (!QDBusConnection::sessionBus().isConnected()) {
-        qWarning("Cannot connect to the D-Bus session bus.\n"
-                 "Please check your system settings and try again.\n");
-        return 1;
-    }
-
-    QString myname = QString("tbtnavi");
-
-    QGuiApplication app(argc, argv);
-    app.setApplicationName(myname);
-    app.setApplicationVersion(QStringLiteral("0.1.0"));
-    app.setOrganizationDomain(QStringLiteral("automotivelinux.org"));
-    app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux"));
-
-    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();
-
-    QQmlApplicationEngine engine;
-    int port = 0;
-    QString secret;
-    if (positionalArguments.length() == 2) {
-        port = positionalArguments.takeFirst().toInt();
-        secret = positionalArguments.takeFirst();
-    }
-
-#ifdef HAVE_QLIBWINDOWMANAGER
-    // WindowManager
-    QLibWindowmanager* qwm = new QLibWindowmanager();
-    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);
-    }
-#endif
-
-#ifdef HAVE_LIBHOMESCREEN
-    // HomeScreen
-    LibHomeScreen* hs = new LibHomeScreen();
-    std::string token = secret.toStdString();
-    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(QString::compare(myname, appname, Qt::CaseInsensitive) == 0)
-            {
-                qDebug("Surface %s got tapShortcut\n", appname);
-                json_object *para, *area;
-                json_object_object_get_ex(object, "parameter", &para);
-                json_object_object_get_ex(para, "area", &area);
-                const char *displayArea = json_object_get_string(area);
-                qDebug("Surface %s got tapShortcut area\n", displayArea);
-//                qwm->activateWindow(myname, QString(QLatin1String(displayArea)));
-                qwm->activateWindow(myname, "master.split.sub");
-            }
-        }
-    });
-#endif
-    qmlRegisterType<QCheapRuler>("com.mapbox.cheap_ruler", 1, 0, "CheapRuler");
-
-    File_Operation file;
-    engine.rootContext()->setContextProperty("fileOperation", &file);
-
-    engine.load(QUrl(QStringLiteral("qrc:qml/Main.qml")));
-
-    QObject *root = engine.rootObjects().first();
-    QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-
-    //make the DBus connection info
-    QString pathBase = "org.agl.";
-    QString objBase = "/org/agl/";
-    QString	serverName = "naviapi";
-    QObject *mapWindow = root->findChild<QObject*>("mapwindow");
-    dbus_client dbus(pathBase, objBase, serverName, mapWindow);
-
-#ifdef HAVE_QLIBWINDOWMANAGER
-//    QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
-    // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
-    qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [root, qwm, myname](json_object *object) {
-        fprintf(stderr, "Surface got syncDraw!\n");
-        qwm->endDraw(myname);
-    });
-    // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
-    qwm->set_event_handler(QLibWindowmanager::Event_Active, [root](json_object *object) {
-        fprintf(stderr, "Surface got Event_Active!\n");
-    });
-#else
-    window->resize(1024, 768);
-    window->setVisible(true);
-#endif
-
-    return app.exec();
+	QString graphic_role = QString("tbtnavi");
+
+	if (!QDBusConnection::sessionBus().isConnected()) {
+		qWarning("Cannot connect to the D-Bus session bus.\n"
+			 "Please check your system settings and try again.\n");
+		return 1;
+	}
+
+	QGuiApplication app(argc, argv);
+	QCoreApplication::setOrganizationDomain("automotivelinux.org");
+	QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
+	QCoreApplication::setApplicationName(graphic_role);
+	QCoreApplication::setApplicationVersion("0.1.0");
+
+	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();
+
+	int port = 0;
+	QString token;
+	if (positionalArguments.length() == 2) {
+		port = positionalArguments.takeFirst().toInt();
+		token = positionalArguments.takeFirst();
+	}
+	fprintf(stderr, "[tbtnavi] app_name: %s, port: %d, token: %s.\n",
+		graphic_role.toStdString().c_str(),
+		port,
+		token.toStdString().c_str());
+
+	// QLibWM
+	QLibWindowmanager* qwmHandler = new QLibWindowmanager();
+	int res;
+	if((res = qwmHandler->init(port,token)) != 0){
+		fprintf(stderr, "[tbtnavi] init qlibwm err(%d)\n", res);
+		return -1;
+	}
+	if((res = qwmHandler->requestSurface(graphic_role)) != 0) {
+		fprintf(stderr, "[tbtnavi] request surface err(%d)\n", res);
+		return -1;
+	}
+	qwmHandler->set_event_handler(QLibWindowmanager::Event_SyncDraw,
+				      [qwmHandler, &graphic_role](json_object *object) {
+					      qwmHandler->endDraw(graphic_role);
+				      });
+
+	// QLibHS
+	QLibHomeScreen* qhsHandler = new QLibHomeScreen();
+	qhsHandler->init(port, token.toStdString().c_str());
+	qhsHandler->set_event_handler(QLibHomeScreen::Event_ShowWindow,
+				      [qwmHandler, &graphic_role](json_object *object){
+					      qDebug("Surface %s got showWindow\n", graphic_role.toStdString().c_str());
+					      qwmHandler->activateWindow(graphic_role);
+				      });
+
+	// Load qml
+	QQmlApplicationEngine engine;
+
+	qmlRegisterType<QCheapRuler>("com.mapbox.cheap_ruler", 1, 0, "CheapRuler");
+
+	File_Operation file;
+	engine.rootContext()->setContextProperty("fileOperation", &file);
+
+	engine.load(QUrl(QStringLiteral("qrc:qml/Main.qml")));
+	QObject *root = engine.rootObjects().first();
+	QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
+	QObject::connect(window, SIGNAL(frameSwapped()), qwmHandler, SLOT(slotActivateWindow()));
+
+	// Make the DBus connection info
+	QString pathBase = "org.agl.";
+	QString objBase = "/org/agl/";
+	QString serverName = "naviapi";
+	QObject *mapWindow = root->findChild<QObject*>("mapwindow");
+	dbus_client dbus(pathBase, objBase, serverName, mapWindow);
+
+	return app.exec();
 }