X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fhomescreenhandler.cpp;h=605505c46c9799cfdca4e92f89f7da3d4f3b2776;hb=refs%2Fheads%2Fsandbox%2Fmvlad%2Ftests-send-events-for-applauncher;hp=d3338bec33c59e05ef43e8ba1d2b32d6d0ba8dff;hpb=0cd9641e81636806e6a91466afe309a0e2065527;p=apps%2Fhomescreen.git

diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index d3338be..605505c 100644
--- a/homescreen/src/homescreenhandler.cpp
+++ b/homescreen/src/homescreenhandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ * 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.
@@ -14,16 +14,20 @@
  * limitations under the License.
  */
 
+#include <QGuiApplication>
 #include <QFileInfo>
 #include "homescreenhandler.h"
 #include <functional>
 #include "hmi-debug.h"
 
+#include <qpa/qplatformnativeinterface.h>
+
 void* HomescreenHandler::myThis = 0;
 
-HomescreenHandler::HomescreenHandler(QObject *parent) :
+HomescreenHandler::HomescreenHandler(Shell *_aglShell, ApplicationLauncher *_launcher, QObject *parent) :
     QObject(parent),
-    mp_hs(NULL)
+    aglShell(_aglShell),
+    launcher(_launcher)
 {
 
 }
@@ -42,6 +46,7 @@ void HomescreenHandler::init(int port, const char *token)
 
     myThis = this;
 
+
     mp_hs->registerCallback(nullptr, HomescreenHandler::onRep_static);
 
     mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](json_object *object){
@@ -50,6 +55,7 @@ void HomescreenHandler::init(int port, const char *token)
         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(
@@ -70,6 +76,7 @@ void HomescreenHandler::init(int port, const char *token)
        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(
@@ -79,15 +86,24 @@ void HomescreenHandler::init(int port, const char *token)
     });
 }
 
-void HomescreenHandler::tapShortcut(QString application_id)
+static struct wl_output *
+getWlOutput(QPlatformNativeInterface *native, QScreen *screen)
 {
-    HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str());
-    struct json_object* j_json = json_object_new_object();
-    struct json_object* value;
-    value = json_object_new_string("normal");
-    json_object_object_add(j_json, "area", value);
+	void *output = native->nativeResourceForScreen("output", screen);
+	return static_cast<struct ::wl_output*>(output);
+}
 
-    mp_hs->showWindow(application_id.toStdString().c_str(), j_json);
+void HomescreenHandler::tapShortcut(QString application_id)
+{
+	HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str());
+	mp_hs->showWindow(application_id.toStdString().c_str(), nullptr);
+	launcher->setLaunching(true);
+
+	// 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'
+	aglShell->activate_app(nullptr, application_id);
 }
 
 void HomescreenHandler::onRep_static(struct json_object* reply_contents)