X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fhomescreenhandler.cpp;h=16d65fb2334ad714e04f4f50da888c8cd497fe60;hb=refs%2Fchanges%2F83%2F27983%2F2;hp=9111ebbf87b2cbb6af07ececd14a4e3f841ad3b3;hpb=37d45e3c6fc294e8ee675e95ad7bde0d3b38327a;p=apps%2Fhomescreen.git diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index 9111ebb..16d65fb 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -1,57 +1,43 @@ +// SPDX-License-Identifier: Apache-2.0 /* * Copyright (c) 2017, 2018, 2019 TOYOTA MOTOR CORPORATION - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright (c) 2022 Konsulko Group */ #include #include -#include "homescreenhandler.h" #include + +#include "homescreenhandler.h" #include "hmi-debug.h" #include -#define APPLAUNCH_DBUS_IFACE "org.automotivelinux.AppLaunch" -#define APPLAUNCH_DBUS_OBJECT "/org/automotivelinux/AppLaunch" - -void* HomescreenHandler::myThis = 0; +// LAUNCHER_APP_ID shouldn't be started by applaunchd as it is started as +// a user session by systemd +#define LAUNCHER_APP_ID "launcher" HomescreenHandler::HomescreenHandler(Shell *_aglShell, ApplicationLauncher *launcher, QObject *parent) : - QObject(parent), - aglShell(_aglShell) + QObject(parent), + aglShell(_aglShell) { - mp_launcher = launcher; - applaunch_iface = new org::automotivelinux::AppLaunch(APPLAUNCH_DBUS_IFACE, APPLAUNCH_DBUS_OBJECT, - QDBusConnection::sessionBus(), this); -} + mp_launcher = launcher; + mp_applauncher_client = new AppLauncherClient(); -HomescreenHandler::~HomescreenHandler() -{ + // + // The "started" event is received any time a start request is made to applaunchd, + // and the application either starts successfully or is already running. This + // effectively acts as a "switch to app X" action. + // + connect(mp_applauncher_client, + &AppLauncherClient::appStatusEvent, + this, + &HomescreenHandler::processAppStatusEvent); } -void HomescreenHandler::init(void) +HomescreenHandler::~HomescreenHandler() { - myThis = this; - - /* - * The "started" signal is received any time a start request is made to applaunchd, - * and the application either starts successfully or is already running. This - * effectively acts as a "switch to app X" action. - */ - connect(applaunch_iface, SIGNAL(started(QString)), this, SLOT(appStarted(QString))); - connect(applaunch_iface, SIGNAL(terminated(QString)), this, SLOT(appTerminated(QString))); - + delete mp_applauncher_client; } static struct wl_output * @@ -61,36 +47,73 @@ getWlOutput(QPlatformNativeInterface *native, QScreen *screen) return static_cast(output); } -void HomescreenHandler::tapShortcut(QString application_id) +void HomescreenHandler::tapShortcut(QString app_id) { - HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str()); - - QDBusPendingReply<> reply = applaunch_iface->start(application_id); - reply.waitForFinished(); - if (reply.isError()) { - HMI_ERROR("HomeScreen","Unable to start application '%s': %s", - application_id.toStdString().c_str(), - reply.error().message().toStdString().c_str()); - } else { - if (mp_launcher) { - mp_launcher->setCurrent(application_id); - } - appStarted(application_id); - } + HMI_DEBUG("HomeScreen","tapShortcut %s", app_id.toStdString().c_str()); + + if (app_id == LAUNCHER_APP_ID) + goto activate_app; + + if (!mp_applauncher_client->startApplication(app_id)) { + HMI_ERROR("HomeScreen","Unable to start application '%s'", + app_id.toStdString().c_str()); + return; + } + +activate_app: + if (mp_launcher) { + mp_launcher->setCurrent(app_id); + } + activateApp(app_id); } -void HomescreenHandler::appStarted(const QString& application_id) +/* + * Keep track of currently running apps and the order in which + * they were activated. That way, when an app is closed, we can + * switch back to the previously active one. + */ +void HomescreenHandler::addAppToStack(const QString& app_id) +{ + if (app_id == "homescreen") + return; + + if (!apps_stack.contains(app_id)) { + apps_stack << app_id; + } else { + int current_pos = apps_stack.indexOf(app_id); + int last_pos = apps_stack.size() - 1; + + if (current_pos != last_pos) + apps_stack.move(current_pos, last_pos); + } +} + +void HomescreenHandler::activateApp(const QString& app_id) { struct agl_shell *agl_shell = aglShell->shell.get(); QPlatformNativeInterface *native = qApp->platformNativeInterface(); struct wl_output *output = getWlOutput(native, qApp->screens().first()); - HMI_DEBUG("HomeScreen", "Activating application %s", application_id.toStdString().c_str()); - agl_shell_activate_app(agl_shell, application_id.toStdString().c_str(), output); + HMI_DEBUG("HomeScreen", "Activating application %s", app_id.toStdString().c_str()); + agl_shell_activate_app(agl_shell, app_id.toStdString().c_str(), output); + addAppToStack(app_id); +} + +void HomescreenHandler::deactivateApp(const QString& app_id) +{ + if (apps_stack.contains(app_id)) { + apps_stack.removeOne(app_id); + if (!apps_stack.isEmpty()) + activateApp(apps_stack.last()); + } } -void HomescreenHandler::appTerminated(const QString& application_id) +void HomescreenHandler::processAppStatusEvent(const QString &app_id, const QString &status) { - HMI_DEBUG("HomeScreen", "Application %s terminated, activating launcher", application_id.toStdString().c_str()); - appStarted("launcher"); + if (status == "started") { + activateApp(app_id); + } else if (status == "terminated") { + HMI_DEBUG("HomeScreen", "Application %s terminated, activating last app", app_id.toStdString().c_str()); + deactivateApp(app_id); + } }