From 8db829a4a790e30b5dfd27b531aa8018918fde10 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Fri, 1 Sep 2023 19:32:01 +0300 Subject: homescreenhandler: Handle output identification better Rather than presume that we always have a valid QScreen, add a couple of check against an invalid ones and add a further check for testing against remote (remoting, streaming type of outputs) and compose the output with the one provided by the compositor, which is under "connector-output_name", which for remoting type of outputs accounts to "remoting-remote-X" where X is an natural number starting from 1. This also removes a warning about unused native variable in the HomeScreenHandler constructor. Bug-AGL: SPEC-4897 Signed-off-by: Marius Vlad Change-Id: I1557065497c1172cf8a3e723cbac8b686ffcfead --- homescreen/src/homescreenhandler.cpp | 49 +++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index b1244c1..9353713 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -29,7 +29,6 @@ HomescreenHandler::HomescreenHandler(Shell *_aglShell, ApplicationLauncher *laun { mp_launcher = launcher; mp_applauncher_client = new AppLauncherClient(); - QPlatformNativeInterface *native = qApp->platformNativeInterface(); // // The "started" event is received any time a start request is made to applaunchd, @@ -94,14 +93,22 @@ void HomescreenHandler::addAppToStack(const QString& app_id) void HomescreenHandler::activateApp(const QString& app_id) { struct agl_shell *agl_shell = aglShell->shell.get(); + QScreen *tmp_screen = qApp->screens().first(); QPlatformNativeInterface *native = qApp->platformNativeInterface(); - struct wl_output *mm_output = getWlOutput(native, qApp->screens().first()); + 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); } - HMI_DEBUG("HomeScreen", "Activating app_id %s by default output %p\n", - app_id.toStdString().c_str(), mm_output); // search for a pending application which might have a different output auto iter = pending_app_list.begin(); @@ -111,6 +118,8 @@ void HomescreenHandler::activateApp(const QString& app_id) 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; } @@ -122,6 +131,32 @@ void HomescreenHandler::activateApp(const QString& app_id) 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); @@ -131,6 +166,12 @@ void HomescreenHandler::activateApp(const QString& app_id) 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()); -- cgit 1.2.3-korg