homescreen: Add support for defining an activation area

[apps/homescreen.git] / homescreen / src / main.cpp

diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp
index c910727..674ef5d 100644 (file)
--- a/homescreen/src/main.cpp
+++ b/homescreen/src/main.cpp
@@ -112,7 +112,7 @@ global_add(void *data, struct wl_registry *reg, uint32_t name,
                if (ver >= 2) {
                        shell_data->shell =
                                static_cast<struct agl_shell *>(
-                                       wl_registry_bind(reg, name, &agl_shell_interface, MIN(3, 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
@@ -213,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();
 
@@ -234,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<StatusBarModel *>("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();
 
@@ -247,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<StatusBarModel *>("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)
@@ -263,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<StatusBarModel *>("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);
        });
 }
@@ -291,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 };
 
@@ -301,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");
@@ -358,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();
 }