Initial rework to run without the app framework

[apps/homescreen.git] / homescreen / src / homescreenhandler.cpp

diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index 4db60fb..836ed47 100644 (file)
--- a/homescreen/src/homescreenhandler.cpp
+++ b/homescreen/src/homescreenhandler.cpp
@@ -14,34 +14,41 @@
  * 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)
 {
-
+    mp_launcher = launcher;
 }
 
 HomescreenHandler::~HomescreenHandler()
 {
+#if 0
     if (mp_hs != NULL) {
         delete mp_hs;
     }
+#endif
 }
 
-void HomescreenHandler::init(int port, const char *token)
+void HomescreenHandler::init(void)
 {
+#if 0
     mp_hs = new LibHomeScreen();
     mp_hs->init(port, token);
-
+#endif
     myThis = this;
 
+#if 0
     mp_hs->registerCallback(nullptr, HomescreenHandler::onRep_static);
 
     mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](json_object *object){
@@ -50,6 +57,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 +78,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(
@@ -77,19 +86,45 @@ void HomescreenHandler::init(int port, const char *token)
 
        emit showInformation(QString(QLatin1String(info)));
     });
+#endif
 }
 
-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.full");
-    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());
+#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);
+
+       if (mp_launcher) {
+               mp_launcher->setCurrent(application_id);
+       }
+#endif
 }
 
+#if 0
 void HomescreenHandler::onRep_static(struct json_object* reply_contents)
 {
     static_cast<HomescreenHandler*>(HomescreenHandler::myThis)->onRep(reply_contents);
@@ -119,3 +154,4 @@ void HomescreenHandler::onEv(const string& event, struct json_object* event_cont
         HMI_DEBUG("HomeScreen","display_message = %s", display_message);
     }
 }
+#endif