X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fmain.cpp;h=98f6c934988c7da5c8b4760d1da3d35f15b86ff4;hb=09b5eb1b42910e84612a37a0fb44629c73eee3e7;hp=376644f3d55f79bb3215fb69cda00917e713d96c;hpb=f386507d3c6996e39fcd459d032b9e0cf6f0f563;p=apps%2Fhomescreen.git diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp index 376644f..98f6c93 100644 --- a/homescreen/src/main.cpp +++ b/homescreen/src/main.cpp @@ -26,14 +26,13 @@ #include #include -#include -#include +//#include +//#include #include "applicationlauncher.h" -#include "statusbarmodel.h" -#include "mastervolume.h" +//#include "statusbarmodel.h" +//#include "mastervolume.h" #include "homescreenhandler.h" -#include "hmi-debug.h" -#include "chromecontroller.h" +//#include "chromecontroller.h" #include #include @@ -137,7 +136,7 @@ find_screen(const char *screen_name) static void load_agl_shell_app(QPlatformNativeInterface *native, QQmlApplicationEngine *engine, - struct agl_shell *agl_shell, QUrl &bindingAddress, + struct agl_shell *agl_shell, const char *screen_name, bool is_demo) { struct wl_surface *bg, *top, *bottom; @@ -184,11 +183,11 @@ load_agl_shell_app(QPlatformNativeInterface *native, /* engine.rootObjects() works only if we had a load() */ - StatusBarModel *statusBar = qobj_top->findChild("statusBar"); - if (statusBar) { - qDebug() << "got statusBar objectname, doing init()"; - statusBar->init(bindingAddress, engine->rootContext()); - } + //StatusBarModel *statusBar = qobj_top->findChild("statusBar"); + //if (statusBar) { + // qDebug() << "got statusBar objectname, doing init()"; + // statusBar->init(bindingAddress, engine->rootContext()); + //} agl_shell_set_panel(agl_shell, top, output, AGL_SHELL_EDGE_TOP); agl_shell_set_panel(agl_shell, bottom, output, AGL_SHELL_EDGE_BOTTOM); @@ -205,92 +204,65 @@ load_agl_shell_app(QPlatformNativeInterface *native, int main(int argc, char *argv[]) { - setenv("QT_QPA_PLATFORM", "wayland", 1); - QGuiApplication a(argc, argv); - const char *screen_name; - bool is_demo_val = false; - - QPlatformNativeInterface *native = qApp->platformNativeInterface(); - struct agl_shell *agl_shell = nullptr; - screen_name = getenv("HOMESCREEN_START_SCREEN"); - - const char *is_demo = getenv("HOMESCREEN_DEMO_CI"); - if (is_demo && strcmp(is_demo, "1") == 0) - is_demo_val = true; - - QCoreApplication::setOrganizationDomain("LinuxFoundation"); - QCoreApplication::setOrganizationName("AutomotiveGradeLinux"); - QCoreApplication::setApplicationName("HomeScreen"); - QCoreApplication::setApplicationVersion("0.7.0"); - /* we need to have an app_id */ - a.setDesktopFileName("homescreen"); - - QCommandLineParser parser; - parser.addPositionalArgument("port", a.translate("main", "port for binding")); - parser.addPositionalArgument("secret", a.translate("main", "secret for binding")); - parser.addHelpOption(); - parser.addVersionOption(); - parser.process(a); - QStringList positionalArguments = parser.positionalArguments(); - - int port = 1700; - QString token = "wm"; - QString graphic_role = "homescreen"; // defined in layers.json in Window Manager - - if (positionalArguments.length() == 2) { - port = positionalArguments.takeFirst().toInt(); - token = positionalArguments.takeFirst(); - } - - HMI_DEBUG("HomeScreen","port = %d, token = %s", port, token.toStdString().c_str()); - - agl_shell = register_agl_shell(native); - if (!agl_shell) { - fprintf(stderr, "agl_shell extension is not advertised. " - "Are you sure that agl-compositor is running?\n"); - exit(EXIT_FAILURE); - } - - std::shared_ptr shell{agl_shell, agl_shell_destroy}; - Shell *aglShell = new Shell(shell, &a); - - // import C++ class to QML - qmlRegisterType("HomeScreen", 1, 0, "StatusBarModel"); - qmlRegisterType("MasterVolume", 1, 0, "MasterVolume"); - qmlRegisterUncreatableType("SpeechChrome", 1, 0, "SpeechChromeController", - QLatin1String("SpeechChromeController is uncreatable.")); - - ApplicationLauncher *launcher = new ApplicationLauncher(); - launcher->setCurrent(QStringLiteral("launcher")); - HomescreenHandler* homescreenHandler = new HomescreenHandler(aglShell, launcher); - homescreenHandler->init(port, token.toStdString().c_str()); - - QUrl bindingAddress; - bindingAddress.setScheme(QStringLiteral("ws")); - bindingAddress.setHost(QStringLiteral("localhost")); - bindingAddress.setPort(port); - bindingAddress.setPath(QStringLiteral("/api")); - - QUrlQuery query; - query.addQueryItem(QStringLiteral("token"), token); - bindingAddress.setQuery(query); - - QQmlApplicationEngine engine; - QQmlContext *context = engine.rootContext(); - context->setContextProperty("bindingAddress", bindingAddress); - - context->setContextProperty("homescreenHandler", homescreenHandler); - context->setContextProperty("launcher", launcher); - context->setContextProperty("weather", new Weather(bindingAddress)); - context->setContextProperty("bluetooth", new Bluetooth(bindingAddress, context)); - context->setContextProperty("speechChromeController", new ChromeController(bindingAddress, &engine)); - // we add it here even if we don't use it - context->setContextProperty("shell", aglShell); - - /* instead of loading main.qml we load one-by-one each of the QMLs, - * divided now between several surfaces: panels, background. - */ - load_agl_shell_app(native, &engine, agl_shell, bindingAddress, screen_name, is_demo_val); - - return a.exec(); + // keep this as we're not going not going to have the appfw + setenv("QT_QPA_PLATFORM", "wayland", 1); + + QGuiApplication a(argc, argv); + const char *screen_name; + bool is_demo_val = false; + + QPlatformNativeInterface *native = qApp->platformNativeInterface(); + struct agl_shell *agl_shell = nullptr; + screen_name = getenv("HOMESCREEN_START_SCREEN"); + + // could be removed only for CI + const char *is_demo = getenv("HOMESCREEN_DEMO_CI"); + if (is_demo && strcmp(is_demo, "1") == 0) + is_demo_val = true; + + QCoreApplication::setOrganizationDomain("LinuxFoundation"); + QCoreApplication::setOrganizationName("AutomotiveGradeLinux"); + QCoreApplication::setApplicationName("HomeScreen"); + QCoreApplication::setApplicationVersion("0.7.0"); + + // we need to have an app_id + a.setDesktopFileName("homescreen"); + + agl_shell = register_agl_shell(native); + if (!agl_shell) { + fprintf(stderr, "agl_shell extension is not advertised. " + "Are you sure that agl-compositor is running?\n"); + exit(EXIT_FAILURE); + } + + std::shared_ptr shell{agl_shell, agl_shell_destroy}; + Shell *aglShell = new Shell(shell, &a); + + // import C++ class to QML + //qmlRegisterType("HomeScreen", 1, 0, "StatusBarModel"); + //qmlRegisterType("MasterVolume", 1, 0, "MasterVolume"); + //qmlRegisterUncreatableType("SpeechChrome", 1, 0, "SpeechChromeController", QLatin1String("SpeechChromeController is uncreatable.")); + + ApplicationLauncher *launcher = new ApplicationLauncher(); + launcher->setCurrent(QStringLiteral("launcher")); + HomescreenHandler* homescreenHandler = new HomescreenHandler(aglShell, launcher); + homescreenHandler->init(); + + QQmlApplicationEngine engine; + QQmlContext *context = engine.rootContext(); + + context->setContextProperty("homescreenHandler", homescreenHandler); + context->setContextProperty("launcher", launcher); + //context->setContextProperty("weather", new Weather(bindingAddress)); + //context->setContextProperty("bluetooth", new Bluetooth(bindingAddress, context)); + //context->setContextProperty("speechChromeController", new ChromeController(bindingAddress, &engine)); + + // we add it here even if we don't use it + context->setContextProperty("shell", aglShell); + + /* instead of loading main.qml we load one-by-one each of the QMLs, + * divided now between several surfaces: panels, background. */ + load_agl_shell_app(native, &engine, agl_shell, screen_name, is_demo_val); + + return a.exec(); }