Use qmake wayland-scanner rules for the window manager integration
authorJørgen Lind <jorgen.lind@nokia.com>
Mon, 12 Dec 2011 14:12:17 +0000 (15:12 +0100)
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>
Mon, 12 Dec 2011 16:56:51 +0000 (17:56 +0100)
Change-Id: Ic75349df412e906d292d0ad76c9a35096fb9bb82
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
extensions/windowmanager/windowmanager.xml [moved from src/compositor/windowmanagerprotocol/windowmanager.xml with 100% similarity]
src/compositor/windowmanagerprotocol/wayland-windowmanager-protocol.c [deleted file]
src/compositor/windowmanagerprotocol/wayland-windowmanager-server-protocol.h [deleted file]
src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.cpp
src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri
src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-client-protocol.h [deleted file]
src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-protocol.c [deleted file]
src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri

diff --git a/src/compositor/windowmanagerprotocol/wayland-windowmanager-protocol.c b/src/compositor/windowmanagerprotocol/wayland-windowmanager-protocol.c
deleted file mode 100644 (file)
index 7e8861b..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * Contact: Nokia Corporation (qt-info@nokia.com)
- * 
- * This file is part of the plugins of the Qt Toolkit.
- * 
- * $QT_BEGIN_LICENSE:LGPL$
- * GNU Lesser General Public License Usage
- * This file may be used under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation and
- * appearing in the file LICENSE.LGPL included in the packaging of this
- * file. Please review the following information to ensure the GNU Lesser
- * General Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- * 
- * In addition, as a special exception, Nokia gives you certain additional
- * rights. These rights are described in the Nokia Qt LGPL Exception
- * version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
- * 
- * GNU General Public License Usage
- * Alternatively, this file may be used under the terms of the GNU General
- * Public License version 3.0 as published by the Free Software Foundation
- * and appearing in the file LICENSE.GPL included in the packaging of this
- * file. Please review the following information to ensure the GNU General
- * Public License version 3.0 requirements will be met:
- * http://www.gnu.org/copyleft/gpl.html.
- * 
- * Other Usage
- * Alternatively, this file may be used in accordance with the terms and
- * conditions contained in a signed written agreement between you and Nokia.
- * 
- * 
- * 
- * 
- * 
- * $QT_END_LICENSE$
- */
-
-#include <stdlib.h>
-#include <stdint.h>
-#include "wayland-util.h"
-
-extern const struct wl_interface wl_surface_interface;
-extern const struct wl_interface wl_output_interface;
-extern const struct wl_interface wl_surface_interface;
-
-static const struct wl_interface *types[] = {
-       NULL,
-       &wl_surface_interface,
-       NULL,
-       NULL,
-       &wl_output_interface,
-       NULL,
-       &wl_surface_interface,
-       NULL,
-       NULL,
-};
-
-static const struct wl_message wl_windowmanager_requests[] = {
-       { "map_client_to_process", "u", types + 0 },
-       { "authenticate_with_token", "s", types + 0 },
-       { "update_generic_property", "osa", types + 1 },
-};
-
-static const struct wl_message wl_windowmanager_events[] = {
-       { "client_onscreen_visibility", "i", types + 0 },
-       { "set_screen_rotation", "oi", types + 4 },
-       { "set_generic_property", "osa", types + 6 },
-};
-
-WL_EXPORT const struct wl_interface wl_windowmanager_interface = {
-       "wl_windowmanager", 1,
-       ARRAY_LENGTH(wl_windowmanager_requests), wl_windowmanager_requests,
-       ARRAY_LENGTH(wl_windowmanager_events), wl_windowmanager_events,
-};
-
diff --git a/src/compositor/windowmanagerprotocol/wayland-windowmanager-server-protocol.h b/src/compositor/windowmanagerprotocol/wayland-windowmanager-server-protocol.h
deleted file mode 100644 (file)
index 5b7dda2..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * Contact: Nokia Corporation (qt-info@nokia.com)
- * 
- * This file is part of the plugins of the Qt Toolkit.
- * 
- * $QT_BEGIN_LICENSE:LGPL$
- * GNU Lesser General Public License Usage
- * This file may be used under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation and
- * appearing in the file LICENSE.LGPL included in the packaging of this
- * file. Please review the following information to ensure the GNU Lesser
- * General Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- * 
- * In addition, as a special exception, Nokia gives you certain additional
- * rights. These rights are described in the Nokia Qt LGPL Exception
- * version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
- * 
- * GNU General Public License Usage
- * Alternatively, this file may be used under the terms of the GNU General
- * Public License version 3.0 as published by the Free Software Foundation
- * and appearing in the file LICENSE.GPL included in the packaging of this
- * file. Please review the following information to ensure the GNU General
- * Public License version 3.0 requirements will be met:
- * http://www.gnu.org/copyleft/gpl.html.
- * 
- * Other Usage
- * Alternatively, this file may be used in accordance with the terms and
- * conditions contained in a signed written agreement between you and Nokia.
- * 
- * 
- * 
- * 
- * 
- * $QT_END_LICENSE$
- */
-
-#ifndef WAYLAND_WINDOWMANAGER_SERVER_PROTOCOL_H
-#define WAYLAND_WINDOWMANAGER_SERVER_PROTOCOL_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-util.h"
-
-struct wl_client;
-struct wl_resource;
-
-struct wl_windowmanager;
-
-extern const struct wl_interface wl_windowmanager_interface;
-
-struct wl_windowmanager_interface {
-       void (*map_client_to_process)(struct wl_client *client,
-                                     struct wl_resource *resource,
-                                     uint32_t processid);
-       void (*authenticate_with_token)(struct wl_client *client,
-                                       struct wl_resource *resource,
-                                       const char *processid);
-       void (*update_generic_property)(struct wl_client *client,
-                                       struct wl_resource *resource,
-                                       struct wl_resource *surface,
-                                       const char *name,
-                                       struct wl_array *value);
-};
-
-#define WL_WINDOWMANAGER_CLIENT_ONSCREEN_VISIBILITY    0
-#define WL_WINDOWMANAGER_SET_SCREEN_ROTATION   1
-#define WL_WINDOWMANAGER_SET_GENERIC_PROPERTY  2
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
index 815032f..0e64e87 100644 (file)
 #include "wayland-server.h"
 #include "wayland-windowmanager-server-protocol.h"
 
-// the protocol files are generated with wayland-scanner, in the following manner:
-// wayland-scanner client-header < windowmanager.xml > wayland-windowmanager-client-protocol.h
-// wayland-scanner server-header < windowmanager.xml > wayland-windowmanager-server-protocol.h
-// wayland-scanner code < windowmanager.xml > wayland-windowmanager-protocol.c
-//
-// wayland-scanner can be found from wayland sources.
-
 class WindowManagerObject
 {
 public:
index b03b087..1b8144a 100644 (file)
@@ -1,11 +1,11 @@
 INCLUDEPATH += $$PWD
 
+WAYLANDSOURCES += $$PWD/../../../extensions/windowmanager/windowmanager.xml
+
 HEADERS += \
     $$PWD/waylandwindowmanagerintegration.h \
-    $$PWD/wayland-windowmanager-server-protocol.h
 
 SOURCES += \
     $$PWD/waylandwindowmanagerintegration.cpp \
-    $$PWD/wayland-windowmanager-protocol.c
 
 
diff --git a/src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-client-protocol.h b/src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-client-protocol.h
deleted file mode 100644 (file)
index fbecd63..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * Contact: Nokia Corporation (qt-info@nokia.com)
- * 
- * This file is part of the plugins of the Qt Toolkit.
- * 
- * $QT_BEGIN_LICENSE:LGPL$
- * GNU Lesser General Public License Usage
- * This file may be used under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation and
- * appearing in the file LICENSE.LGPL included in the packaging of this
- * file. Please review the following information to ensure the GNU Lesser
- * General Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- * 
- * In addition, as a special exception, Nokia gives you certain additional
- * rights. These rights are described in the Nokia Qt LGPL Exception
- * version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
- * 
- * GNU General Public License Usage
- * Alternatively, this file may be used under the terms of the GNU General
- * Public License version 3.0 as published by the Free Software Foundation
- * and appearing in the file LICENSE.GPL included in the packaging of this
- * file. Please review the following information to ensure the GNU General
- * Public License version 3.0 requirements will be met:
- * http://www.gnu.org/copyleft/gpl.html.
- * 
- * Other Usage
- * Alternatively, this file may be used in accordance with the terms and
- * conditions contained in a signed written agreement between you and Nokia.
- * 
- * 
- * 
- * 
- * 
- * $QT_END_LICENSE$
- */
-
-#ifndef WAYLAND_WINDOWMANAGER_CLIENT_PROTOCOL_H
-#define WAYLAND_WINDOWMANAGER_CLIENT_PROTOCOL_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-util.h"
-
-struct wl_client;
-struct wl_resource;
-
-struct wl_windowmanager;
-
-extern const struct wl_interface wl_windowmanager_interface;
-
-struct wl_windowmanager_listener {
-       void (*client_onscreen_visibility)(void *data,
-                                          struct wl_windowmanager *wl_windowmanager,
-                                          int32_t visible);
-       void (*set_screen_rotation)(void *data,
-                                   struct wl_windowmanager *wl_windowmanager,
-                                   struct wl_output *output,
-                                   int32_t rotation);
-       void (*set_generic_property)(void *data,
-                                    struct wl_windowmanager *wl_windowmanager,
-                                    struct wl_surface *surface,
-                                    const char *name,
-                                    struct wl_array *value);
-};
-
-static inline int
-wl_windowmanager_add_listener(struct wl_windowmanager *wl_windowmanager,
-                             const struct wl_windowmanager_listener *listener, void *data)
-{
-       return wl_proxy_add_listener((struct wl_proxy *) wl_windowmanager,
-                                    (void (**)(void)) listener, data);
-}
-
-#define WL_WINDOWMANAGER_MAP_CLIENT_TO_PROCESS 0
-#define WL_WINDOWMANAGER_AUTHENTICATE_WITH_TOKEN       1
-#define WL_WINDOWMANAGER_UPDATE_GENERIC_PROPERTY       2
-
-static inline void
-wl_windowmanager_set_user_data(struct wl_windowmanager *wl_windowmanager, void *user_data)
-{
-       wl_proxy_set_user_data((struct wl_proxy *) wl_windowmanager, user_data);
-}
-
-static inline void *
-wl_windowmanager_get_user_data(struct wl_windowmanager *wl_windowmanager)
-{
-       return wl_proxy_get_user_data((struct wl_proxy *) wl_windowmanager);
-}
-
-static inline void
-wl_windowmanager_destroy(struct wl_windowmanager *wl_windowmanager)
-{
-       wl_proxy_destroy((struct wl_proxy *) wl_windowmanager);
-}
-
-static inline void
-wl_windowmanager_map_client_to_process(struct wl_windowmanager *wl_windowmanager, uint32_t processid)
-{
-       wl_proxy_marshal((struct wl_proxy *) wl_windowmanager,
-                        WL_WINDOWMANAGER_MAP_CLIENT_TO_PROCESS, processid);
-}
-
-static inline void
-wl_windowmanager_authenticate_with_token(struct wl_windowmanager *wl_windowmanager, const char *processid)
-{
-       wl_proxy_marshal((struct wl_proxy *) wl_windowmanager,
-                        WL_WINDOWMANAGER_AUTHENTICATE_WITH_TOKEN, processid);
-}
-
-static inline void
-wl_windowmanager_update_generic_property(struct wl_windowmanager *wl_windowmanager, struct wl_surface *surface, const char *name, struct wl_array *value)
-{
-       wl_proxy_marshal((struct wl_proxy *) wl_windowmanager,
-                        WL_WINDOWMANAGER_UPDATE_GENERIC_PROPERTY, surface, name, value);
-}
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-protocol.c b/src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-protocol.c
deleted file mode 100644 (file)
index 7e8861b..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * Contact: Nokia Corporation (qt-info@nokia.com)
- * 
- * This file is part of the plugins of the Qt Toolkit.
- * 
- * $QT_BEGIN_LICENSE:LGPL$
- * GNU Lesser General Public License Usage
- * This file may be used under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation and
- * appearing in the file LICENSE.LGPL included in the packaging of this
- * file. Please review the following information to ensure the GNU Lesser
- * General Public License version 2.1 requirements will be met:
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- * 
- * In addition, as a special exception, Nokia gives you certain additional
- * rights. These rights are described in the Nokia Qt LGPL Exception
- * version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
- * 
- * GNU General Public License Usage
- * Alternatively, this file may be used under the terms of the GNU General
- * Public License version 3.0 as published by the Free Software Foundation
- * and appearing in the file LICENSE.GPL included in the packaging of this
- * file. Please review the following information to ensure the GNU General
- * Public License version 3.0 requirements will be met:
- * http://www.gnu.org/copyleft/gpl.html.
- * 
- * Other Usage
- * Alternatively, this file may be used in accordance with the terms and
- * conditions contained in a signed written agreement between you and Nokia.
- * 
- * 
- * 
- * 
- * 
- * $QT_END_LICENSE$
- */
-
-#include <stdlib.h>
-#include <stdint.h>
-#include "wayland-util.h"
-
-extern const struct wl_interface wl_surface_interface;
-extern const struct wl_interface wl_output_interface;
-extern const struct wl_interface wl_surface_interface;
-
-static const struct wl_interface *types[] = {
-       NULL,
-       &wl_surface_interface,
-       NULL,
-       NULL,
-       &wl_output_interface,
-       NULL,
-       &wl_surface_interface,
-       NULL,
-       NULL,
-};
-
-static const struct wl_message wl_windowmanager_requests[] = {
-       { "map_client_to_process", "u", types + 0 },
-       { "authenticate_with_token", "s", types + 0 },
-       { "update_generic_property", "osa", types + 1 },
-};
-
-static const struct wl_message wl_windowmanager_events[] = {
-       { "client_onscreen_visibility", "i", types + 0 },
-       { "set_screen_rotation", "oi", types + 4 },
-       { "set_generic_property", "osa", types + 6 },
-};
-
-WL_EXPORT const struct wl_interface wl_windowmanager_interface = {
-       "wl_windowmanager", 1,
-       ARRAY_LENGTH(wl_windowmanager_requests), wl_windowmanager_requests,
-       ARRAY_LENGTH(wl_windowmanager_events), wl_windowmanager_events,
-};
-
index 45118b5..4110089 100644 (file)
@@ -2,13 +2,13 @@ DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT
 
 contains(DEFINES, QT_WAYLAND_WINDOWMANAGER_SUPPORT) {
 
+    WAYLANDSOURCES += $$PWD/../../../../../extensions/windowmanager/windowmanager.xml
+
     HEADERS += \
-        $$PWD/wayland-windowmanager-client-protocol.h \
         $$PWD/qwaylandwindowmanagerintegration.h
 
     SOURCES += \
-        $$PWD/qwaylandwindowmanagerintegration.cpp \
-        $$PWD/wayland-windowmanager-protocol.c
+        $$PWD/qwaylandwindowmanagerintegration.cpp
 
 }