Conversion to using agl-compositor

- Use Qt/QtWayland to set-up an app_id for the main surface. We use that
  surface and pass it to waylandsink. Waylandsink create a sub-surface
  with the parent the Qt/QtWayland one.

- Install a handler for handling bus messages With it, it allows to pass
  the wl_display with the help of a context and the surface backing up
  the Widget.

- Installs a timer to wait for Qt to create/get the xdg_surface and
  attach a buffer to it.  Without we won't be able receive the commit
  for the parent event in order to handle it.

Bug-AGL: SPEC-3382

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I4237b7dad110ce36e3a01226e67cb508b6d9a6d9

8 files changed, 683 insertions, 219 deletions

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 229e961..ff8eb93 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -18,24 +18,66 @@
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(OE_QMAKE_PATH_EXTERNAL_HOST_BINS $ENV{OE_QMAKE_PATH_HOST_BINS})
 
+find_package(Qt5 COMPONENTS Core Gui QuickControls2 QuickWidgets REQUIRED)
+find_package(Qt5Gui ${QT_MIN_VERSION} CONFIG REQUIRED Private)
 find_package(PkgConfig REQUIRED)
+find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner)
 
 PROJECT_TARGET_ADD(cluster-receiver)
 
+add_custom_command(
+	OUTPUT  agl-shell-desktop-client-protocol.h
+	COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header
+	< ${CMAKE_SOURCE_DIR}/app/protocol/agl-shell-desktop.xml
+	> ${CMAKE_SOURCE_DIR}/app/agl-shell-desktop-client-protocol.h
+	DEPENDS ${CMAKE_SOURCE_DIR}/app/protocol/agl-shell-desktop.xml
+)
+
+
+add_custom_command(
+	OUTPUT  ${CMAKE_BINARY_DIR}/app/agl-shell-desktop-client-protocol.h
+	COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header
+	< ${CMAKE_SOURCE_DIR}/app/protocol/agl-shell-desktop.xml
+	> ${CMAKE_SOURCE_DIR}/app/agl-shell-desktop-client-protocol.h
+	DEPENDS ${CMAKE_SOURCE_DIR}/app/protocol/agl-shell-desktop.xml
+)
+
+add_custom_command(
+	OUTPUT  agl-shell-desktop-protocol.c
+	COMMAND ${WAYLAND_SCANNER_EXECUTABLE} code
+	< ${CMAKE_SOURCE_DIR}/app/protocol/agl-shell-desktop.xml
+	> ${CMAKE_BINARY_DIR}/app/agl-shell-desktop-protocol.c
+	DEPENDS ${CMAKE_SOURCE_DIR}/app/protocol/agl-shell-desktop.xml
+)
+
+pkg_check_modules(GSTREAMER REQUIRED gstreamer-1.0)
+pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-1.0)
+pkg_check_modules(GSTREAMER_VIDEO REQUIRED gstreamer-video-1.0)
+pkg_check_modules(GSTREAMER_PLUGINS_BAD REQUIRED gstreamer-plugins-bad-1.0)
+
+pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
+
 add_executable(${TARGET_NAME}
 	main.cpp
 	surface.cpp
+	agl-shell-desktop-protocol.c
+	agl-shell-desktop-client-protocol.h
+	shell-desktop.cpp
 	${RESOURCES}
 )
 
-pkg_check_modules(GSTREAMER REQUIRED gstreamer-1.0)
-pkg_check_modules(ILMCOMMON REQUIRED ilmCommon)
-
 include_directories(
-	  "${ILMCOMMON_INCLUDE_DIRS}"
-	  "${GSTREAMER_INCLUDE_DIRS}"
+	include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
+	${QTAPPFW_INCLUDE_DIRS}
+	"${GSTREAMER_INCLUDE_DIRS}"
+	"${GSTREAMER_PLUGINS_BASE_INCLUDE_DIRS}"
+	"${GSTREAMER_PLUGINS_BAD_INCLUDE_DIRS}"
+	"${GSTREAMER_VIDEO_INCLUDE_DIRS}"
 )
 
 set_target_properties(${TARGET_NAME} PROPERTIES
@@ -48,7 +90,13 @@ set_target_properties(${TARGET_NAME} PROPERTIES
 )
 
 target_link_libraries(${TARGET_NAME}
-	windowmanager
+	Qt5::QuickControls2
+	Qt5::QuickWidgets
 	${GSTREAMER_LIBRARIES}
-	${ILMCOMMON_LIBRARIES}
+	"${GSTREAMER_PLUGINS_BASE_LIBRARIES}"
+	"${GSTREAMER_PLUGINS_BAD_LIBRARIES}"
+	"${GSTREAMER_VIDEO_LIBRARIES}"
+	${QTAPPFW_LIBRARIES}
+	${WAYLAND_CLIENT_LIBRARIES}
+	-lgstwayland-1.0
 )
diff --git a/app/main.cpp b/app/main.cpp
index 0494b5f..796bcdb 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -13,20 +13,167 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <QGuiApplication>
+#include <QApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QCommandLineParser>
+#include <QtCore/QUrlQuery>
+#include <QtGui/QGuiApplication>
+#include <QtQml/QQmlApplicationEngine>
+#include <QtQml/QQmlContext>
+#include <QtQml/qqml.h>
+#include <QQuickWindow>
+#include <QtQuickControls2/QQuickStyle>
+#include <QtGui/QGuiApplication>
+#include <qpa/qplatformnativeinterface.h>
+#include <QTimer>
+
+#define GST_USE_UNSTABLE_API
+
+#include <QWidget>
 
 #include <string>
 #include <iostream>
 #include <cstring>
+
 #include <gst/gst.h>
+
+#include <gst/video/videooverlay.h>
+#include <gst/wayland/wayland.h>
+
 #include "surface.hpp"
 
-#undef DEBUG
+#define WINDOW_WIDTH_SIZE	640
+#define WINDOW_HEIGHT_SIZE	720
+
+#define WINDOW_WIDTH_POS_X	640
+#define WINDOW_WIDTH_POS_Y	180
+
+struct cluster_window_data {
+	int x; int y;
+	int width; int height;
+};
+
+struct cluster_receiver_data {
+	QWidget *widget;
+	QPlatformNativeInterface *native;
+
+	GstElement *pipeline;
+	GstWaylandVideo *wl_video;
+	GstVideoOverlay *overlay;
+
+	bool widget_has_buffer_mapped;
+	struct cluster_window_data window_data;
+};
+
+static struct wl_surface *
+getWlSurface(QPlatformNativeInterface *native, QWindow *window)
+{
+	void *surf = native->nativeResourceForWindow("surface", window);
+	return static_cast<struct ::wl_surface *>(surf);
+}
+
+
+static void
+error_cb(GstBus *bus, GstMessage *msg, gpointer user_data)
+{
+	struct cluster_receiver_data *d = static_cast<struct cluster_receiver_data *>(user_data);
+
+	gchar *debug = NULL;
+	GError *err = NULL;
+
+	gst_message_parse_error(msg, &err, &debug);
+
+	g_print("Error: %s\n", err->message);
+	g_error_free(err);
+
+	if (debug) {
+		g_print("Debug details: %s\n", debug);
+		g_free(debug);
+	}
+
+	gst_element_set_state(d->pipeline, GST_STATE_NULL);
+}
+
+static GstBusSyncReply
+bus_sync_handler(GstBus *bus, GstMessage *message, gpointer user_data)
+{
+	struct cluster_receiver_data *d = static_cast<struct cluster_receiver_data *>(user_data);
+
+	if (gst_is_wayland_display_handle_need_context_message(message)) {
+		GstContext *context;
+		struct wl_display *display_handle;
+
+		display_handle =
+			static_cast<struct wl_display *>(
+				d->native->nativeResourceForIntegration("display")
+			);
+
+		context = gst_wayland_display_handle_context_new(display_handle);
+
+		d->wl_video = GST_WAYLAND_VIDEO(GST_MESSAGE_SRC(message));
+		gst_element_set_context(GST_ELEMENT(GST_MESSAGE_SRC(message)), context);
+
+		goto drop;
+	} else if (gst_is_video_overlay_prepare_window_handle_message(message)) {
+		struct wl_surface *window_handle;
+		QWindow *win = d->widget->windowHandle();
+
+		if (!d->widget_has_buffer_mapped) {
+			d->widget->setVisible(true);
+			d->widget_has_buffer_mapped = true;
+		}
+
+		/* GST_MESSAGE_SRC(message) will be the overlay object that we
+		 * have to use. This may be waylandsink, but it may also be
+		 * playbin. In the latter case, we must make sure to use
+		 * playbin instead of waylandsink, because playbin resets the
+		 * window handle and render_rectangle after restarting playback
+		 * and the actual window size is lost */
+		d->overlay = GST_VIDEO_OVERLAY(GST_MESSAGE_SRC(message));
+		window_handle = getWlSurface(d->native, win);
+
+		g_print("setting window handle and size (%d x %d) w %d, h %d\n",
+				d->window_data.x, d->window_data.y,
+				d->window_data.width, d->window_data.height);
+
+		gst_video_overlay_set_window_handle(d->overlay, (guintptr) window_handle);
+		gst_video_overlay_set_render_rectangle(d->overlay,
+				d->window_data.x, d->window_data.y,
+				d->window_data.width, d->window_data.height);
+
+		goto drop;
+	}
+
+	return GST_BUS_PASS;
+
+drop:
+	gst_message_unref(message);
+	return GST_BUS_DROP;
+}
 
 int main(int argc, char *argv[])
 {
 	int port = 0;
 	std::string token;
 	std::string role = "receiver";
+	QString my_role = "receiver";
+
+	struct cluster_receiver_data receiver_data = {};
+	struct cluster_window_data window_data = {};
+
+	window_data.x = 0;
+	window_data.y = 0;
+
+	window_data.width = WINDOW_WIDTH_SIZE;
+	window_data.height = WINDOW_HEIGHT_SIZE;
+
+	receiver_data.window_data = window_data;
+
+	int gargc = 2;
+	char **gargv = (char**) malloc(2 * sizeof(char*));
+	gargv[0] = strdup(argv[0]);
+	gargv[1] = strdup("--gst-debug-level=2");
 
 	try {
 		port = std::stol(argv[1]);
@@ -53,54 +200,86 @@ int main(int argc, char *argv[])
 	//
 
 	std::string pipeline_str = \
-		"rtpbin name=rtpbin udpsrc caps=\"application/x-rtp,media=(string)video,clock-rate=(int)90000,encoding-name=JPEG,payload=26\" port=5005 !    rtpbin.recv_rtp_sink_0 rtpbin. ! rtpjpegdepay ! jpegdec ! ";
-	GstPlugin *plugin = gst_registry_find_plugin(gst_registry_get (), "vaapisink");
-	if(plugin) {
+		"rtpbin name=rtpbin udpsrc caps=\"application/x-rtp,media=(string)video,clock-rate=(int)90000,encoding-name=JPEG,payload=26\" port=5005 ! rtpbin.recv_rtp_sink_0 rtpbin. ! rtpjpegdepay ! jpegdec ! ";
+		//"rtpbin name=rtpbin udpsrc caps=\"application/x-rtp,media=(string)video,clock-rate=(int)90000,encoding-name=JPEG,payload=26\" port=5005 ! rtpbin.recv_rtp_sink_0 rtpbin. ! rtpjpegdepay ! jpegdec";
+	GstPlugin *plugin = gst_registry_find_plugin(gst_registry_get(), "vaapisink");
+
+	if (plugin) {
+		std::cout << "Using va api sink" << std::endl;
 		pipeline_str += "vaapisink";
 		gst_object_unref(plugin);
 	} else {
+		std::cout << "Using wayland sink" << std::endl;
 		pipeline_str += "waylandsink";
 	}
-#ifdef DEBUG
-	std::cout << "Using pipeline: " << pipeline_str << std::endl;
-#endif
 
-        // Initialize GStreamer
-#ifdef DEBUG
-	int gargc = 2;
-	char **gargv = (char**) malloc(2 * sizeof(char*));
-	gargv[0] = strdup(argv[0]);
-	gargv[1] = strdup("--gst-debug-level=2");
 	gst_init(&gargc, &gargv);
-#else
-        gst_init(NULL, NULL);
-#endif
 
-	// Create our IVI surface handler
+	std::cout << "Using pipeline: " << pipeline_str << std::endl;
+
+	QApplication app(argc, argv);
+	QPlatformNativeInterface *native = qApp->platformNativeInterface();
+	receiver_data.native = native;
+
+	// mark the application id -> my_role
+	app.setDesktopFileName(my_role);
+
 	SurfaceHandler handler(port, token, role);
 
+	// we already have the app_id -> role this will set-up the x and y
+	// position and a bounding box that will be used to clip out the
+	// surface. Note, that in this example, the surface area is the same as
+	// the bounding box
+	handler.set_bounding_box(WINDOW_WIDTH_POS_X, WINDOW_WIDTH_POS_Y,
+				 0, 0, WINDOW_WIDTH_SIZE, WINDOW_HEIGHT_SIZE);
+
+	QWidget *widget = new QWidget;
+	widget->resize(WINDOW_WIDTH_SIZE,
+		       WINDOW_HEIGHT_SIZE);
+	widget->setVisible(false);
+	// this is necessary to trigger a buffer attach on the xdg surface;
+	// waylandsink will use that surface to create a sub-surface and will
+	// perform a commit on the parent one; without doing a show() here
+	// QtWayland will not attach the buffer to the surface, and the parent
+	// surface will not be 'committed'; most likely this require more
+	// fiddling as to keep the buffer attached but not displayed or use
+	// some kind of local alpha to display that cluster is showing
+	widget->show();
+
+	receiver_data.widget = widget;
+	receiver_data.widget_has_buffer_mapped = true;
+
 	GstElement *pipeline = gst_parse_launch(pipeline_str.c_str(), NULL);
-	if(!pipeline) {
+	if (!pipeline) {
 		std::cerr << "gstreamer pipeline construction failed!" << std::endl;
 		exit(1);
 	}
+	receiver_data.pipeline = pipeline;
 
-	// Start pipeline
-	gst_element_set_state(pipeline, GST_STATE_PLAYING);
-	std::cout << "gstreamer pipeline running" << std::endl;
-
-	// Wait until error or EOS
 	GstBus *bus = gst_element_get_bus(pipeline);
-	GstMessage *msg = gst_bus_timed_pop_filtered(bus,
-						     GST_CLOCK_TIME_NONE,
-						     (GstMessageType) (GST_MESSAGE_ERROR | GST_MESSAGE_EOS));
+	gst_bus_add_signal_watch(bus);
 
-	// Free resources
-	if(msg != NULL)
-		gst_message_unref(msg);
+	g_signal_connect(bus, "message::error", G_CALLBACK(error_cb), &receiver_data);
+	gst_bus_set_sync_handler(bus, bus_sync_handler, &receiver_data, NULL);
 	gst_object_unref(bus);
+
+	// Start the pipeline, giving Qt the time to create everything; not
+	// waiting here will cause both Qt and Gstreamer to race, running as
+	// different threads. So this gives Qt sufficient time to create the
+	// Widget, the surface the buffer and attach it to the surface. The
+	// drawback is that it will displayed until the remote side start
+	// sending frames to decode.
+	std::cout << "wainting for Qt to be ready..." << std::endl;
+	QTimer::singleShot(500, [pipeline](){
+		gst_element_set_state(pipeline, GST_STATE_PLAYING);
+		std::cout << "gstreamer pipeline running" << std::endl;
+	});
+
+	// run the application
+	int ret = app.exec();
+	widget->hide();
+
 	gst_element_set_state(pipeline, GST_STATE_NULL);
 	gst_object_unref(pipeline);
-
-	return 0;
+	return ret;
 }
diff --git a/app/protocol/agl-shell-desktop.xml b/app/protocol/agl-shell-desktop.xml
new file mode 100644
index 0000000..e8ae153
--- /dev/null
+++ b/app/protocol/agl-shell-desktop.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="agl_shell_desktop">
+  <copyright>
+    Copyright © 2020 Collabora, Ltd.
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice (including the next
+    paragraph) shall be included in all copies or substantial portions of the
+    Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+  </copyright>
+  <interface name="agl_shell_desktop" version="1">
+    <description summary="Private extension to allow applications activate other apps">
+      This extension can be used by regular application to instruct to compositor
+      to activate or switch to other running (regular) applications. The client
+      is responsbile for filtering their own app_id when receiving application id.
+
+      The compositor will allow clients to bind to this interface only if the
+      policy engine allows it.
+    </description>
+
+    <enum name="app_role">
+      <entry name="popup" value="0"/>
+      <entry name="fullscreen" value="1"/>
+      <entry name="split_vertical" value="2"/>
+      <entry name="split_horizontal" value="3"/>
+      <entry name="remote" value="4"/>
+    </enum>
+
+    <enum name="app_state">
+      <entry name="activated" value="0"/>
+      <entry name="deactivated" value="1"/>
+    </enum>
+
+    <event name="application">
+      <description summary="advertise application id">
+        The compositor may choose to advertise one or more application ids which
+        can be used to activate/switch to.
+
+        When this global is bound, the compositor will send all application ids
+        available for activation, but may send additional application id at any
+        time (when they've been mapped in the compositor).
+      </description>
+      <arg name="app_id" type="string"/>
+    </event>
+
+    <request name="activate_app">
+      <description summary="make client current window">
+        Ask the compositor to make a toplevel to become the current/focused
+        window for window management purposes.
+
+        See xdg_toplevel.set_app_id from the xdg-shell protocol for a
+        description of app_id.
+      </description>
+      <arg name="app_id" type="string"/>
+      <arg name="app_data" type="string" allow-null="true"/>
+      <arg name="output" type="object" interface="wl_output"/>
+    </request>
+
+    <request name="set_app_property">
+      <description summary="set properties for a client identified by app_id">
+        Ask the compositor to make a top-level window obey the 'app_role' enum
+        and, depending on that role, to use some of the arguments as initial
+        values to take into account.
+
+        Note that x, y, bx, by, width and height would only make sense for the
+        pop-up role, with the output argument being applicable to all the roles.
+        The width and height values define the maximum area which the
+        top-level window should be placed into. Note this doesn't correspond to
+        top-level surface size, but to a bounding box which will be used to
+        clip the surface to, in case the surface area extends that of this
+        bounding box. Both of these values need to be larger than 0 (zero) to be
+        taken into account by the compositor. Any negative values for the width
+        and height will be discarded.
+
+        The x and y values will serve as the (initial) position values.
+        The bx and by values are the top-left x and y value of the bounding box.
+        Any clipping happening to the bounding box will not affect the surface
+        size or the position of the underlying surface backing the top-level
+        window. The bx and by values, like the positional values, could be
+        both set to zero, or even negative values. The compositor will pass
+        those on without any further validation.
+
+        The initial position values and the bounding rectangle will still be
+        in effect on a subsequent activation request of the 'app_id', assuming
+        it was previously de-activated at some point in time.
+
+        See xdg_toplevel.set_app_id from the xdg-shell protocol for a
+        description of app_id.
+      </description>
+      <arg name="app_id" type="string"/>
+      <arg name="role" type="uint" enum="app_role"/>
+      <arg name="x" type="int"/>
+      <arg name="y" type="int"/>
+      <arg name="bx" type="int"/>
+      <arg name="by" type="int"/>
+      <arg name="width" type="int"/>
+      <arg name="height" type="int"/>
+      <arg name="output" type="object" interface="wl_output"/>
+    </request>
+
+    <request name="deactivate_app">
+      <description summary="de-activate/hide window identified by app_id">
+        Ask the compositor to hide the toplevel window for window
+        management purposes. Depending on the window role, this request
+        will either display the previously active window (or the background
+        in case there's no previously activate surface) or temporarly (or
+        until a 'activate_app' is called upon) hide the surface. All
+        the surfaces are identifiable by using the app_id, and no actions are
+        taken in case the app_id is not/was not present.
+
+        See xdg_toplevel.set_app_id from the xdg-shell protocol for a
+        description of app_id.
+      </description>
+      <arg name="app_id" type="string"/>
+    </request>
+
+    <event name="state_app">
+      <description summary="event sent when application has suffered state modification">
+        Notifies application(s) when other application have suffered state modifications.
+      </description>
+      <arg name="app_id" type="string"/>
+      <arg name="app_data" type="string" allow-null="true"/>
+      <arg name="state" type="uint" enum="app_state"/>
+      <arg name="role" type="uint" enum="app_role"/>
+    </event>
+
+  </interface>
+</protocol>
diff --git a/app/shell-desktop.cpp b/app/shell-desktop.cpp
new file mode 100644
index 0000000..1be7327
--- /dev/null
+++ b/app/shell-desktop.cpp
@@ -0,0 +1,117 @@
+/*
+ * Copyright © 2020 Collabora Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <QGuiApplication>
+#include <QDebug>
+#include "shell-desktop.h"
+#include <qpa/qplatformnativeinterface.h>
+#include <stdio.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
+flush_connection(void)
+{
+	QPlatformNativeInterface *native = qApp->platformNativeInterface();
+	struct wl_display *wl = static_cast<struct wl_display *>(native->nativeResourceForIntegration("display"));
+
+	wl_display_roundtrip(wl);
+}
+
+void Shell::activate_app(QWindow *win, const QString &app_id, const QString &app_data)
+{
+	QScreen *screen = nullptr;
+	struct wl_output *output;
+
+	if (!win || !win->screen()) {
+		screen = qApp->screens().first();
+	} else {
+		screen = win->screen();
+	}
+
+	if (!screen) {
+		return;
+	}
+
+	output = getWlOutput(screen);
+	agl_shell_desktop_activate_app(this->shell.get(),
+				       app_id.toStdString().c_str(),
+				       app_data.toStdString().c_str(), output);
+
+}
+
+void Shell::deactivate_app(const QString &app_id)
+{
+	agl_shell_desktop_deactivate_app(this->shell.get(), 
+					 app_id.toStdString().c_str());
+}
+
+void Shell::set_window_props(QWindow *win, const QString &app_id, uint32_t
+		props, int x, int y, int bx, int by, int bwidth, int bheight)
+{
+	QScreen *screen = nullptr;
+	struct wl_output *output;
+
+	if (!win || !win->screen()) {
+		screen = qApp->screens().first();
+	} else {
+		screen = win->screen();
+	}
+
+	if (!screen) {
+		return;
+	}
+
+	output = getWlOutput(screen);
+	agl_shell_desktop_set_app_property(this->shell.get(),
+					   app_id.toStdString().c_str(),
+					   props, x, y, bx, by, bwidth, bheight, output);
+}
+
+void
+Shell::set_window_props(const QString &app_id, uint32_t props,
+			int x, int y, int bx, int by, int bwidth, int bheight)
+{
+	QScreen *screen;
+	struct wl_output *output;
+
+	screen = qApp->primaryScreen();
+	if (!screen) {
+		return;
+	}
+
+	output = getWlOutput(screen);
+	agl_shell_desktop_set_app_property(this->shell.get(),
+					   app_id.toStdString().c_str(),
+					   props, x, y, bx, by, bwidth, bheight,
+					   output);
+}
diff --git a/app/shell-desktop.h b/app/shell-desktop.h
new file mode 100644
index 0000000..06da981
--- /dev/null
+++ b/app/shell-desktop.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2019 Collabora Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef SHELLDESKTOP_H
+#define SHELLDESKTOP_H
+
+#include <QObject>
+#include <QString>
+#include <QScreen>
+#include <QWindow>
+#include <memory>
+
+#include <wayland-client.h>
+#include "agl-shell-desktop-client-protocol.h"
+
+/*
+ * Basic type to wrap the agl_shell wayland object into a QObject, so that it
+ * can be used in callbacks from QML.
+ */
+
+class Shell : public QObject
+{
+Q_OBJECT
+	std::shared_ptr<struct agl_shell_desktop> shell;
+
+public:
+	Shell(std::shared_ptr<struct agl_shell_desktop> shell, QObject *parent = nullptr) :
+		QObject(parent), shell(shell) 
+	{}
+
+signals:
+	// using Qobject::connect(), callins into qml
+	void showOnScreen();
+
+public slots: // calls out of qml into CPP
+	void activate_app(QWindow *win, const QString &app_id, const QString &app_data);
+	void deactivate_app(const QString &app_id);
+	void set_window_props(QWindow *win, const QString &app_id, uint32_t
+			props, int x, int y, int bx, int by, int bwidth, int bheight);
+
+	void set_window_props(const QString &app_id, uint32_t props,
+			      int x, int y,
+			      int bx, int by, int bwidth, int bheight);
+};
+
+#endif // SHELLDESKTOP_H
diff --git a/app/surface.cpp b/app/surface.cpp
index 8f6c49f..c0cd8ac 100644
--- a/app/surface.cpp
+++ b/app/surface.cpp
@@ -26,168 +26,121 @@
 #include "surface.hpp"
 #include "hmi-debug.h"
 
-#define AREA_NORMAL_FULL "normal.full"
+#include <QGuiApplication>
+#include <QtGui/QGuiApplication>
+#include <qpa/qplatformnativeinterface.h>
 
-SurfaceHandler::SurfaceHandler(const int port, const std::string &token, const std::string &role)
-{
-	m_port = port;
-	m_token = token;
-	m_role = role;
+#include <QObject>
+#include <QString>
+#include <QScreen>
+#include <QWindow>
 
-	m_rid = getpid();
+#include "agl-shell-desktop-client-protocol.h"
 
-	// Setup HomeScreen/WindowManager API
-	if (init_wm()) {
-		HMI_ERROR("receiver:sh", "cannot setup windowmanager API");
-		exit(1);
-	}
+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);
 
-	// Setup ilmController API
-	m_ic = new ILMControl(notify_ivi_control_cb_static, this);
-	if (!m_ic) {
-		HMI_ERROR("receiver:sh", "cannot setup IVI layer management API");
-		exit(1);
+	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)
+		);
 	}
 }
 
-int SurfaceHandler::init_wm(void)
+static void
+global_remove(void *data, struct wl_registry *reg, uint32_t id)
 {
-	m_wm = new LibWindowmanager();
-	if (m_wm->init(m_port, m_token.c_str())) {
-		HMI_ERROR("receiver:sh", "cannot initialize windowmanager");
-		return -1;
-	}
+	(void) data;
+	(void) reg;
+	(void) id;
+}
 
-	std::function< void(json_object*) > h_active =
-		[](json_object* object) {
-			HMI_DEBUG("receiver:sh", "Got Event_Active");
-		};
-
-	std::function< void(json_object*) > h_inactive =
-		[](json_object* object) {
-			HMI_DEBUG("receiver:sh", "Got Event_Inactive");
-		};
-
-	std::function< void(json_object*) > h_visible =
-		[](json_object* object) {
-			HMI_DEBUG("receiver:sh", "Got Event_Visible");
-		};
-
-	std::function< void(json_object*) > h_invisible =
-		[](json_object* object) {
-			HMI_DEBUG("receiver:sh", "Got Event_Invisible");
-		};
-
-	std::function< void(json_object*) > h_syncdraw =
-		[this](json_object* object) {
-			HMI_DEBUG("receiver:sh", "Got Event_SyncDraw");
-			this->m_wm->endDraw(this->m_role.c_str());
-		};
-
-	std::function< void(json_object*) > h_flushdraw =
-		[](json_object* object) {
-			HMI_DEBUG("receiver:sh", "Got Event_FlushDraw");
-		};
-
-	m_wm->set_event_handler(LibWindowmanager::Event_Active, h_active);
-	m_wm->set_event_handler(LibWindowmanager::Event_Inactive, h_inactive);
-	m_wm->set_event_handler(LibWindowmanager::Event_Visible, h_visible);
-	m_wm->set_event_handler(LibWindowmanager::Event_Invisible, h_invisible);
-	m_wm->set_event_handler(LibWindowmanager::Event_SyncDraw, h_syncdraw);
-	m_wm->set_event_handler(LibWindowmanager::Event_FlushDraw, h_flushdraw);
+static const struct wl_registry_listener registry_listener = {
+	global_add,
+	global_remove,
+};
 
-	return 0;
-}
 
-void SurfaceHandler::notify_ivi_control_cb(ilmObjectType object,
-					   t_ilm_uint id,
-					   t_ilm_bool created)
+static void
+application_id_event(void *data, struct agl_shell_desktop *agl_shell_desktop,
+		const char *app_id)
 {
-	if (object == ILM_SURFACE) {
-		struct ilmSurfaceProperties surf_props;
-
-		ilm_getPropertiesOfSurface(id, &surf_props);
-		pid_t surf_pid = surf_props.creatorPid;
-
-		if (!created) {
-			HMI_DEBUG("receiver:sh", "ivi surface (id=%d, pid=%d) destroyed.", id, surf_pid);
-			unregister_surfpid(surf_pid);
-			m_surfaces.erase(surf_pid);
-			return;
-		}
-
-		HMI_DEBUG("receiver:sh", "ivi surface (id=%d, pid=%d) is created.", id, surf_pid);
-
-		register_surfpid(surf_pid);
-		if (m_rid && surf_pid == find_surfpid_by_rid(m_rid)) {
-			setup_surface(id);
-		}
-		m_surfaces[surf_pid] = id;
-	} else if (object == ILM_LAYER) {
-		if (created)
-			HMI_DEBUG("receiver:sh", "ivi layer: %d created.", id);
-		else
-			HMI_DEBUG("receiver:sh", "ivi layer: %d destroyed.", id);
-	}
 
 }
 
-void SurfaceHandler::notify_ivi_control_cb_static (ilmObjectType object,
-						   t_ilm_uint id,
-						   t_ilm_bool created,
-						   void *user_data)
+static void
+application_id_state(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)
 {
-	SurfaceHandler *handler = static_cast<SurfaceHandler*>(user_data);
-	handler->notify_ivi_control_cb(object, id, created);
+	(void) app_data;
+	(void) agl_shell_desktop;
+	(void) app_id;
+	(void) app_state;
+	(void) app_role;
 }
 
-void SurfaceHandler::register_surfpid (pid_t surf_pid)
+static const struct agl_shell_desktop_listener agl_shell_desk_listener = {
+	application_id_event,
+	application_id_state,
+};
+
+static struct agl_shell_desktop *
+register_agl_shell_desktop(QPlatformNativeInterface *native)
 {
-	if (surf_pid == m_rid) {
-		if (!std::count(m_pid_v.begin(), m_pid_v.end(), surf_pid)) {
-			HMI_DEBUG("receiver:sh", "surface creator(pid=%d) registered", surf_pid);
-			m_pid_v.push_back(surf_pid);
-			HMI_DEBUG("receiver:sh", "m_pid_v.count(%d) = %d", surf_pid,
-				  std::count(m_pid_v.begin(), m_pid_v.end(), surf_pid));
-		}
-	}
+	struct wl_display *wl;
+	struct wl_registry *registry;
+	struct agl_shell_desktop *shell = nullptr;
+
+	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 SurfaceHandler::unregister_surfpid (pid_t surf_pid)
+SurfaceHandler::SurfaceHandler(const int port, const std::string &token, const std::string &role)
 {
-	auto itr = m_pid_v.begin();
-	while (itr != m_pid_v.end()) {
-		if (*itr == surf_pid) {
-			m_pid_v.erase(itr++);
-		} else {
-			++itr;
-		}
+	m_port = port;
+	m_token = token;
+	m_role = role;
+
+	if (init_agl_shell()) {
+		exit(1);
 	}
+
+	agl_shell_desktop_add_listener(shell, &agl_shell_desk_listener, this);
 }
 
-pid_t SurfaceHandler::find_surfpid_by_rid (pid_t rid)
+int
+SurfaceHandler::init_agl_shell(void)
 {
-	HMI_DEBUG("receiver:sh", "find surfpid by rid(%d)", rid);
-	if (std::count(m_pid_v.begin(), m_pid_v.end(), rid)) {
-		HMI_DEBUG("receiver:sh", "found return(%d)", rid);
-		return rid;
+	QPlatformNativeInterface *native = qApp->platformNativeInterface();
+	shell = register_agl_shell_desktop(native);
+	if (!shell) {
+		return -1;
 	}
 
-	return -1;
-}
+	std::shared_ptr<struct agl_shell_desktop>
+		agl_shell{shell, agl_shell_desktop_destroy};
 
-void SurfaceHandler::setup_surface (int id)
-{
-	std::string sid = std::to_string(id);
+	aglShell = new Shell(agl_shell, nullptr);
 
-	// This surface is mine, register pair app_name and ivi id.
-	HMI_DEBUG("receiver:sh", "requestSurfaceXDG(%s,%d)", m_role.c_str(), id);
-	m_wm->requestSurfaceXDG(m_role.c_str(), id);
+	return 0;
+}
 
-	if (m_pending_create) {
-		// Activate window if it has not been yet
-		HMI_DEBUG("receiver:sh", "calling activateWindow on (%s,%d)", m_role.c_str(), id);
-		m_pending_create = false;
-		m_wm->activateWindow(m_role.c_str(), AREA_NORMAL_FULL);
-	}
+void
+SurfaceHandler::set_bounding_box(int x, int y, int bx, int by, int width, int height)
+{
+	QString app_id = QString::fromUtf8(m_role.c_str(), -1);
+	aglShell->set_window_props(app_id, AGL_SHELL_DESKTOP_APP_ROLE_POPUP,
+				   x, y, bx, by, width, height);
 }
diff --git a/app/surface.hpp b/app/surface.hpp
index 88be3bb..82b5c86 100644
--- a/app/surface.hpp
+++ b/app/surface.hpp
@@ -32,63 +32,23 @@
 #include <map>
 #include <algorithm>
 
-#include <ilm/ilm_control.h> 
-#include <libwindowmanager.h>
-
-class ILMControl
-{
-public:
-	ILMControl(notificationFunc callback, void *user_data) {
-		ilm_init();
-		ilm_registerNotification(callback, user_data);
-	}
-
-	~ILMControl(void) {
-		ilm_unregisterNotification();
-		ilm_destroy();
-	}
-};
+#include "shell-desktop.h"
 
 class SurfaceHandler
 {
 public:
 	SurfaceHandler(const int port, const std::string &token, const std::string &role);
-
-	void notify_ivi_control_cb(ilmObjectType object,
-				   t_ilm_uint id,
-				   t_ilm_bool created);
-
-	static void notify_ivi_control_cb_static (ilmObjectType object,
-						  t_ilm_uint id,
-						  t_ilm_bool created,
-						  void *user_data);
+	void set_bounding_box(int x, int y, int bx, int by, int width, int height);
 
 private:
 	int m_port;
 	std::string m_token;
-
 	std::string m_role;
 
-	int m_rid = 0;
-
-	LibWindowmanager *m_wm;
-	ILMControl *m_ic;
-
-	std::vector<pid_t> m_pid_v;
-
-	std::map<int, int> m_surfaces;  // pair of <afm:rid, ivi:id>
-
-	//bool m_pending_create = false;
-	bool m_pending_create = true;
-
-	// Private functions
-
-	int init_wm(void);
+	int init_agl_shell(void);
 
-	void register_surfpid(pid_t surf_pid);
-	void unregister_surfpid(pid_t surf_pid);
-	pid_t find_surfpid_by_rid(pid_t rid);
-	void setup_surface(int id);
+	struct agl_shell_desktop *shell;
+	Shell *aglShell;
 };
 
 #endif // SURFACE_HPP
diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in
index aa18bdc..d6ba98c 100644
--- a/conf.d/wgt/config.xml.in
+++ b/conf.d/wgt/config.xml.in
@@ -6,9 +6,6 @@
   <description>@PROJECT_DESCRIPTION@</description>
   <author>@PROJECT_AUTHOR@ &lt;@PROJECT_AUTHOR_MAIL@&gt;</author>
   <license>@PROJECT_LICENSE@</license>
-  <feature name="urn:AGL:widget:required-api">
-    <param name="windowmanager" value="ws" />
-  </feature>
   <feature name="urn:AGL:widget:required-permission">
     <param name="urn:AGL:permission::public:display" value="required" />
     <param name="urn:AGL:permission::system:run-by-default" value="required" />