1 files changed, 117 insertions, 131 deletions

diff --git a/app/eventhandler.cpp b/app/eventhandler.cpp
index 9ffd6bb..b1edfac 100644
--- a/app/eventhandler.cpp
+++ b/app/eventhandler.cpp
@@ -17,12 +17,14 @@
 #include <functional>
 #include <QUrl>
 #include <QDebug>
+#include <QGuiApplication>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QQmlContext>
 #include <QtQml/QQmlApplicationEngine>
 #include <cstring>
 #include <QFileInfo>
+#include <qpa/qplatformnativeinterface.h>
 
 #include "eventhandler.h"
 
@@ -37,6 +39,108 @@ const char _application_id[] = "application_id";
 
 void* EventHandler::myThis = 0;
 
+static struct wl_output *
+getWlOutput(QScreen *screen)
+{
+	QPlatformNativeInterface *native = qApp->platformNativeInterface();
+	void *output = native->nativeResourceForScreen("output", screen);
+	return static_cast<struct ::wl_output*>(output);
+}
+
+static void
+global_add(void *data, struct wl_registry *reg, uint32_t name,
+	   const char *interface, uint32_t version)
+{
+	struct agl_shell_desktop **shell =
+		static_cast<struct agl_shell_desktop **>(data);
+
+	if (strcmp(interface, agl_shell_desktop_interface.name) == 0) {
+		*shell = static_cast<struct agl_shell_desktop *>(
+			wl_registry_bind(reg, name, &agl_shell_desktop_interface, version)
+		);
+	}
+}
+
+static void global_remove(void *data, struct wl_registry *reg, uint32_t id)
+{
+	(void) data;
+	(void) reg;
+	(void) id;
+}
+
+static const struct wl_registry_listener registry_listener = {
+	global_add,
+	global_remove,
+};
+
+static void
+application_id_event(void *data, struct agl_shell_desktop *agl_shell_desktop,
+		const char *app_id)
+{
+	EventHandler *ev_handler = static_cast<EventHandler *>(data);
+	(void) agl_shell_desktop;
+
+	// should probably add here to a list the application or trigger emit
+	// for QML code, also note that we get here our own application
+	if (strcmp(app_id, APP_ID) == 0)
+		return;
+
+	qInfo() << "app_id: " << app_id;
+}
+
+static void
+application_state_event(void *data, struct agl_shell_desktop *agl_shell_desktop,
+			const char *app_id, const char *app_data,
+			uint32_t app_state, uint32_t app_role)
+{
+	EventHandler *ev_handler = static_cast<EventHandler *>(data);
+	(void) agl_shell_desktop;
+
+	qInfo() << "got application_state_event() for app_id=" <<
+		app_id << ", state=" << app_state << ", role=" << app_role;
+
+	if (strcmp(app_id, APP_ID))
+		return;
+
+	if (app_state != AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED)
+		return;
+
+	if (app_role != AGL_SHELL_DESKTOP_APP_ROLE_POPUP)
+		return;
+
+	qInfo() << "Got message " << app_data;
+
+	// should signal that we got the message
+	emit ev_handler->updateModel(QVariant(app_data));
+	emit ev_handler->showOnScreen();
+}
+
+static const struct agl_shell_desktop_listener agl_shell_desk_listener = {
+	application_id_event,
+	application_state_event,
+};
+
+static struct agl_shell_desktop *
+register_agl_shell_desktop(void)
+{
+	struct wl_display *wl;
+	struct wl_registry *registry;
+	struct agl_shell_desktop *shell = nullptr;
+
+	QPlatformNativeInterface *native = qApp->platformNativeInterface();
+
+	wl = static_cast<struct wl_display *>(native->nativeResourceForIntegration("display"));
+	registry = wl_display_get_registry(wl);
+
+	wl_registry_add_listener(registry, &registry_listener, &shell);
+	// Roundtrip to get all globals advertised by the compositor
+	wl_display_roundtrip(wl);
+	wl_registry_destroy(registry);
+
+	return shell;
+}
+
+
 EventHandler::EventHandler(QObject *parent) :
     QObject(parent),
     m_dsp_sts(false)
@@ -45,160 +149,42 @@ EventHandler::EventHandler(QObject *parent) :
 
 EventHandler::~EventHandler()
 {
+    if (shell_desktop)
+	    agl_shell_desktop_destroy(shell_desktop);
 }
 
 void EventHandler::init(int port, const char *token)
 {
 	(void) port;
 	(void) token;
-#if 0
-    myThis = this;
-    mp_wm = new QLibWindowmanager();
-    mp_wm->init(port, token);
-
-    mp_hs = new LibHomeScreen();
-    mp_hs->init(port, token);
-
-    mp_hs->registerCallback(nullptr, EventHandler::onRep_static);
-    mp_hs->set_event_handler(LibHomeScreen::Event_ShowWindow, [this](json_object *object){
-        /*
-        {
-            "application_id": "onscreenapp",
-            "parameter": {
-                "title": "onscreen title",
-                "type": "critical,exclamation,question,information",
-                "contents": "message contents",
-                "buttons": ["button_name1", "button_name2", "button_name3"],
-                "replyto":"caller application id"
-            }
-        } */
-        HMI_DEBUG(APP_ID, "recived json message is[%s]", json_object_get_string(object));
-
-        struct json_object *param;
-        if(!json_object_object_get_ex(object, _parameter, &param)
-        || json_object_get_type(param) != json_type_object) {
-            HMI_DEBUG(APP_ID, "parameter error!");
-            return;
-        }
-
-        struct json_object *replyid;
-        const char *replyto = nullptr;
-        if(json_object_object_get_ex(param, _replyto, &replyid))
-            replyto = json_object_get_string(replyid);
-        if(replyto == nullptr) {
-            HMI_DEBUG(APP_ID, "received replyto is null!");
-            return;
-        }
-        m_req = qMakePair(QString(replyto), QString(json_object_to_json_string(param)));
-
-        if (this->getDisplayStatus() == HIDING) {
-            this->activateWindow(_myrole, "on_screen");
-        }
-        else if(this->getDisplayStatus() == SHOWING) {
-            this->setDisplayStatus(SWAPPING);
-            emit this->hideOnScreen();
-        }
-        else {
-            HMI_DEBUG(APP_ID, "onscreen swapping!");
-        }
-        HMI_DEBUG(APP_ID, "received showWindow event, end!, line=%d", __LINE__);
-    });
-
-    mp_hs->set_event_handler(LibHomeScreen::Event_HideWindow, [this](json_object *object){
-        emit this->hideOnScreen();
-        HMI_DEBUG(APP_ID, "hideWindow json_object=%s", json_object_get_string(object));
-    });
-
-    if (mp_wm->requestSurface(_myrole) != 0) {
-        HMI_DEBUG(APP_ID, "!!!!LayoutHandler requestSurface Failed!!!!!");
-        exit(EXIT_FAILURE);
-    }
-
-    mp_wm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [this](json_object *object) {
-        HMI_DEBUG(APP_ID, "Surface %s got syncDraw!", _myrole);
-        this->mp_wm->endDraw(QString(_myrole));
-    });
-
-    mp_wm->set_event_handler(QLibWindowmanager::Event_Visible, [this](json_object *object) {
-        struct json_object *value;
-        json_object_object_get_ex(object, _drawing_name, &value);
-        const char *name = json_object_get_string(value);
-        if(!strcasecmp(_myrole, name)){
-            this->setDisplayStatus(SHOWING);
-            this->m_dsp = this->m_req;
-            this->updateModel(QVariant(this->m_dsp.second));
-            emit this->showOnScreen();
-        }
-
-        HMI_DEBUG(APP_ID, "Event_Visible kKeyDrawingName = %s", name);
-    });
-
-    mp_wm->set_event_handler(QLibWindowmanager::Event_Invisible, [this](json_object *object) {
-        struct json_object *value;
-        json_object_object_get_ex(object, _drawing_name, &value);
-        const char *name = json_object_get_string(value);
-
-        HMI_DEBUG(APP_ID, "Event_Invisible kKeyDrawingName = %s", name);
-    });
-
-    HMI_DEBUG(APP_ID, "LayoutHander::init() finished.");
-#endif
-}
 
-#if 0
-void EventHandler::onRep_static(struct json_object* reply_contents)
-{
-    static_cast<EventHandler*>(EventHandler::myThis)->onRep(reply_contents);
+	shell_desktop = register_agl_shell_desktop();
+	if (shell_desktop)
+		agl_shell_desktop_add_listener(shell_desktop, &agl_shell_desk_listener, this);
 }
 
-void EventHandler::onRep(struct json_object* reply_contents)
-{
-    const char* str = json_object_to_json_string(reply_contents);
-    HMI_DEBUG(APP_ID, "EventHandler::onReply %s", str);
-}
-#endif
-
 void EventHandler::activateWindow(const char *role, const char *area)
 {
-#if 0
-    HMI_DEBUG(APP_ID, "EventHandler::activateWindow()");
-    mp_wm->activateWindow(role, area);
-#endif
-	fprintf(stdout, "EventHandler::activateWindow() role %s, area %s\n",
+	fprintf(stderr, "EventHandler::activateWindow() role %s, area %s\n",
 			role, area);
 }
 
 void EventHandler::deactivateWindow()
 {
-#if 0
-    HMI_DEBUG(APP_ID, "EventHandler::deactivateWindow()");
-    if(getDisplayStatus() == SWAPPING) {
-        setDisplayStatus(SHOWING);
-        m_dsp = m_req;
-        updateModel(QVariant(this->m_dsp.second));
-        emit showOnScreen();
-    }
-    else {
-        this->setDisplayStatus(HIDING);
-        mp_wm->deactivateWindow(_myrole);
-    }
-#endif
 	int display_status = getDisplayStatus();
-	fprintf(stdout, "EventHandler::deactivateWindow(), "
+	fprintf(stderr, "EventHandler::deactivateWindow(), "
 			"display_status %d\n", display_status);
+
+	if (shell_desktop) {
+		agl_shell_desktop_deactivate_app(shell_desktop, APP_ID);
+	}
 }
 
 void EventHandler::onScreenReply(const QString &ons_title, const QString &btn_name)
 {
-#if 0
-    HMI_DEBUG(APP_ID, "ons_title=%s btn_name=%s", ons_title.toStdString().c_str(), btn_name.toStdString().c_str());
+    fprintf(stderr, "ons_title=%s btn_name=%s\n", ons_title.toStdString().c_str(), btn_name.toStdString().c_str());
     emit this->hideOnScreen();
 
-    struct json_object* j_param = json_object_new_object();
-    json_object_object_add(j_param, _onscreen_title, json_object_new_string(ons_title.toStdString().c_str()));
-    json_object_object_add(j_param, _button_name, json_object_new_string(btn_name.toStdString().c_str()));
-    mp_hs->replyShowWindow(m_dsp.first.toStdString().c_str(), j_param);
-#endif
-    fprintf(stdout, "EventHandler::onScreenReply with ons_title %s, btn_name %s\n",
+    fprintf(stderr, "EventHandler::onScreenReply with ons_title %s, btn_name %s\n",
 		    ons_title.toStdString().c_str(), btn_name.toStdString().c_str());
 }