1 files changed, 149 insertions, 63 deletions

diff --git a/sample/app/eventhandler.cpp b/sample/app/eventhandler.cpp
index 4e55619..113b424 100644
--- a/sample/app/eventhandler.cpp
+++ b/sample/app/eventhandler.cpp
@@ -16,102 +16,188 @@
 
 #include <functional>
 #include <QUrl>
+#include <QGuiApplication>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QQuickWindow>
-//#include <QtQml/QQmlContext>
+#include <QtQml/QQmlContext>
 #include <QQmlContext>
 #include <QtQml/QQmlApplicationEngine>
+#include <qpa/qplatformnativeinterface.h>
+
 #include "eventhandler.h"
 
+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)
+{
+	/* unused */
+	(void) data;
+	(void) app_id;
+	(void) app_data;
+	(void) app_role;
+	(void) app_state;
+	(void) agl_shell_desktop;
+}
+
+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;
+}
+
+
 void* EventHandler::myThis = 0;
 
 const char _drawing_name[] = "drawing_name";
 
 EventHandler::EventHandler(QObject *parent) :
-    QObject(parent),
-    mp_hs(NULL),
-    mp_wm(NULL),
-    mp_qw(NULL)
+    QObject(parent), mp_qw(NULL)
 {
 
 }
 
 EventHandler::~EventHandler()
 {
-    if (mp_hs != NULL) {
-        delete mp_hs;
-    }
-    if (mp_wm != NULL) {
-        delete mp_wm;
-    }
+    if (shell_desktop)
+	    agl_shell_desktop_destroy(shell_desktop);
 }
 
 void EventHandler::init(int port, const char *token)
 {
-    myThis = this;
-    mp_wm = new QLibWindowmanager();
-    mp_wm->init(port, token);
-
-    mp_hs = new QLibHomeScreen();
-    mp_hs->init(port, token);
-
-    mp_hs->set_event_handler(QLibHomeScreen::Event_ShowWindow, [this](json_object *object){
-        this->mp_wm->activateWindow(ROLE_NAME, "normal");
-        HMI_DEBUG(APP_ID, "received showWindow event, end!, line=%d", __LINE__);
-    });
-
-    mp_hs->set_event_handler(QLibHomeScreen::Event_ReplyShowWindow, [this](json_object *object){
-        HMI_DEBUG(APP_ID, "got Event_ReplyShowWindow!\n");
-        const char* msg = json_object_to_json_string(object);
-        emit this->signalOnReplyShowWindow(msg);
-    });
-
-    if (mp_wm->requestSurface(ROLE_NAME) != 0) {
-        HMI_DEBUG(APP_ID, "!!!!LayoutHandler requestSurface Failed!!!!!");
-        exit(EXIT_FAILURE);
-    }
-
-    // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
-    mp_wm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [this](json_object *object) {
-        HMI_DEBUG(APP_ID, "Surface got syncDraw!");
-        this->mp_wm->endDraw(ROLE_NAME);
-    });
-
-    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);
-
-        HMI_DEBUG(APP_ID, "Event_Active 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_Inactive kKeyDrawingName = %s", name);
-    });
-
-    HMI_DEBUG(APP_ID, "LayoutHander::init() finished.");
+	(void) port;
+	(void) token;
+
+	shell_desktop = register_agl_shell_desktop();
+	if (shell_desktop)
+		agl_shell_desktop_add_listener(shell_desktop, &agl_shell_desk_listener, this);
+
+
+	m_launcher = new Launcher(DEFAULT_AFM_UNIX_SOCK, nullptr);
+	if (m_launcher->setup_pws_connection() != 0)
+		HMI_DEBUG("onscreen", "EventHandler::init failed to set-up connection to afm-system-daemon");
 }
 
 void EventHandler::setQuickWindow(QQuickWindow *qw)
 {
     mp_qw = qw;
-    QObject::connect(mp_qw, SIGNAL(frameSwapped()), mp_wm, SLOT(slotActivateSurface()));
 }
 
 void EventHandler::showWindow(QString id, QString json)
 {
-    if(json.isNull())
-        mp_hs->tapShortcut(id);
-    else
-        mp_hs->showWindow(id.toStdString().c_str(), json_tokener_parse(json.toStdString().c_str()));
+	if (shell_desktop) {
+		struct wl_output *output = getWlOutput(qApp->screens().first());
+		qInfo() << "sending activate_app";
+		agl_shell_desktop_activate_app(shell_desktop,
+				id.toStdString().c_str(),
+				json.toStdString().c_str(),
+				output);
+	}
+
+	qInfo() << "data from json: " << json.toStdString().c_str();
 }
 
 void EventHandler::hideWindow(QString id)
 {
-    mp_hs->hideWindow(id.toStdString().c_str());
+	if (shell_desktop)
+		agl_shell_desktop_deactivate_app(shell_desktop, id.toStdString().c_str());
+}
+
+int
+EventHandler::start(const QString &app_id)
+{
+	int pid = -1;
+
+	if (m_launcher && m_launcher->connection_is_set())
+		pid = m_launcher->start(app_id);
+
+	return pid;
+}
+
+bool
+EventHandler::is_running(const QString &app_id)
+{
+	if (m_launcher && m_launcher->connection_is_set())
+		return m_launcher->is_running(app_id);
+
+	return false;
+}
+
+void
+EventHandler::set_window_popup(const QString &app_id, int x, int y)
+{
+	struct wl_output *output = getWlOutput(qApp->screens().first());
+
+	if (shell_desktop)
+		agl_shell_desktop_set_app_property(shell_desktop,
+				app_id.toStdString().c_str(),
+				AGL_SHELL_DESKTOP_APP_ROLE_POPUP, x, y, output);
 }