X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fmain.cpp;h=674ef5dd4732029453f9d3387f3ff794c9b5c751;hb=bb4c83e294f109497f504c0dd8e23143c07883d6;hp=4a136079ec1a7da867cd130b41263edf2a89e5a1;hpb=98d13ef3af738ad9186b5c5a027e874d1bc1dfbc;p=apps%2Fhomescreen.git diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp index 4a13607..674ef5d 100644 --- a/homescreen/src/main.cpp +++ b/homescreen/src/main.cpp @@ -25,11 +25,11 @@ #include "homescreenhandler.h" #include "hmi-debug.h" -#include +// meson will define these +#include QT_QPA_HEADER #include -#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 @@ -38,37 +38,12 @@ 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) -{ - HomescreenHandler *homescreenHandler = static_cast(data); - - if (homescreenHandler) - homescreenHandler->addAppToStack(app_id); -} - -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) -{ - HomescreenHandler *homescreenHandler = static_cast(data); - - if (homescreenHandler && state == AGL_SHELL_DESKTOP_APP_STATE_DESTROYED) - homescreenHandler->deactivateApp(app_id); -} - static void agl_shell_bound_ok(void *data, struct agl_shell *agl_shell) { @@ -87,18 +62,43 @@ agl_shell_bound_fail(void *data, struct agl_shell *agl_shell) shell_data->bound_ok = false; } +static void +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(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; + 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; + } +} + + #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, }; #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) @@ -112,7 +112,7 @@ global_add(void *data, struct wl_registry *reg, uint32_t name, if (ver >= 2) { shell_data->shell = static_cast( - wl_registry_bind(reg, name, &agl_shell_interface, MIN(2, ver))); + wl_registry_bind(reg, name, &agl_shell_interface, MIN(4, ver))); #ifdef AGL_SHELL_BOUND_OK_SINCE_VERSION agl_shell_add_listener(shell_data->shell, &shell_listener, data); #endif @@ -124,12 +124,6 @@ global_add(void *data, struct wl_registry *reg, uint32_t name, shell_data->ver = ver; } - - if (strcmp(interface, agl_shell_desktop_interface.name) == 0) { - shell_data->shell_desktop = static_cast( - wl_registry_bind(reg, name, &agl_shell_desktop_interface, 1) - ); - } } static void @@ -219,15 +213,14 @@ static void load_agl_shell_app(QPlatformNativeInterface *native, QQmlApplicationEngine *engine, struct agl_shell *agl_shell, - const char *screen_name, - bool is_demo) + const char *screen_name, bool is_demo, bool embedded_panels) { struct wl_surface *bg, *top, *bottom; struct wl_output *output; QObject *qobj_bg, *qobj_top, *qobj_bottom; QScreen *screen = nullptr; - if (is_demo) { + if (is_demo && !embedded_panels) { QQmlComponent bg_comp(engine, QUrl("qrc:/background_demo.qml")); qInfo() << bg_comp.errors(); @@ -240,7 +233,16 @@ load_agl_shell_app(QPlatformNativeInterface *native, 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 { + + /* 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(engine->rootContext()); + } + + qDebug() << "init debug mode"; + } else if (!embedded_panels) { QQmlComponent bg_comp(engine, QUrl("qrc:/background.qml")); qInfo() << bg_comp.errors(); @@ -253,6 +255,24 @@ load_agl_shell_app(QPlatformNativeInterface *native, 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("statusBar"); + if (statusBar) { + qDebug() << "got statusBar objectname, doing init()"; + statusBar->init(engine->rootContext()); + } + + qDebug() << "init normal mode"; + } else { + // 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(); + + bg = create_component(native, &bg_comp, screen, &qobj_bg); + qDebug() << "init embedded panels mode"; } if (!screen_name) @@ -269,22 +289,39 @@ load_agl_shell_app(QPlatformNativeInterface *native, "first screen " << qApp->screens().first()->name(); output = getWlOutput(native, screen); - /* 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(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); qDebug() << "Setting homescreen to screen " << screen->name(); - agl_shell_set_background(agl_shell, bg, output); + if (embedded_panels) { + int32_t x, y; + int32_t width, height; + QSize size = screen->size(); + + 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 + + } else { + 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 regular panels"; + } + /* 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); }); } @@ -297,6 +334,7 @@ int main(int argc, char *argv[]) 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 }; @@ -307,6 +345,10 @@ int main(int argc, char *argv[]) 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"); @@ -321,11 +363,6 @@ int main(int argc, char *argv[]) "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) { @@ -352,9 +389,9 @@ int main(int argc, char *argv[]) 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(); @@ -369,7 +406,8 @@ 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, shell_data.shell, screen_name, is_demo_val); + load_agl_shell_app(native, &engine, shell_data.shell, + screen_name, is_demo_val, is_embedded_panels); return app.exec(); }