#include "homescreenhandler.h"
#include "hmi-debug.h"
-#include <qpa/qplatformnativeinterface.h>
+// meson will define these
+#include QT_QPA_HEADER
#include <wayland-client.h>
-#include "wayland-agl-shell-client-protocol.h"
-#include "wayland-agl-shell-desktop-client-protocol.h"
+#include "agl-shell-client-protocol.h"
#include "shell.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;
- struct agl_shell_desktop *shell_desktop;
+ HomescreenHandler *homescreenHandler;
bool wait_for_bound;
bool bound_ok;
int ver;
};
static void
-agl_shell_desktop_application(void *data,
- struct agl_shell_desktop *agl_shell_desktop,
- const char *app_id)
+agl_shell_bound_ok(void *data, struct agl_shell *agl_shell)
{
- HomescreenHandler *homescreenHandler = static_cast<HomescreenHandler *>(data);
+ struct shell_data *shell_data = static_cast<struct shell_data *>(data);
+ shell_data->wait_for_bound = false;
- if (homescreenHandler)
- homescreenHandler->addAppToStack(app_id);
+ shell_data->bound_ok = true;
}
static void
-agl_shell_desktop_state_app(void *data,
- struct agl_shell_desktop *agl_shell_desktop,
- const char *app_id,
- const char *app_data,
- uint32_t state,
- uint32_t role)
+agl_shell_bound_fail(void *data, struct agl_shell *agl_shell)
{
- HomescreenHandler *homescreenHandler = static_cast<HomescreenHandler *>(data);
+ struct shell_data *shell_data = static_cast<struct shell_data *>(data);
+ shell_data->wait_for_bound = false;
- if (homescreenHandler && state == AGL_SHELL_DESKTOP_APP_STATE_DESTROYED)
- homescreenHandler->deactivateApp(app_id);
+ shell_data->bound_ok = false;
}
static void
-agl_shell_bound_ok(void *data, struct agl_shell *agl_shell)
+agl_shell_app_state(void *data, struct agl_shell *agl_shell,
+ const char *app_id, uint32_t state)
{
struct shell_data *shell_data = static_cast<struct shell_data *>(data);
- shell_data->wait_for_bound = false;
+ HomescreenHandler *homescreenHandler = shell_data->homescreenHandler;
- shell_data->bound_ok = true;
+ if (!homescreenHandler)
+ return;
+
+ 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;
+ // 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;
+ 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;
+ }
}
static void
-agl_shell_bound_fail(void *data, struct agl_shell *agl_shell)
+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);
- shell_data->wait_for_bound = false;
+ HomescreenHandler *homescreenHandler = shell_data->homescreenHandler;
- shell_data->bound_ok = false;
+ if (!homescreenHandler)
+ return;
+
+ // 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() << "Gove event to move " << app_id <<
+ " to another output " << output_name;
+ homescreenHandler->processAppStatusEvent(app_id, "started");
+ }
}
+
#ifdef AGL_SHELL_BOUND_OK_SINCE_VERSION
static const struct agl_shell_listener shell_listener = {
agl_shell_bound_ok,
agl_shell_bound_fail,
+ agl_shell_app_state,
+ agl_shell_app_on_output,
};
#endif
-static const struct agl_shell_desktop_listener shell_desktop_listener = {
- agl_shell_desktop_application,
- agl_shell_desktop_state_app
-};
-
static void
global_add(void *data, struct wl_registry *reg, uint32_t name,
const char *interface, uint32_t ver)
if (ver >= 2) {
shell_data->shell =
static_cast<struct agl_shell *>(
- wl_registry_bind(reg, name, &agl_shell_interface, MIN(2, 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
shell_data->ver = ver;
}
-
- if (strcmp(interface, agl_shell_desktop_interface.name) == 0) {
- shell_data->shell_desktop = static_cast<struct agl_shell_desktop *>(
- wl_registry_bind(reg, name, &agl_shell_desktop_interface, 1)
- );
- }
}
static void
return getWlSurface(native, win);
}
-static QScreen *
-find_screen(const char *screen_name)
+
+static void
+load_agl_shell(QPlatformNativeInterface *native, QQmlApplicationEngine *engine,
+ struct agl_shell *agl_shell, QScreen *screen)
{
- QList<QScreen *> screens = qApp->screens();
- QScreen *found = nullptr;
- QString qstr_name = QString::fromUtf8(screen_name, -1);
+ struct wl_surface *bg;
+ struct wl_output *output;
+ int32_t x, y;
+ int32_t width, height;
+ QObject *qobj_bg;
+ QSize size = screen->size();
- for (QScreen *xscreen : screens) {
- if (qstr_name == xscreen->name()) {
- found = xscreen;
- break;
- }
- }
+ // this incorporates the panels directly, but in doing so, it
+ // would also need to specify an activation area the same area
+ // in order to void overlapping any new activation window
+ QQmlComponent bg_comp(engine, QUrl("qrc:/background_with_panels.qml"));
+ qInfo() << bg_comp.errors();
- return found;
+ bg = create_component(native, &bg_comp, screen, &qobj_bg);
+
+ output = getWlOutput(native, screen);
+
+ qDebug() << "Normal mode - with single surface";
+ qDebug() << "Setting homescreen to screen " << screen->name();
+ agl_shell_set_background(agl_shell, bg, output);
+
+ // 216 is the width size of the panel
+ x = 0;
+ y = 216;
+
+ width = size.width();
+ height = size.height() - (2 * y);
+
+ qDebug() << "Using custom rectangle " << width << "x" << height
+ << "+" << x << "x" << y << " for activation";
+ qDebug() << "Panels should be embedded the background surface";
+
+#ifdef AGL_SHELL_SET_ACTIVATE_REGION_SINCE_VERSION
+ agl_shell_set_activate_region(agl_shell, output,
+ x, y, width, height);
+#endif
}
static void
-load_agl_shell_app(QPlatformNativeInterface *native,
- QQmlApplicationEngine *engine,
- struct agl_shell *agl_shell,
- const char *screen_name,
- bool is_demo)
+load_agl_shell_for_ci(QPlatformNativeInterface *native,
+ QQmlApplicationEngine *engine,
+ struct agl_shell *agl_shell, QScreen *screen)
{
struct wl_surface *bg, *top, *bottom;
struct wl_output *output;
QObject *qobj_bg, *qobj_top, *qobj_bottom;
- QScreen *screen = nullptr;
- if (is_demo) {
- QQmlComponent bg_comp(engine, QUrl("qrc:/background_demo.qml"));
- qInfo() << bg_comp.errors();
+ QQmlComponent bg_comp(engine, QUrl("qrc:/background_demo.qml"));
+ qInfo() << bg_comp.errors();
- QQmlComponent top_comp(engine, QUrl("qrc:/toppanel_demo.qml"));
- qInfo() << top_comp.errors();
+ QQmlComponent top_comp(engine, QUrl("qrc:/toppanel_demo.qml"));
+ qInfo() << top_comp.errors();
- QQmlComponent bot_comp(engine, QUrl("qrc:/bottompanel_demo.qml"));
- qInfo() << bot_comp.errors();
+ QQmlComponent bot_comp(engine, QUrl("qrc:/bottompanel_demo.qml"));
+ qInfo() << bot_comp.errors();
- top = create_component(native, &top_comp, screen, &qobj_top);
- bottom = create_component(native, &bot_comp, screen, &qobj_bottom);
- bg = create_component(native, &bg_comp, screen, &qobj_bg);
- } else {
- QQmlComponent bg_comp(engine, QUrl("qrc:/background.qml"));
- qInfo() << bg_comp.errors();
+ top = create_component(native, &top_comp, screen, &qobj_top);
+ bottom = create_component(native, &bot_comp, screen, &qobj_bottom);
+ bg = create_component(native, &bg_comp, screen, &qobj_bg);
+
+ /* 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(engine->rootContext());
+ }
- QQmlComponent top_comp(engine, QUrl("qrc:/toppanel.qml"));
- qInfo() << top_comp.errors();
+ output = getWlOutput(native, screen);
- QQmlComponent bot_comp(engine, QUrl("qrc:/bottompanel.qml"));
- qInfo() << bot_comp.errors();
+ qDebug() << "Setting homescreen to screen " << screen->name();
- top = create_component(native, &top_comp, screen, &qobj_top);
- bottom = create_component(native, &bot_comp, screen, &qobj_bottom);
- bg = create_component(native, &bg_comp, screen, &qobj_bg);
- }
+ agl_shell_set_background(agl_shell, bg, output);
+ agl_shell_set_panel(agl_shell, top, output, AGL_SHELL_EDGE_TOP);
+ agl_shell_set_panel(agl_shell, bottom, output, AGL_SHELL_EDGE_BOTTOM);
+
+ qDebug() << "CI mode - with multiple surfaces";
+}
+
+static void
+load_agl_shell_app(QPlatformNativeInterface *native, QQmlApplicationEngine *engine,
+ struct agl_shell *agl_shell, const char *screen_name, bool is_demo)
+{
+ QScreen *screen = nullptr;
if (!screen_name)
screen = qApp->primaryScreen();
return;
}
- qDebug() << "found primary screen " << qApp->primaryScreen()->name() <<
- "first screen " << qApp->screens().first()->name();
- output = getWlOutput(native, screen);
-
- /* 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(engine->rootContext());
+ if (is_demo) {
+ load_agl_shell_for_ci(native, engine, agl_shell, screen);
+ } else {
+ load_agl_shell(native, engine, agl_shell, screen);
}
- agl_shell_set_panel(agl_shell, top, output, AGL_SHELL_EDGE_TOP);
- agl_shell_set_panel(agl_shell, bottom, output, AGL_SHELL_EDGE_BOTTOM);
- qDebug() << "Setting homescreen to screen " << screen->name();
-
- 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](){
+ qDebug() << "sending ready to compositor";
agl_shell_ready(agl_shell);
});
}
QGuiApplication app(argc, argv);
const char *screen_name;
bool is_demo_val = false;
+ bool is_embedded_panels = false;
int ret = 0;
struct shell_data shell_data = { nullptr, nullptr, true, false, 0 };
if (is_demo && strcmp(is_demo, "1") == 0)
is_demo_val = true;
+ const char *embedded_panels = getenv("HOMESCREEN_EMBEDDED_PANELS");
+ if (embedded_panels && strcmp(embedded_panels, "1") == 0)
+ is_embedded_panels = true;
+
QCoreApplication::setOrganizationDomain("LinuxFoundation");
QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
QCoreApplication::setApplicationName("HomeScreen");
"Are you sure that agl-compositor is running?\n");
exit(EXIT_FAILURE);
}
- if (!shell_data.shell_desktop) {
- fprintf(stderr, "agl_shell_desktop extension is not advertised. "
- "Are you sure that agl-compositor is running?\n");
- exit(EXIT_FAILURE);
- }
qDebug() << "agl-shell interface is at version " << shell_data.ver;
if (shell_data.ver >= 2) {
ApplicationLauncher *launcher = new ApplicationLauncher();
launcher->setCurrent(QStringLiteral("launcher"));
- HomescreenHandler* homescreenHandler = new HomescreenHandler(aglShell, launcher);
- agl_shell_desktop_add_listener(shell_data.shell_desktop, &shell_desktop_listener, homescreenHandler);
+ HomescreenHandler* homescreenHandler = new HomescreenHandler(aglShell, launcher);
+ shell_data.homescreenHandler = homescreenHandler;
QQmlApplicationEngine engine;
QQmlContext *context = engine.rootContext();
// 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, shell_data.shell, screen_name, is_demo_val);
+ load_agl_shell_app(native, &engine, shell_data.shell,
+ screen_name, is_demo_val);
return app.exec();
}
Code Review / apps / homescreen.git / blobdiff