X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fmain.cpp;h=a82921ea5561c1375386b6dc25e0309610d4cdd9;hb=refs%2Fheads%2Fsandbox%2Fmvlad%2Ftests-send-events-for-applauncher;hp=742daa664ae81c41dfbb48aefac60b2b1cd9e27c;hpb=ebd4ec8d0d796a1e729c15de6e558e09358d2762;p=apps%2Fhomescreen.git diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp index 742daa6..a82921e 100644 --- a/homescreen/src/main.cpp +++ b/homescreen/src/main.cpp @@ -1,6 +1,7 @@ /* * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH * Copyright (c) 2017, 2018 TOYOTA MOTOR CORPORATION + * Copyright (c) 2020 Collabora, Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,18 +40,61 @@ #include #include "wayland-agl-shell-client-protocol.h" +#include "wayland-agl-shell-desktop-client-protocol.h" #include "shell.h" +struct shell_container { + struct agl_shell *agl_shell; + struct agl_shell_desktop *agl_shell_desktop; + // used to propagate events from C/C++ event handlers from the protocol + // to the QML in case we need them + Shell *a_shell; + ApplicationLauncher *launcher; +}; + +static void +application_id_event(void *data, struct agl_shell_desktop *agl_shell_desktop, + const char *app_id) +{ + // this event is sent only when surfaces are being created. we call + // setCurrent() to take care of this the first time, with later state + // event changes being handled by the application_state_event() + struct shell_container *sc = static_cast(data); + sc->launcher->setCurrent(QString(app_id)); +} + +static void +application_state_event(void *data, struct agl_shell_desktop *agl_shell_desktop, + const char *app_id, const char *app_data, + uint32_t app_state, uint32_t app_role) +{ + struct shell_container *sc = static_cast(data); + sc->launcher->setCurrent(QString(app_id)); +} + +static const struct agl_shell_desktop_listener agl_shell_desktop_listener = { + application_id_event, + application_state_event, +}; + + static void global_add(void *data, struct wl_registry *reg, uint32_t name, - const char *interface, uint32_t) + const char *interface, uint32_t version) { - struct agl_shell **shell = static_cast(data); + struct shell_container *sc = static_cast(data); if (strcmp(interface, agl_shell_interface.name) == 0) { - *shell = static_cast( + sc->agl_shell = static_cast( wl_registry_bind(reg, name, &agl_shell_interface, 1) ); + } else if (strcmp(interface, agl_shell_desktop_interface.name) == 0) { + sc->agl_shell_desktop = static_cast( + wl_registry_bind(reg, name, &agl_shell_desktop_interface, 1) + ); + + agl_shell_desktop_add_listener(sc->agl_shell_desktop, + &agl_shell_desktop_listener, sc); } } @@ -83,25 +127,33 @@ getWlOutput(QPlatformNativeInterface *native, QScreen *screen) } -static struct agl_shell * +static struct shell_container * register_agl_shell(QPlatformNativeInterface *native) { struct wl_display *wl; struct wl_registry *registry; - struct agl_shell *shell = nullptr; + struct shell_container *sc = new shell_container(); wl = static_cast( native->nativeResourceForIntegration("display") ); registry = wl_display_get_registry(wl); - wl_registry_add_listener(registry, ®istry_listener, &shell); + wl_registry_add_listener(registry, ®istry_listener, sc); /* Roundtrip to get all globals advertised by the compositor */ wl_display_roundtrip(wl); wl_registry_destroy(registry); - return shell; + if (!sc->agl_shell) { + delete sc; + } + + if (!sc->agl_shell_desktop) { + delete sc; + } + + return sc; } static struct wl_surface * @@ -137,13 +189,14 @@ find_screen(const char *screen_name) static void load_agl_shell_app(QPlatformNativeInterface *native, QQmlApplicationEngine *engine, - struct agl_shell *agl_shell, QUrl &bindingAddress, + struct shell_container *sc, QUrl &bindingAddress, const char *screen_name) { struct wl_surface *bg, *top, *bottom; struct wl_output *output; QObject *qobj_bg, *qobj_top, *qobj_bottom; QScreen *screen = nullptr; + struct agl_shell *agl_shell = sc->agl_shell; QQmlComponent bg_comp(engine, QUrl("qrc:/background.qml")); qInfo() << bg_comp.errors(); @@ -192,9 +245,10 @@ int main(int argc, char *argv[]) setenv("QT_QPA_PLATFORM", "wayland", 1); QGuiApplication a(argc, argv); const char *screen_name; + int ret; QPlatformNativeInterface *native = qApp->platformNativeInterface(); - struct agl_shell *agl_shell = nullptr; + struct shell_container *sc = nullptr; screen_name = getenv("HOMESCREEN_START_SCREEN"); QCoreApplication::setOrganizationDomain("LinuxFoundation"); @@ -222,16 +276,20 @@ int main(int argc, char *argv[]) } HMI_DEBUG("HomeScreen","port = %d, token = %s", port, token.toStdString().c_str()); + ApplicationLauncher *launcher = new ApplicationLauncher(); - 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"); + sc = register_agl_shell(native); + if (!sc) { exit(EXIT_FAILURE); } - std::shared_ptr shell{agl_shell, agl_shell_destroy}; - Shell *aglShell = new Shell(shell, &a); + std::shared_ptr + shell{sc->agl_shell, agl_shell_destroy}; + std::shared_ptr + shell_desktop{sc->agl_shell_desktop, agl_shell_desktop_destroy}; + Shell *aglShell = new Shell(shell, shell_desktop, &a); + sc->a_shell = aglShell; + sc->launcher = launcher; // import C++ class to QML // qmlRegisterType("HomeScreen", 1, 0, "ApplicationLauncher"); @@ -240,9 +298,8 @@ int main(int argc, char *argv[]) qmlRegisterUncreatableType("SpeechChrome", 1, 0, "SpeechChromeController", QLatin1String("SpeechChromeController is uncreatable.")); - ApplicationLauncher *launcher = new ApplicationLauncher(); - HomescreenHandler* homescreenHandler = new HomescreenHandler(aglShell); + HomescreenHandler* homescreenHandler = new HomescreenHandler(aglShell, launcher); homescreenHandler->init(port, token.toStdString().c_str()); QUrl bindingAddress; @@ -270,7 +327,10 @@ int main(int argc, char *argv[]) /* 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); + load_agl_shell_app(native, &engine, sc, bindingAddress, screen_name); + + ret = a.exec(); - return a.exec(); + delete sc; + return ret; }