From 9a485857c916f854192e222f8673de63819fe099 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B8rgen=20Lind?= Date: Mon, 12 Dec 2011 15:10:28 +0100 Subject: [PATCH] Use the wayland-scanner qmake compiler rules for xcomposite Change-Id: I45e601ac1cc0183b03f2467a8376a1d6c65315cd Reviewed-by: Laszlo Agocs --- extensions/xcomposite/xcomposite.xml | 62 ++++++++++++++++++ .../protocol/wayland-xcomposite.xml | 24 ------- .../wayland-xcomposite-client-protocol.h | 74 ---------------------- .../xcomposite_share/wayland-xcomposite-protocol.c | 29 --------- .../wayland-xcomposite-server-protocol.h | 34 ---------- .../xcomposite_share/xcomposite_share.pri | 4 +- .../wayland-xcomposite-client-protocol.h | 74 ---------------------- .../xcomposite_share/wayland-xcomposite-protocol.c | 29 --------- .../xcomposite_share/xcomposite_share.pri | 8 +-- 9 files changed, 68 insertions(+), 270 deletions(-) create mode 100644 extensions/xcomposite/xcomposite.xml delete mode 100644 src/compositor/hardware_integration/xcomposite_share/protocol/wayland-xcomposite.xml delete mode 100644 src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-client-protocol.h delete mode 100644 src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-protocol.c delete mode 100644 src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-server-protocol.h delete mode 100644 src/plugins/platforms/wayland/gl_integration/xcomposite_share/wayland-xcomposite-client-protocol.h delete mode 100644 src/plugins/platforms/wayland/gl_integration/xcomposite_share/wayland-xcomposite-protocol.c diff --git a/extensions/xcomposite/xcomposite.xml b/extensions/xcomposite/xcomposite.xml new file mode 100644 index 0000000..3320807 --- /dev/null +++ b/extensions/xcomposite/xcomposite.xml @@ -0,0 +1,62 @@ + + + + + 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$ + + + + + + + + + + + + + + + + + + + + diff --git a/src/compositor/hardware_integration/xcomposite_share/protocol/wayland-xcomposite.xml b/src/compositor/hardware_integration/xcomposite_share/protocol/wayland-xcomposite.xml deleted file mode 100644 index 7d68d64..0000000 --- a/src/compositor/hardware_integration/xcomposite_share/protocol/wayland-xcomposite.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-client-protocol.h b/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-client-protocol.h deleted file mode 100644 index f502bba..0000000 --- a/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-client-protocol.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef XCOMPOSITE_CLIENT_PROTOCOL_H -#define XCOMPOSITE_CLIENT_PROTOCOL_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include -#include "wayland-util.h" - -struct wl_client; -struct wl_resource; - -struct wl_xcomposite; - -extern const struct wl_interface wl_xcomposite_interface; - -struct wl_xcomposite_listener { - void (*root)(void *data, - struct wl_xcomposite *wl_xcomposite, - const char *display_name, - uint32_t root_window); -}; - -static inline int -wl_xcomposite_add_listener(struct wl_xcomposite *wl_xcomposite, - const struct wl_xcomposite_listener *listener, void *data) -{ - return wl_proxy_add_listener((struct wl_proxy *) wl_xcomposite, - (void (**)(void)) listener, data); -} - -#define WL_XCOMPOSITE_CREATE_BUFFER 0 - -static inline void -wl_xcomposite_set_user_data(struct wl_xcomposite *wl_xcomposite, void *user_data) -{ - wl_proxy_set_user_data((struct wl_proxy *) wl_xcomposite, user_data); -} - -static inline void * -wl_xcomposite_get_user_data(struct wl_xcomposite *wl_xcomposite) -{ - return wl_proxy_get_user_data((struct wl_proxy *) wl_xcomposite); -} - -static inline void -wl_xcomposite_destroy(struct wl_xcomposite *wl_xcomposite) -{ - wl_proxy_destroy((struct wl_proxy *) wl_xcomposite); -} - -static inline struct wl_buffer * -wl_xcomposite_create_buffer(struct wl_xcomposite *wl_xcomposite, uint32_t x_window, int32_t width, int32_t height) -{ - struct wl_proxy *id; - - id = wl_proxy_create((struct wl_proxy *) wl_xcomposite, - &wl_buffer_interface); - if (!id) - return NULL; - - wl_proxy_marshal((struct wl_proxy *) wl_xcomposite, - WL_XCOMPOSITE_CREATE_BUFFER, id, x_window, width, height); - - return (struct wl_buffer *) id; -} - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-protocol.c b/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-protocol.c deleted file mode 100644 index 1662ec8..0000000 --- a/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-protocol.c +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include -#include "wayland-util.h" - -extern const struct wl_interface wl_buffer_interface; - -static const struct wl_interface *types[] = { - NULL, - NULL, - &wl_buffer_interface, - NULL, - NULL, - NULL, -}; - -static const struct wl_message wl_xcomposite_requests[] = { - { "create_buffer", "nuii", types + 2 }, -}; - -static const struct wl_message wl_xcomposite_events[] = { - { "root", "su", types + 0 }, -}; - -WL_EXPORT const struct wl_interface wl_xcomposite_interface = { - "wl_xcomposite", 1, - ARRAY_LENGTH(wl_xcomposite_requests), wl_xcomposite_requests, - ARRAY_LENGTH(wl_xcomposite_events), wl_xcomposite_events, -}; - diff --git a/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-server-protocol.h b/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-server-protocol.h deleted file mode 100644 index dfbb24d..0000000 --- a/src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-server-protocol.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef XCOMPOSITE_SERVER_PROTOCOL_H -#define XCOMPOSITE_SERVER_PROTOCOL_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include -#include "wayland-util.h" - -struct wl_client; -struct wl_resource; - -struct wl_xcomposite; - -extern const struct wl_interface wl_xcomposite_interface; - -struct wl_xcomposite_interface { - void (*create_buffer)(struct wl_client *client, - struct wl_resource *resource, - uint32_t id, - uint32_t x_window, - int32_t width, - int32_t height); -}; - -#define WL_XCOMPOSITE_ROOT 0 - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/compositor/hardware_integration/xcomposite_share/xcomposite_share.pri b/src/compositor/hardware_integration/xcomposite_share/xcomposite_share.pri index e4001a5..76611ae 100644 --- a/src/compositor/hardware_integration/xcomposite_share/xcomposite_share.pri +++ b/src/compositor/hardware_integration/xcomposite_share/xcomposite_share.pri @@ -1,13 +1,13 @@ INCLUDEPATH += $$PWD +WAYLANDSOURCES += $$PWD/../../../../extensions/xcomposite/xcomposite.xml + HEADERS += \ - $$PWD/wayland-xcomposite-server-protocol.h \ $$PWD/xcompositebuffer.h \ $$PWD/xcompositehandler.h \ $$PWD/xlibinclude.h SOURCES += \ - $$PWD/wayland-xcomposite-protocol.c \ $$PWD/xcompositebuffer.cpp \ $$PWD/xcompositehandler.cpp diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/wayland-xcomposite-client-protocol.h b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/wayland-xcomposite-client-protocol.h deleted file mode 100644 index f502bba..0000000 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/wayland-xcomposite-client-protocol.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef XCOMPOSITE_CLIENT_PROTOCOL_H -#define XCOMPOSITE_CLIENT_PROTOCOL_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include -#include "wayland-util.h" - -struct wl_client; -struct wl_resource; - -struct wl_xcomposite; - -extern const struct wl_interface wl_xcomposite_interface; - -struct wl_xcomposite_listener { - void (*root)(void *data, - struct wl_xcomposite *wl_xcomposite, - const char *display_name, - uint32_t root_window); -}; - -static inline int -wl_xcomposite_add_listener(struct wl_xcomposite *wl_xcomposite, - const struct wl_xcomposite_listener *listener, void *data) -{ - return wl_proxy_add_listener((struct wl_proxy *) wl_xcomposite, - (void (**)(void)) listener, data); -} - -#define WL_XCOMPOSITE_CREATE_BUFFER 0 - -static inline void -wl_xcomposite_set_user_data(struct wl_xcomposite *wl_xcomposite, void *user_data) -{ - wl_proxy_set_user_data((struct wl_proxy *) wl_xcomposite, user_data); -} - -static inline void * -wl_xcomposite_get_user_data(struct wl_xcomposite *wl_xcomposite) -{ - return wl_proxy_get_user_data((struct wl_proxy *) wl_xcomposite); -} - -static inline void -wl_xcomposite_destroy(struct wl_xcomposite *wl_xcomposite) -{ - wl_proxy_destroy((struct wl_proxy *) wl_xcomposite); -} - -static inline struct wl_buffer * -wl_xcomposite_create_buffer(struct wl_xcomposite *wl_xcomposite, uint32_t x_window, int32_t width, int32_t height) -{ - struct wl_proxy *id; - - id = wl_proxy_create((struct wl_proxy *) wl_xcomposite, - &wl_buffer_interface); - if (!id) - return NULL; - - wl_proxy_marshal((struct wl_proxy *) wl_xcomposite, - WL_XCOMPOSITE_CREATE_BUFFER, id, x_window, width, height); - - return (struct wl_buffer *) id; -} - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/wayland-xcomposite-protocol.c b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/wayland-xcomposite-protocol.c deleted file mode 100644 index 1662ec8..0000000 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/wayland-xcomposite-protocol.c +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include -#include "wayland-util.h" - -extern const struct wl_interface wl_buffer_interface; - -static const struct wl_interface *types[] = { - NULL, - NULL, - &wl_buffer_interface, - NULL, - NULL, - NULL, -}; - -static const struct wl_message wl_xcomposite_requests[] = { - { "create_buffer", "nuii", types + 2 }, -}; - -static const struct wl_message wl_xcomposite_events[] = { - { "root", "su", types + 0 }, -}; - -WL_EXPORT const struct wl_interface wl_xcomposite_interface = { - "wl_xcomposite", 1, - ARRAY_LENGTH(wl_xcomposite_requests), wl_xcomposite_requests, - ARRAY_LENGTH(wl_xcomposite_events), wl_xcomposite_events, -}; - diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri index 03b3521..1b5b2e6 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri @@ -1,9 +1,9 @@ INCLUDEPATH += $$PWD +WAYLANDSOURCES += $$PWD/../../../../../../extensions/xcomposite/xcomposite.xml + HEADERS += \ - $$PWD/wayland-xcomposite-client-protocol.h \ - gl_integration/xcomposite_share/qwaylandxcompositebuffer.h + $$PWD/qwaylandxcompositebuffer.h SOURCES += \ - $$PWD/wayland-xcomposite-protocol.c \ - gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp + $$PWD/qwaylandxcompositebuffer.cpp -- 2.7.4