X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fhomescreenhandler.cpp;h=9fd439d3cc48d66bb1333ea5f34e49684aa4508a;hb=HEAD;hp=b1244c11a18109d97d80ec659aa4308313a7a70a;hpb=c9ae3bc5a102caad6d8040cd268a64295654e162;p=apps%2Fhomescreen.git

diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index b1244c1..9fd439d 100644
--- a/homescreen/src/homescreenhandler.cpp
+++ b/homescreen/src/homescreenhandler.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <QGuiApplication>
+#include <QScreen>
 #include <QFileInfo>
 #include <functional>
 
@@ -20,16 +21,13 @@ QScreen *find_screen(const char *output);
 // 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)
+HomescreenHandler::HomescreenHandler(ApplicationLauncher *launcher, GrpcClient *_client, QObject *parent) :
+	QObject(parent)
+	, m_grpc_client(_client)
 {
 	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,
@@ -44,16 +42,10 @@ HomescreenHandler::HomescreenHandler(Shell *_aglShell, ApplicationLauncher *laun
 
 HomescreenHandler::~HomescreenHandler()
 {
+	delete m_grpc_client;
 	delete mp_applauncher_client;
 }
 
-static struct wl_output *
-getWlOutput(QPlatformNativeInterface *native, QScreen *screen)
-{
-	void *output = native->nativeResourceForScreen("output", screen);
-	return static_cast<struct ::wl_output*>(output);
-}
-
 void HomescreenHandler::tapShortcut(QString app_id)
 {
 	HMI_DEBUG("HomeScreen","tapShortcut %s", app_id.toStdString().c_str());
@@ -93,15 +85,20 @@ void HomescreenHandler::addAppToStack(const QString& app_id)
 
 void HomescreenHandler::activateApp(const QString& app_id)
 {
-	struct agl_shell *agl_shell = aglShell->shell.get();
-	QPlatformNativeInterface *native = qApp->platformNativeInterface();
-	struct wl_output *mm_output = getWlOutput(native, qApp->screens().first());
+	QScreen *default_screen = qApp->screens().first();
+	std::string default_output_name;
+
+	if (!default_screen) {
+		HMI_DEBUG("HomeScreen", "No default output found to activate on!\n");
+	} else {
+		default_output_name = default_screen->name().toStdString();
+		HMI_DEBUG("HomeScreen", "Activating app_id %s by default on output %s\n",
+				app_id.toStdString().c_str(), default_output_name.c_str());
+	}
 
 	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 +108,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,19 +121,51 @@ void HomescreenHandler::activateApp(const QString& app_id)
 		QScreen *screen =
 			::find_screen(output_name.toStdString().c_str());
 
-		mm_output = getWlOutput(native, screen);
-		pending_app_list.erase(iter);
+		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());
+			default_output_name = new_remote_output;
+		} else {
+			default_output_name = output_name.toStdString();
+		}
 
+		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());
+				default_output_name.c_str());
 	}
 
-	HMI_DEBUG("HomeScreen", "Activating application %s",
-			app_id.toStdString().c_str());
+	if (default_output_name.empty()) {
+		HMI_DEBUG("HomeScreen", "No suitable output found for activating %s",
+				app_id.toStdString().c_str());
+		return;
+	}
 
-	agl_shell_activate_app(agl_shell, app_id.toStdString().c_str(), mm_output);
+	HMI_DEBUG("HomeScreen", "Activating application %s on output %s",
+			app_id.toStdString().c_str(), default_output_name.c_str());
+	m_grpc_client->ActivateApp(app_id.toStdString(), default_output_name);
 }
 
 void HomescreenHandler::deactivateApp(const QString& app_id)