* Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
* Copyright (c) 2017, 2018 TOYOTA MOTOR CORPORATION
* Copyright (c) 2022 Konsulko Group
+ * Copyright (c) 2023 Collabora, Ltd.
*/
#include <QGuiApplication>
#include <QtQml/qqml.h>
#include <QQuickWindow>
#include <QTimer>
+#include <QScreen>
#include <weather.h>
#include <bluetooth.h>
#include <wayland-client.h>
#include "agl-shell-client-protocol.h"
-#include "shell.h"
+
+#include <thread>
+#include "AglShellGrpcClient.h"
#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
+QScreen *
+find_screen(const char *screen_name)
+{
+ QList<QScreen *> screens = qApp->screens();
+ QScreen *found = nullptr;
+ QString qstr_name = QString::fromUtf8(screen_name, -1);
+
+ for (QScreen *xscreen : screens) {
+ if (qstr_name == xscreen->name()) {
+ found = xscreen;
+ break;
+ }
+ }
+
+ return found;
+}
+
struct shell_data {
struct agl_shell *shell;
HomescreenHandler *homescreenHandler;
static void
agl_shell_app_state(void *data, struct agl_shell *agl_shell,
const char *app_id, uint32_t state)
+{
+ /* unused */
+}
+
+static void
+agl_shell_app_on_output(void *data, struct agl_shell *agl_shell,
+ const char *app_id, const char *output_name)
{
struct shell_data *shell_data = static_cast<struct shell_data *>(data);
HomescreenHandler *homescreenHandler = shell_data->homescreenHandler;
if (!homescreenHandler)
return;
- switch (state) {
- case AGL_SHELL_APP_STATE_STARTED:
- qDebug() << "Got AGL_SHELL_APP_STATE_STARTED for app_id " << app_id;
+ // a couple of use-cases, if there is no app_id in the app_list then it
+ // means this is a request to map the application, from the start to a
+ // different output that the default one. We'd get an
+ // AGL_SHELL_APP_STATE_STARTED which will handle activation.
+ //
+ // if there's an app_id then it means we might have gotten an event to
+ // move the application to another output; so we'd need to process it
+ // by explicitly calling processAppStatusEvent() which would ultimately
+ // activate the application on other output. We'd have to pick-up the
+ // last activated window and activate the default output.
+ //
+ // finally if the outputs are identical probably that's an user-error -
+ // but the compositor won't activate it again, so we don't handle that.
+ std::pair new_pending_app = std::pair(QString(app_id),
+ QString(output_name));
+ homescreenHandler->pending_app_list.push_back(new_pending_app);
+
+ if (homescreenHandler->apps_stack.contains(QString(app_id))) {
+ qDebug() << "Got event to move " << app_id <<
+ " to another output " << output_name;
+
homescreenHandler->processAppStatusEvent(app_id, "started");
- break;
- case AGL_SHELL_APP_STATE_TERMINATED:
- qDebug() << "Got AGL_SHELL_APP_STATE_TERMINATED for app_id " << app_id;
- // handled by HomescreenHandler::processAppStatusEvent
- break;
- case AGL_SHELL_APP_STATE_ACTIVATED:
- qDebug() << "Got AGL_SHELL_APP_STATE_ACTIVATED for app_id " << app_id;
- homescreenHandler->addAppToStack(app_id);
- break;
- default:
- break;
}
}
agl_shell_bound_ok,
agl_shell_bound_fail,
agl_shell_app_state,
+ agl_shell_app_on_output,
};
#endif
if (ver >= 2) {
shell_data->shell =
static_cast<struct agl_shell *>(
- wl_registry_bind(reg, name, &agl_shell_interface, MIN(4, ver)));
+ wl_registry_bind(reg, name, &agl_shell_interface, MIN(8, ver)));
#ifdef AGL_SHELL_BOUND_OK_SINCE_VERSION
agl_shell_add_listener(shell_data->shell, &shell_listener, data);
#endif
return getWlSurface(native, win);
}
-static QScreen *
-find_screen(const char *screen_name)
-{
- QList<QScreen *> screens = qApp->screens();
- QScreen *found = nullptr;
- QString qstr_name = QString::fromUtf8(screen_name, -1);
-
- for (QScreen *xscreen : screens) {
- if (qstr_name == xscreen->name()) {
- found = xscreen;
- break;
- }
- }
-
- return found;
-}
static void
load_agl_shell(QPlatformNativeInterface *native, QQmlApplicationEngine *engine,
qDebug() << "CI mode - with multiple surfaces";
}
+static void
+app_status_callback(::agl_shell_ipc::AppStateResponse app_response, void *data);
+
+static void
+run_in_thread(GrpcClient *client)
+{
+ grpc::Status status = client->Wait();
+}
+
static void
load_agl_shell_app(QPlatformNativeInterface *native, QQmlApplicationEngine *engine,
- struct agl_shell *agl_shell, const char *screen_name, bool is_demo)
+ struct shell_data shell_data, const char *screen_name, bool is_demo)
{
QScreen *screen = nullptr;
+ HomescreenHandler *homescreenHandler = shell_data.homescreenHandler;
if (!screen_name)
screen = qApp->primaryScreen();
}
if (is_demo) {
- load_agl_shell_for_ci(native, engine, agl_shell, screen);
+ load_agl_shell_for_ci(native, engine, shell_data.shell, screen);
} else {
- load_agl_shell(native, engine, agl_shell, screen);
+ load_agl_shell(native, engine, shell_data.shell, screen);
}
/* Delay the ready signal until after Qt has done all of its own setup
* in a.exec() */
- QTimer::singleShot(500, [agl_shell](){
+ QTimer::singleShot(500, [shell_data](){
qDebug() << "sending ready to compositor";
- agl_shell_ready(agl_shell);
+ agl_shell_ready(shell_data.shell);
});
}
+static void
+app_status_callback(::agl_shell_ipc::AppStateResponse app_response, void *data)
+{
+ HomescreenHandler *homescreenHandler = static_cast<HomescreenHandler *>(data);
+
+ if (!homescreenHandler) {
+ return;
+ }
+
+ auto app_id = QString(app_response.app_id().c_str());
+ auto state = app_response.state();
+
+ qDebug() << "appstateresponse: app_id " << app_id << "state " << state;
+
+ switch (state) {
+ case AGL_SHELL_APP_STATE_STARTED:
+ qDebug() << "Got AGL_SHELL_APP_STATE_STARTED for app_id " << app_id;
+ homescreenHandler->processAppStatusEvent(app_id, "started");
+ break;
+ case AGL_SHELL_APP_STATE_TERMINATED:
+ qDebug() << "Got AGL_SHELL_APP_STATE_TERMINATED for app_id " << app_id;
+ homescreenHandler->processAppStatusEvent(app_id, "terminated");
+ break;
+ case AGL_SHELL_APP_STATE_ACTIVATED:
+ qDebug() << "Got AGL_SHELL_APP_STATE_ACTIVATED for app_id " << app_id;
+ homescreenHandler->addAppToStack(app_id);
+ break;
+ case AGL_SHELL_APP_STATE_DEACTIVATED:
+ qDebug() << "Got AGL_SHELL_APP_STATE_DEACTIVATED for app_id " << app_id;
+ homescreenHandler->processAppStatusEvent(app_id, "deactivated");
+ break;
+ default:
+ break;
+ }
+}
+
int main(int argc, char *argv[])
{
setenv("QT_QPA_PLATFORM", "wayland", 1);
// we need to have an app_id
app.setDesktopFileName("homescreen");
+ GrpcClient *client = new GrpcClient();
+ // create a new thread to listner for gRPC events
+ std::thread th = std::thread(run_in_thread, client);
+
register_agl_shell(native, &shell_data);
if (!shell_data.shell) {
fprintf(stderr, "agl_shell extension is not advertised. "
std::shared_ptr<struct agl_shell> agl_shell{shell_data.shell, agl_shell_destroy};
- Shell *aglShell = new Shell(agl_shell, &app);
// Import C++ class to QML
qmlRegisterType<StatusBarModel>("HomeScreen", 1, 0, "StatusBarModel");
ApplicationLauncher *launcher = new ApplicationLauncher();
launcher->setCurrent(QStringLiteral("launcher"));
- HomescreenHandler* homescreenHandler = new HomescreenHandler(aglShell, launcher);
+ HomescreenHandler* homescreenHandler = new HomescreenHandler(launcher);
shell_data.homescreenHandler = homescreenHandler;
+ shell_data.homescreenHandler->setGrpcClient(client);
+
+ // blocks until we're sure connected with the server
+ HMI_DEBUG("HomescreenHandler", "Checking if connected to the gRPC server...");
+ client->WaitForConnected(500, 10);
+ client->AppStatusState(app_status_callback, homescreenHandler);
QQmlApplicationEngine engine;
QQmlContext *context = engine.rootContext();
context->setContextProperty("weather", new Weather());
context->setContextProperty("bluetooth", new Bluetooth(false, context));
- // We add it here even if we don't use it
- context->setContextProperty("shell", aglShell);
-
- load_agl_shell_app(native, &engine, shell_data.shell,
+ load_agl_shell_app(native, &engine, shell_data,
screen_name, is_demo_val);
return app.exec();
Code Review / apps / homescreen.git / blobdiff