Merge pull request #21 from thp/wayland-windowmanager

wayland: Support for QtWayland windowmanager

README.wayland

@@ -16,7 +16,7 @@ Clone QtWayland from Git:
     http://qt.gitorious.org/qt/qtwayland/
 
 Generate headers and glue code:
-    for extension in touch-extension surface-extension; do
+    for extension in touch-extension surface-extension windowmanager; do
         wayland-scanner client-header < src/extensions/$extension.xml > wayland-qt-$extension.h
         wayland-scanner code < src/extensions/$extension.xml > wayland-qt-$extension.c
     done

src/video/wayland/SDL_waylandvideo.c

@@ -26,6 +26,7 @@
 
 #include "SDL_video.h"
 #include "SDL_mouse.h"
+#include "../../events/SDL_events_c.h"
 
 #include "SDL_waylandvideo.h"
 #include "SDL_waylandevents_c.h"
@@ -165,6 +166,23 @@ static const struct wl_shm_listener shm_listener = {
     shm_handle_format
 };
 
+static void
+windowmanager_hints(void *data, struct qt_windowmanager *qt_windowmanager,
+        int32_t show_is_fullscreen)
+{
+}
+
+static void
+windowmanager_quit(void *data, struct qt_windowmanager *qt_windowmanager)
+{
+    SDL_SendQuit();
+}
+
+static const struct qt_windowmanager_listener windowmanager_listener = {
+    windowmanager_hints,
+    windowmanager_quit,
+};
+
 static void
 display_handle_global(void *data, struct wl_registry *registry, uint32_t id,
 					const char *interface, uint32_t version)
@@ -190,6 +208,10 @@ display_handle_global(void *data, struct wl_registry *registry, uint32_t id,
     } else if (strcmp(interface, "qt_surface_extension") == 0) {
         d->surface_extension = wl_registry_bind(registry, id,
                 &qt_surface_extension_interface, 1);
+    } else if (strcmp(interface, "qt_windowmanager") == 0) {
+        d->windowmanager = wl_registry_bind(registry, id,
+                &qt_windowmanager_interface, 1);
+        qt_windowmanager_add_listener(d->windowmanager, &windowmanager_listener, d);
     }
 }
 
@@ -291,6 +313,9 @@ Wayland_VideoQuit(_THIS)
         data->xkb_context = NULL;
     }
 
+    if (data->windowmanager)
+        qt_windowmanager_destroy(data->windowmanager);
+
     if (data->surface_extension)
         qt_surface_extension_destroy(data->surface_extension);
 

src/video/wayland/SDL_waylandvideo.h

@@ -32,6 +32,7 @@
 #include <wayland-egl.h>
 
 #include "wayland-qt-surface-extension.h"
+#include "wayland-qt-windowmanager.h"
 
 #include <EGL/egl.h>
 
@@ -62,6 +63,7 @@ typedef struct {
     struct SDL_WaylandInput *input;
     struct SDL_WaylandTouch *touch;
     struct qt_surface_extension *surface_extension;
+    struct qt_windowmanager *windowmanager;
 
     uint32_t shm_formats;
 } SDL_WaylandData;

src/video/wayland/wayland-qt-windowmanager.c

@@ -0,0 +1,63 @@
+/* 
+ * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ * Contact: http://www.qt-project.org/legal
+ * 
+ * This file is part of the plugins of the Qt Toolkit.
+ * 
+ * $QT_BEGIN_LICENSE:BSD$
+ * You may use this file under the terms of the BSD license as follows:
+ * 
+ * "Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+ * of its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+ * 
+ * $QT_END_LICENSE$
+ */
+
+#include <stdlib.h>
+#include <stdint.h>
+#include "wayland-util.h"
+
+
+static const struct wl_interface *types[] = {
+	NULL,
+	NULL,
+};
+
+static const struct wl_message qt_windowmanager_requests[] = {
+	{ "open_url", "us", types + 0 },
+};
+
+static const struct wl_message qt_windowmanager_events[] = {
+	{ "hints", "i", types + 0 },
+	{ "quit", "", types + 0 },
+};
+
+WL_EXPORT const struct wl_interface qt_windowmanager_interface = {
+	"qt_windowmanager", 1,
+	1, qt_windowmanager_requests,
+	2, qt_windowmanager_events,
+};
+

src/video/wayland/wayland-qt-windowmanager.h

@@ -0,0 +1,111 @@
+/* 
+ * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ * Contact: http://www.qt-project.org/legal
+ * 
+ * This file is part of the plugins of the Qt Toolkit.
+ * 
+ * $QT_BEGIN_LICENSE:BSD$
+ * You may use this file under the terms of the BSD license as follows:
+ * 
+ * "Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+ * of its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+ * 
+ * $QT_END_LICENSE$
+ */
+
+#ifndef WINDOWMANAGER_CLIENT_PROTOCOL_H
+#define WINDOWMANAGER_CLIENT_PROTOCOL_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <stddef.h>
+#include "wayland-client.h"
+
+struct wl_client;
+struct wl_resource;
+
+struct qt_windowmanager;
+
+extern const struct wl_interface qt_windowmanager_interface;
+
+struct qt_windowmanager_listener {
+	/**
+	 * hints - (none)
+	 * @show_is_fullscreen: (none)
+	 */
+	void (*hints)(void *data,
+		      struct qt_windowmanager *qt_windowmanager,
+		      int32_t show_is_fullscreen);
+	/**
+	 * quit - (none)
+	 */
+	void (*quit)(void *data,
+		     struct qt_windowmanager *qt_windowmanager);
+};
+
+static inline int
+qt_windowmanager_add_listener(struct qt_windowmanager *qt_windowmanager,
+			      const struct qt_windowmanager_listener *listener, void *data)
+{
+	return wl_proxy_add_listener((struct wl_proxy *) qt_windowmanager,
+				     (void (**)(void)) listener, data);
+}
+
+#define QT_WINDOWMANAGER_OPEN_URL	0
+
+static inline void
+qt_windowmanager_set_user_data(struct qt_windowmanager *qt_windowmanager, void *user_data)
+{
+	wl_proxy_set_user_data((struct wl_proxy *) qt_windowmanager, user_data);
+}
+
+static inline void *
+qt_windowmanager_get_user_data(struct qt_windowmanager *qt_windowmanager)
+{
+	return wl_proxy_get_user_data((struct wl_proxy *) qt_windowmanager);
+}
+
+static inline void
+qt_windowmanager_destroy(struct qt_windowmanager *qt_windowmanager)
+{
+	wl_proxy_destroy((struct wl_proxy *) qt_windowmanager);
+}
+
+static inline void
+qt_windowmanager_open_url(struct qt_windowmanager *qt_windowmanager, uint32_t remaining, const char *url)
+{
+	wl_proxy_marshal((struct wl_proxy *) qt_windowmanager,
+			 QT_WINDOWMANAGER_OPEN_URL, remaining, url);
+}
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif