X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fhomescreenhandler.cpp;h=935371368f3cf5af84da5fa64a0c2ea4042ee578;hb=8db829a4a790e30b5dfd27b531aa8018918fde10;hp=94e1c9b6ce8d872eeb4cdf3ed3691bde38c2c409;hpb=d7e13c3ccce72d55f2ea25ee06e822cda5ff911e;p=apps%2Fhomescreen.git diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index 94e1c9b..9353713 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -1,105 +1,49 @@ +// 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 +QScreen *find_screen(const char *output); -#define APPLAUNCH_DBUS_IFACE "org.automotivelinux.AppLaunch" -#define APPLAUNCH_DBUS_OBJECT "/org/automotivelinux/AppLaunch" +// defined by meson build file +#include QT_QPA_HEADER -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" + +static struct wl_output * +getWlOutput(QPlatformNativeInterface *native, QScreen *screen); 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(); + + // + // 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); } HomescreenHandler::~HomescreenHandler() { -#if 0 - if (mp_hs != NULL) { - delete mp_hs; - } -#endif -} - -void HomescreenHandler::init(void) -{ -#if 0 - mp_hs = new LibHomeScreen(); - mp_hs->init(port, token); -#endif - 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))); - -#if 0 - mp_hs->registerCallback(nullptr, HomescreenHandler::onRep_static); - - mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](json_object *object){ - const char *display_message = json_object_get_string( - json_object_object_get(object, "display_message")); - HMI_DEBUG("HomeScreen","set_event_handler Event_OnScreenMessage display_message = %s", display_message); - }); - - // should be handled in the top panel - mp_hs->set_event_handler(LibHomeScreen::Event_ShowNotification,[this](json_object *object){ - json_object *p_obj = json_object_object_get(object, "parameter"); - const char *icon = json_object_get_string( - json_object_object_get(p_obj, "icon")); - const char *text = json_object_get_string( - json_object_object_get(p_obj, "text")); - const char *app_id = json_object_get_string( - json_object_object_get(p_obj, "caller")); - HMI_DEBUG("HomeScreen","Event_ShowNotification icon=%s, text=%s, caller=%s", icon, text, app_id); - QFileInfo icon_file(icon); - QString icon_path; - if (icon_file.isFile() && icon_file.exists()) { - icon_path = QString(QLatin1String(icon)); - } else { - icon_path = "./images/Utility_Logo_Grey-01.svg"; - } - - emit showNotification(QString(QLatin1String(app_id)), icon_path, QString(QLatin1String(text))); - }); - - // should be handled in the bottom panel - mp_hs->set_event_handler(LibHomeScreen::Event_ShowInformation,[this](json_object *object){ - json_object *p_obj = json_object_object_get(object, "parameter"); - const char *info = json_object_get_string( - json_object_object_get(p_obj, "info")); - - emit showInformation(QString(QLatin1String(info))); - }); -#endif + delete mp_applauncher_client; } static struct wl_output * @@ -109,88 +53,151 @@ getWlOutput(QPlatformNativeInterface *native, QScreen *screen) return static_cast(output); } -void HomescreenHandler::tapShortcut(QString application_id) -{ - HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str()); -#if 0 - struct json_object* j_json = json_object_new_object(); - struct json_object* value; - - struct agl_shell *agl_shell = aglShell->shell.get(); - QPlatformNativeInterface *native = qApp->platformNativeInterface(); - struct wl_output *output = getWlOutput(native, qApp->screens().first()); - - value = json_object_new_string("normal.full"); - json_object_object_add(j_json, "area", value); - - mp_hs->showWindow(application_id.toStdString().c_str(), j_json); - - // this works (and it is redundant the first time), due to the default - // policy engine installed which actives the application, when starting - // the first time. Later calls to HomescreenHandler::tapShortcut will - // require calling 'agl_shell_activate_app' - agl_shell_activate_app(agl_shell, application_id.toStdString().c_str(), output); - -#endif - - 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); - } -} - -#if 0 -void HomescreenHandler::onRep_static(struct json_object* reply_contents) -{ - static_cast(HomescreenHandler::myThis)->onRep(reply_contents); -} - -void HomescreenHandler::onEv_static(const string& event, struct json_object* event_contents) +void HomescreenHandler::tapShortcut(QString app_id) { - static_cast(HomescreenHandler::myThis)->onEv(event, event_contents); + HMI_DEBUG("HomeScreen","tapShortcut %s", app_id.toStdString().c_str()); + + if (app_id == LAUNCHER_APP_ID) { + activateApp(app_id); + return; + } + + if (!mp_applauncher_client->startApplication(app_id)) { + HMI_ERROR("HomeScreen","Unable to start application '%s'", + app_id.toStdString().c_str()); + return; + } } -void HomescreenHandler::onRep(struct json_object* reply_contents) +/* + * 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) { - const char* str = json_object_to_json_string(reply_contents); - HMI_DEBUG("HomeScreen","HomeScreen onReply %s", str); + 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::onEv(const string& event, struct json_object* event_contents) +void HomescreenHandler::activateApp(const QString& app_id) { - const char* str = json_object_to_json_string(event_contents); - HMI_DEBUG("HomeScreen","HomeScreen onEv %s, contents: %s", event.c_str(), str); - - if (event.compare("homescreen/on_screen_message") == 0) { - struct json_object *json_data = json_object_object_get(event_contents, "data"); - struct json_object *json_display_message = json_object_object_get(json_data, "display_message"); - const char* display_message = json_object_get_string(json_display_message); - - HMI_DEBUG("HomeScreen","display_message = %s", display_message); - } + struct agl_shell *agl_shell = aglShell->shell.get(); + QScreen *tmp_screen = qApp->screens().first(); + QPlatformNativeInterface *native = qApp->platformNativeInterface(); + struct wl_output *mm_output = nullptr; + + if (!tmp_screen) { + HMI_DEBUG("HomeScreen", "No output found to activate on!\n"); + } else { + mm_output = getWlOutput(native, tmp_screen); + + HMI_DEBUG("HomeScreen", "Activating app_id %s by default on output %p\n", + app_id.toStdString().c_str(), mm_output); + } + + if (mp_launcher) { + mp_launcher->setCurrent(app_id); + } + + // search for a pending application which might have a different output + auto iter = pending_app_list.begin(); + bool found_pending_app = false; + while (iter != pending_app_list.end()) { + const QString &app_to_search = iter->first; + + if (app_to_search == app_id) { + found_pending_app = true; + HMI_DEBUG("HomeScreen", "Found app_id %s in pending list of applications", + app_id.toStdString().c_str()); + break; + } + + iter++; + } + + if (found_pending_app) { + const QString &output_name = iter->second; + QScreen *screen = + ::find_screen(output_name.toStdString().c_str()); + + if (!screen) { + HMI_DEBUG("HomeScreen", "Can't activate application %s on another " + "output, because output %s could not be found. " + "Trying with remoting ones.", + app_id.toStdString().c_str(), + output_name.toStdString().c_str()); + + // try with remoting-remote-X which is the streaming + // one + std::string new_remote_output = + "remoting-" + output_name.toStdString(); + + screen = ::find_screen(new_remote_output.c_str()); + if (!screen) { + HMI_DEBUG("HomeScreen", "Can't activate application %s on another " + "output, because output remoting-%s could not be found", + app_id.toStdString().c_str(), + output_name.toStdString().c_str()); + return; + } + + HMI_DEBUG("HomeScreen", "Found a stream remoting output %s to activate application %s on", + new_remote_output.c_str(), + app_id.toStdString().c_str()); + } + + mm_output = getWlOutput(native, screen); + pending_app_list.erase(iter); + + HMI_DEBUG("HomeScreen", "For application %s found another " + "output to activate %s\n", + app_id.toStdString().c_str(), + output_name.toStdString().c_str()); + } + + if (!mm_output) { + HMI_DEBUG("HomeScreen", "No suitable output found for activating %s", + app_id.toStdString().c_str()); + return; + } + + HMI_DEBUG("HomeScreen", "Activating application %s", + app_id.toStdString().c_str()); + + agl_shell_activate_app(agl_shell, app_id.toStdString().c_str(), mm_output); } -#endif -void HomescreenHandler::appStarted(const QString& application_id) +void HomescreenHandler::deactivateApp(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); + 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"); + HMI_DEBUG("HomeScreen", "Processing application %s, status %s", + app_id.toStdString().c_str(), status.toStdString().c_str()); + + 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); + } else if (status == "deactivated") { + HMI_DEBUG("HomeScreen", "Application %s deactivated, activating last app", app_id.toStdString().c_str()); + } }