diff options
author | Marius Vlad <marius.vlad@collabora.com> | 2020-04-25 18:42:40 +0300 |
---|---|---|
committer | Marius Vlad <marius.vlad@collabora.com> | 2020-06-24 16:58:24 +0300 |
commit | eb227c1da7bdd2d81c5a95881d7eef18369ca96a (patch) | |
tree | cd3f2adc8b0a9a207bc3d4bed97ae7a6a3747e0f /homescreen/src | |
parent | c903d2fc00c1129ae7c8c3f3393d7cd08c9f2699 (diff) |
agl-compositor: Conversion to agl-compositor
Bug-AGL: SPEC-3447
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I7da44ec333217d355ba643d2d21bea7d8940ad2b
Diffstat (limited to 'homescreen/src')
-rw-r--r-- | homescreen/src/homescreenhandler.cpp | 41 | ||||
-rw-r--r-- | homescreen/src/homescreenhandler.h | 6 | ||||
-rw-r--r-- | homescreen/src/main.cpp | 206 | ||||
-rw-r--r-- | homescreen/src/shell.cpp | 51 | ||||
-rw-r--r-- | homescreen/src/shell.h | 56 |
5 files changed, 306 insertions, 54 deletions
diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index 4db60fb..bf98a53 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -14,16 +14,19 @@ * limitations under the License. */ +#include <QGuiApplication> #include <QFileInfo> #include "homescreenhandler.h" #include <functional> #include "hmi-debug.h" +#include <qpa/qplatformnativeinterface.h> + void* HomescreenHandler::myThis = 0; -HomescreenHandler::HomescreenHandler(QObject *parent) : +HomescreenHandler::HomescreenHandler(Shell *_aglShell, QObject *parent) : QObject(parent), - mp_hs(NULL) + aglShell(_aglShell) { } @@ -42,6 +45,7 @@ void HomescreenHandler::init(int port, const char *token) myThis = this; + mp_hs->registerCallback(nullptr, HomescreenHandler::onRep_static); mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](json_object *object){ @@ -50,6 +54,7 @@ void HomescreenHandler::init(int port, const char *token) HMI_DEBUG("HomeScreen","set_event_handler Event_OnScreenMessage display_message = %s", display_message); }); + // should be handled in the top panel mp_hs->set_event_handler(LibHomeScreen::Event_ShowNotification,[this](json_object *object){ json_object *p_obj = json_object_object_get(object, "parameter"); const char *icon = json_object_get_string( @@ -70,6 +75,7 @@ void HomescreenHandler::init(int port, const char *token) emit showNotification(QString(QLatin1String(app_id)), icon_path, QString(QLatin1String(text))); }); + // should be handled in the bottom panel mp_hs->set_event_handler(LibHomeScreen::Event_ShowInformation,[this](json_object *object){ json_object *p_obj = json_object_object_get(object, "parameter"); const char *info = json_object_get_string( @@ -79,15 +85,34 @@ void HomescreenHandler::init(int port, const char *token) }); } +static struct wl_output * +getWlOutput(QPlatformNativeInterface *native, QScreen *screen) +{ + void *output = native->nativeResourceForScreen("output", screen); + return static_cast<struct ::wl_output*>(output); +} + void HomescreenHandler::tapShortcut(QString application_id) { - HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str()); - struct json_object* j_json = json_object_new_object(); - struct json_object* value; - value = json_object_new_string("normal.full"); - json_object_object_add(j_json, "area", value); + HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str()); + + struct json_object* j_json = json_object_new_object(); + struct json_object* value; + + struct agl_shell *agl_shell = aglShell->shell.get(); + QPlatformNativeInterface *native = qApp->platformNativeInterface(); + struct wl_output *output = getWlOutput(native, qApp->screens().first()); + + value = json_object_new_string("normal.full"); + json_object_object_add(j_json, "area", value); + + mp_hs->showWindow(application_id.toStdString().c_str(), j_json); - mp_hs->showWindow(application_id.toStdString().c_str(), j_json); + // this works (and it is redundant the first time), due to the default + // policy engine installed which actives the application, when starting + // the first time. Later calls to HomescreenHandler::tapShortcut will + // require calling 'agl_shell_activate_app' + agl_shell_activate_app(agl_shell, application_id.toStdString().c_str(), output); } void HomescreenHandler::onRep_static(struct json_object* reply_contents) diff --git a/homescreen/src/homescreenhandler.h b/homescreen/src/homescreenhandler.h index 5dfe041..3d939ce 100644 --- a/homescreen/src/homescreenhandler.h +++ b/homescreen/src/homescreenhandler.h @@ -18,7 +18,10 @@ #define HOMESCREENHANDLER_H #include <QObject> + #include <libhomescreen.hpp> + +#include "shell.h" #include <string> using namespace std; @@ -27,7 +30,7 @@ class HomescreenHandler : public QObject { Q_OBJECT public: - explicit HomescreenHandler(QObject *parent = 0); + explicit HomescreenHandler(Shell *aglShell, QObject *parent = 0); ~HomescreenHandler(); void init(int port, const char* token); @@ -46,6 +49,7 @@ signals: void showInformation(QString info); private: LibHomeScreen *mp_hs; + Shell *aglShell; }; #endif // HOMESCREENHANDLER_H diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp index b92ff60..db9eafe 100644 --- a/homescreen/src/main.cpp +++ b/homescreen/src/main.cpp @@ -21,10 +21,11 @@ #include <QtGui/QGuiApplication> #include <QtQml/QQmlApplicationEngine> #include <QtQml/QQmlContext> +#include <QtQml/QQmlComponent> #include <QtQml/qqml.h> #include <QQuickWindow> +#include <QTimer> -#include <qlibwindowmanager.h> #include <weather.h> #include <bluetooth.h> #include "applicationlauncher.h" @@ -34,9 +35,142 @@ #include "hmi-debug.h" #include "chromecontroller.h" +#include <qpa/qplatformnativeinterface.h> +#include <wayland-client.h> + +#include "wayland-agl-shell-client-protocol.h" +#include "shell.h" + +static void +global_add(void *data, struct wl_registry *reg, uint32_t name, + const char *interface, uint32_t) +{ + struct agl_shell **shell = static_cast<struct agl_shell **>(data); + + if (strcmp(interface, agl_shell_interface.name) == 0) { + *shell = static_cast<struct agl_shell *>( + wl_registry_bind(reg, name, &agl_shell_interface, 1) + ); + } +} + +static void +global_remove(void *data, struct wl_registry *reg, uint32_t id) +{ + /* Don't care */ + (void) data; + (void) reg; + (void) id; +} + +static const struct wl_registry_listener registry_listener = { + global_add, + global_remove, +}; + +static struct wl_surface * +getWlSurface(QPlatformNativeInterface *native, QWindow *window) +{ + void *surf = native->nativeResourceForWindow("surface", window); + return static_cast<struct ::wl_surface *>(surf); +} + +static struct wl_output * +getWlOutput(QPlatformNativeInterface *native, QScreen *screen) +{ + void *output = native->nativeResourceForScreen("output", screen); + return static_cast<struct ::wl_output*>(output); +} + + +static struct agl_shell * +register_agl_shell(QPlatformNativeInterface *native) +{ + struct wl_display *wl; + struct wl_registry *registry; + struct agl_shell *shell = nullptr; + + wl = static_cast<struct wl_display *>( + native->nativeResourceForIntegration("display") + ); + registry = wl_display_get_registry(wl); + + wl_registry_add_listener(registry, ®istry_listener, &shell); + + /* Roundtrip to get all globals advertised by the compositor */ + wl_display_roundtrip(wl); + wl_registry_destroy(registry); + + return shell; +} + +static struct wl_surface * +create_component(QPlatformNativeInterface *native, QQmlComponent *comp, + QScreen *screen, QObject **qobj) +{ + QObject *obj = comp->create(); + obj->setParent(screen); + + QWindow *win = qobject_cast<QWindow *>(obj); + *qobj = obj; + + return getWlSurface(native, win); +} + +static void +load_agl_shell_app(QPlatformNativeInterface *native, + QQmlApplicationEngine *engine, + struct agl_shell *agl_shell, QUrl &bindingAddress) +{ + struct wl_surface *bg, *top, *bottom; + struct wl_output *output; + + QObject *qobj_bg, *qobj_top, *qobj_bottom; + + QQmlComponent bg_comp(engine, QUrl("qrc:/background.qml")); + qInfo() << bg_comp.errors(); + + QQmlComponent top_comp(engine, QUrl("qrc:/toppanel.qml")); + qInfo() << top_comp.errors(); + + QQmlComponent bot_comp(engine, QUrl("qrc:/bottompanel.qml")); + qInfo() << bot_comp.errors(); + + QScreen *screen = qApp->screens().first(); + if (!screen) + return; + + output = getWlOutput(native, screen); + + bg = create_component(native, &bg_comp, screen, &qobj_bg); + top = create_component(native, &top_comp, screen, &qobj_top); + bottom = create_component(native, &bot_comp, screen, &qobj_bottom); + + /* engine.rootObjects() works only if we had a load() */ + StatusBarModel *statusBar = qobj_top->findChild<StatusBarModel *>("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); + + agl_shell_set_background(agl_shell, bg, output); + + /* Delay the ready signal until after Qt has done all of its own setup + * in a.exec() */ + QTimer::singleShot(500, [agl_shell](){ + agl_shell_ready(agl_shell); + }); +} + + int main(int argc, char *argv[]) { QGuiApplication a(argc, argv); + QPlatformNativeInterface *native = qApp->platformNativeInterface(); + struct agl_shell *agl_shell = nullptr; QCoreApplication::setOrganizationDomain("LinuxFoundation"); QCoreApplication::setOrganizationName("AutomotiveGradeLinux"); @@ -62,6 +196,16 @@ int main(int argc, char *argv[]) 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<struct agl_shell> shell{agl_shell, agl_shell_destroy}; + Shell *aglShell = new Shell(shell, &a); + // import C++ class to QML // qmlRegisterType<ApplicationLauncher>("HomeScreen", 1, 0, "ApplicationLauncher"); qmlRegisterType<StatusBarModel>("HomeScreen", 1, 0, "StatusBarModel"); @@ -70,33 +214,8 @@ int main(int argc, char *argv[]) QLatin1String("SpeechChromeController is uncreatable.")); ApplicationLauncher *launcher = new ApplicationLauncher(); - QLibWindowmanager* layoutHandler = new QLibWindowmanager(); - if(layoutHandler->init(port,token) != 0){ - exit(EXIT_FAILURE); - } - - AGLScreenInfo screenInfo(layoutHandler->get_scale_factor()); - - if (layoutHandler->requestSurface(graphic_role) != 0) { - exit(EXIT_FAILURE); - } - layoutHandler->set_event_handler(QLibWindowmanager::Event_SyncDraw, [layoutHandler, &graphic_role](json_object *object) { - layoutHandler->endDraw(graphic_role); - }); - - layoutHandler->set_event_handler(QLibWindowmanager::Event_ScreenUpdated, [layoutHandler, launcher](json_object *object) { - json_object *jarray = json_object_object_get(object, "ids"); - int arrLen = json_object_array_length(jarray); - for( int idx = 0; idx < arrLen; idx++) - { - QString label = QString(json_object_get_string( json_object_array_get_idx(jarray, idx) )); - HMI_DEBUG("HomeScreen","Event_ScreenUpdated application: %s.", label.toStdString().c_str()); - QMetaObject::invokeMethod(launcher, "setCurrent", Qt::QueuedConnection, Q_ARG(QString, label)); - } - }); - - HomescreenHandler* homescreenHandler = new HomescreenHandler(); + HomescreenHandler* homescreenHandler = new HomescreenHandler(aglShell); homescreenHandler->init(port, token.toStdString().c_str()); QUrl bindingAddress; @@ -109,25 +228,22 @@ int main(int argc, char *argv[]) query.addQueryItem(QStringLiteral("token"), token); bindingAddress.setQuery(query); - // mail.qml loading QQmlApplicationEngine engine; - engine.rootContext()->setContextProperty("bindingAddress", bindingAddress); - engine.rootContext()->setContextProperty("layoutHandler", layoutHandler); - engine.rootContext()->setContextProperty("homescreenHandler", homescreenHandler); - engine.rootContext()->setContextProperty("launcher", launcher); - engine.rootContext()->setContextProperty("weather", new Weather(bindingAddress)); - engine.rootContext()->setContextProperty("bluetooth", new Bluetooth(bindingAddress, engine.rootContext())); - engine.rootContext()->setContextProperty("speechChromeController", new ChromeController(bindingAddress, &engine)); - engine.rootContext()->setContextProperty("screenInfo", &screenInfo); - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); - - QObject *root = engine.rootObjects().first(); - QQuickWindow *window = qobject_cast<QQuickWindow *>(root); - QObject::connect(window, SIGNAL(frameSwapped()), layoutHandler, SLOT(slotActivateSurface())); - - QList<QObject *> sobjs = engine.rootObjects(); - StatusBarModel *statusBar = sobjs.first()->findChild<StatusBarModel *>("statusBar"); - statusBar->init(bindingAddress, engine.rootContext()); + 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); return a.exec(); } diff --git a/homescreen/src/shell.cpp b/homescreen/src/shell.cpp new file mode 100644 index 0000000..1427b7c --- /dev/null +++ b/homescreen/src/shell.cpp @@ -0,0 +1,51 @@ +/* + * Copyright © 2019 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include <QGuiApplication> +#include <QDebug> +#include "shell.h" +#include <qpa/qplatformnativeinterface.h> +#include <stdio.h> + +static struct wl_output * +getWlOutput(QPlatformNativeInterface *native, QScreen *screen) +{ + void *output = native->nativeResourceForScreen("output", screen); + return static_cast<struct ::wl_output*>(output); +} + +void Shell::activate_app(QWindow *win, const QString &app_id) +{ + QPlatformNativeInterface *native = qApp->platformNativeInterface(); + QScreen *screen = win->screen(); + + struct wl_output *output = getWlOutput(native, screen); + + qDebug() << "++ activating app_id " << app_id.toStdString().c_str(); + + agl_shell_activate_app(this->shell.get(), + app_id.toStdString().c_str(), + output); +} diff --git a/homescreen/src/shell.h b/homescreen/src/shell.h new file mode 100644 index 0000000..8bf0e9b --- /dev/null +++ b/homescreen/src/shell.h @@ -0,0 +1,56 @@ +/* + * Copyright © 2019 Collabora Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + + +#ifndef SHELLHANDLER_H +#define SHELLHANDLER_H + +#include <QObject> +#include <QString> +#include <QScreen> +#include <QWindow> +#include <memory> +#include "wayland-agl-shell-client-protocol.h" + +/* + * Basic type to wrap the agl_shell wayland object into a QObject, so that it + * can be used in callbacks from QML. + */ + +class Shell : public QObject +{ + Q_OBJECT + +public: + std::shared_ptr<struct agl_shell> shell; + + Shell(std::shared_ptr<struct agl_shell> shell, QObject *parent = nullptr) : + QObject(parent), shell(shell) + {} +public slots: + void activate_app(QWindow *win, const QString &app_id); +}; + +#endif // SHELLHANDLER_H |