diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -53,11 +53,12 @@ textinput_v0.cpp textinput_v2.cpp xdgshell.cpp - xdgshell_v5.cpp xdgforeign_v2.cpp xdgforeign.cpp + xdgshell_v5.cpp xdgshell_v6.cpp xdgoutput.cpp + ../compat/wayland-xdg-shell-v5-protocol.c ) ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS @@ -130,10 +131,6 @@ PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/text-input-unstable-v2.xml BASENAME text-input-v2 ) -ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS - PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/xdg-shell-unstable-v5.xml - BASENAME xdg-shell-v5 -) ecm_add_wayland_client_protocol(CLIENT_LIB_SRCS PROTOCOL ${KWayland_SOURCE_DIR}/src/client/protocols/xdg-shell-unstable-v6.xml BASENAME xdg-shell-v6 @@ -189,7 +186,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/wayland-server-decoration-palette-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-input-v0-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-input-v2-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v5-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v6-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-relativepointer-unstable-v1-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-gestures-unstable-v1-client-protocol.h diff --git a/src/client/registry.cpp b/src/client/registry.cpp --- a/src/client/registry.cpp +++ b/src/client/registry.cpp @@ -76,7 +76,7 @@ #include #include #include -#include +#include "../compat/wayland-xdg-shell-v5-client-protocol.h" #include #include #include @@ -277,7 +277,7 @@ {Registry::Interface::XdgShellUnstableV5, { 1, QByteArrayLiteral("xdg_shell"), - &xdg_shell_interface, + &zxdg_shell_v5_interface, &Registry::xdgShellUnstableV5Announced, &Registry::xdgShellUnstableV5Removed }}, diff --git a/src/client/xdgshell_v5.cpp b/src/client/xdgshell_v5.cpp --- a/src/client/xdgshell_v5.cpp +++ b/src/client/xdgshell_v5.cpp @@ -23,7 +23,7 @@ #include "seat.h" #include "surface.h" #include "wayland_pointer_p.h" -#include +#include "../compat/wayland-xdg-shell-v5-client-protocol.h" namespace KWayland { @@ -48,27 +48,27 @@ static void pingCallback(void *data, struct xdg_shell *shell, uint32_t serial); - WaylandPointer xdgshellv5; - static const struct xdg_shell_listener s_shellListener; + WaylandPointer xdgshellv5; + static const struct zxdg_shell_v5_listener s_shellListener; }; -const struct xdg_shell_listener XdgShellUnstableV5::Private::s_shellListener = { +const struct zxdg_shell_v5_listener XdgShellUnstableV5::Private::s_shellListener = { pingCallback, }; void XdgShellUnstableV5::Private::pingCallback(void *data, struct xdg_shell *shell, uint32_t serial) { Q_UNUSED(data); - xdg_shell_pong(shell, serial); + zxdg_shell_v5_pong(shell, serial); } void XdgShellUnstableV5::Private::setupV5(xdg_shell *shell) { Q_ASSERT(shell); Q_ASSERT(!xdgshellv5); xdgshellv5.setup(shell); - xdg_shell_use_unstable_version(xdgshellv5, 5); - xdg_shell_add_listener(shell, &s_shellListener, this); + zxdg_shell_v5_use_unstable_version(xdgshellv5, 5); + zxdg_shell_v5_add_listener(shell, &s_shellListener, this); } void XdgShellUnstableV5::Private::release() @@ -90,7 +90,7 @@ { Q_ASSERT(isValid()); XdgShellSurface *s = new XdgShellSurfaceUnstableV5(parent); - auto w = xdg_shell_get_xdg_surface(xdgshellv5, *surface); + auto w = zxdg_shell_v5_get_xdg_surface(xdgshellv5, *surface); if (queue) { queue->addProxy(w); } @@ -102,7 +102,7 @@ { Q_ASSERT(isValid()); XdgShellPopup *s = new XdgShellPopupUnstableV5(parent); - auto w = xdg_shell_get_xdg_popup(xdgshellv5, *surface, *parentSurface, *seat, serial, parentPos.x(), parentPos.y()); + auto w = zxdg_shell_v5_get_xdg_popup(xdgshellv5, *surface, *parentSurface, *seat, serial, parentPos.x(), parentPos.y()); if (queue) { queue->addProxy(w); } @@ -121,7 +121,7 @@ { public: Private(XdgShellSurface *q); - WaylandPointer xdgsurfacev5; + WaylandPointer xdgsurfacev5; void setupV5(xdg_surface *surface) override; void release() override; @@ -153,10 +153,10 @@ static void configureCallback(void *data, xdg_surface *xdg_surface, int32_t width, int32_t height, wl_array *states, uint32_t serial); static void closeCallback(void *data, xdg_surface *xdg_surface); - static const struct xdg_surface_listener s_listener; + static const struct zxdg_surface_v5_listener s_listener; }; -const struct xdg_surface_listener XdgShellSurfaceUnstableV5::Private::s_listener = { +const struct zxdg_surface_v5_listener XdgShellSurfaceUnstableV5::Private::s_listener = { configureCallback, closeCallback }; @@ -170,16 +170,16 @@ States states; for (size_t i = 0; i < numStates; i++) { switch (state[i]) { - case XDG_SURFACE_STATE_MAXIMIZED: + case ZXDG_SURFACE_V5_STATE_MAXIMIZED: states = states | XdgShellSurface::State::Maximized; break; - case XDG_SURFACE_STATE_FULLSCREEN: + case ZXDG_SURFACE_V5_STATE_FULLSCREEN: states = states | XdgShellSurface::State::Fullscreen; break; - case XDG_SURFACE_STATE_RESIZING: + case ZXDG_SURFACE_V5_STATE_RESIZING: states = states | XdgShellSurface::State::Resizing; break; - case XDG_SURFACE_STATE_ACTIVATED: + case ZXDG_SURFACE_V5_STATE_ACTIVATED: states = states | XdgShellSurface::State::Activated; break; } @@ -208,7 +208,7 @@ Q_ASSERT(surface); Q_ASSERT(!xdgsurfacev5); xdgsurfacev5.setup(surface); - xdg_surface_add_listener(xdgsurfacev5, &s_listener, this); + zxdg_surface_v5_add_listener(xdgsurfacev5, &s_listener, this); } void XdgShellSurfaceUnstableV5::Private::release() @@ -233,88 +233,88 @@ if (parent) { parentSurface = *parent; } - xdg_surface_set_parent(xdgsurfacev5, parentSurface); + zxdg_surface_v5_set_parent(xdgsurfacev5, parentSurface); } void XdgShellSurfaceUnstableV5::Private::setTitle(const QString & title) { - xdg_surface_set_title(xdgsurfacev5, title.toUtf8().constData()); + zxdg_surface_v5_set_title(xdgsurfacev5, title.toUtf8().constData()); } void XdgShellSurfaceUnstableV5::Private::setAppId(const QByteArray & appId) { - xdg_surface_set_app_id(xdgsurfacev5, appId.constData()); + zxdg_surface_v5_set_app_id(xdgsurfacev5, appId.constData()); } void XdgShellSurfaceUnstableV5::Private::showWindowMenu(Seat *seat, quint32 serial, qint32 x, qint32 y) { - xdg_surface_show_window_menu(xdgsurfacev5, *seat, serial, x, y); + zxdg_surface_v5_show_window_menu(xdgsurfacev5, *seat, serial, x, y); } void XdgShellSurfaceUnstableV5::Private::move(Seat *seat, quint32 serial) { - xdg_surface_move(xdgsurfacev5, *seat, serial); + zxdg_surface_v5_move(xdgsurfacev5, *seat, serial); } void XdgShellSurfaceUnstableV5::Private::resize(Seat *seat, quint32 serial, Qt::Edges edges) { - uint wlEdge = XDG_SURFACE_RESIZE_EDGE_NONE; + uint wlEdge = ZXDG_SURFACE_V5_RESIZE_EDGE_NONE; if (edges.testFlag(Qt::TopEdge)) { if (edges.testFlag(Qt::LeftEdge) && ((edges & ~Qt::LeftEdge) == Qt::TopEdge)) { - wlEdge = XDG_SURFACE_RESIZE_EDGE_TOP_LEFT; + wlEdge = ZXDG_SURFACE_V5_RESIZE_EDGE_TOP_LEFT; } else if (edges.testFlag(Qt::RightEdge) && ((edges & ~Qt::RightEdge) == Qt::TopEdge)) { - wlEdge = XDG_SURFACE_RESIZE_EDGE_TOP_RIGHT; + wlEdge = ZXDG_SURFACE_V5_RESIZE_EDGE_TOP_RIGHT; } else if ((edges & ~Qt::TopEdge) == Qt::Edges()) { - wlEdge = XDG_SURFACE_RESIZE_EDGE_TOP; + wlEdge = ZXDG_SURFACE_V5_RESIZE_EDGE_TOP; } } else if (edges.testFlag(Qt::BottomEdge)) { if (edges.testFlag(Qt::LeftEdge) && ((edges & ~Qt::LeftEdge) == Qt::BottomEdge)) { - wlEdge = XDG_SURFACE_RESIZE_EDGE_BOTTOM_LEFT; + wlEdge = ZXDG_SURFACE_V5_RESIZE_EDGE_BOTTOM_LEFT; } else if (edges.testFlag(Qt::RightEdge) && ((edges & ~Qt::RightEdge) == Qt::BottomEdge)) { - wlEdge = XDG_SURFACE_RESIZE_EDGE_BOTTOM_RIGHT; + wlEdge = ZXDG_SURFACE_V5_RESIZE_EDGE_BOTTOM_RIGHT; } else if ((edges & ~Qt::BottomEdge) == Qt::Edges()) { - wlEdge = XDG_SURFACE_RESIZE_EDGE_BOTTOM; + wlEdge = ZXDG_SURFACE_V5_RESIZE_EDGE_BOTTOM; } } else if (edges.testFlag(Qt::RightEdge) && ((edges & ~Qt::RightEdge) == Qt::Edges())) { - wlEdge = XDG_SURFACE_RESIZE_EDGE_RIGHT; + wlEdge = ZXDG_SURFACE_V5_RESIZE_EDGE_RIGHT; } else if (edges.testFlag(Qt::LeftEdge) && ((edges & ~Qt::LeftEdge) == Qt::Edges())) { - wlEdge = XDG_SURFACE_RESIZE_EDGE_LEFT; + wlEdge = ZXDG_SURFACE_V5_RESIZE_EDGE_LEFT; } - xdg_surface_resize(xdgsurfacev5, *seat, serial, wlEdge); + zxdg_surface_v5_resize(xdgsurfacev5, *seat, serial, wlEdge); } void XdgShellSurfaceUnstableV5::Private::ackConfigure(quint32 serial) { - xdg_surface_ack_configure(xdgsurfacev5, serial); + zxdg_surface_v5_ack_configure(xdgsurfacev5, serial); } void XdgShellSurfaceUnstableV5::Private::setMaximized() { - xdg_surface_set_maximized(xdgsurfacev5); + zxdg_surface_v5_set_maximized(xdgsurfacev5); } void XdgShellSurfaceUnstableV5::Private::unsetMaximized() { - xdg_surface_unset_maximized(xdgsurfacev5); + zxdg_surface_v5_unset_maximized(xdgsurfacev5); } void XdgShellSurfaceUnstableV5::Private::setFullscreen(Output *output) { wl_output *o = nullptr; if (output) { o = *output; } - xdg_surface_set_fullscreen(xdgsurfacev5, o); + zxdg_surface_v5_set_fullscreen(xdgsurfacev5, o); } void XdgShellSurfaceUnstableV5::Private::unsetFullscreen() { - xdg_surface_unset_fullscreen(xdgsurfacev5); + zxdg_surface_v5_unset_fullscreen(xdgsurfacev5); } void XdgShellSurfaceUnstableV5::Private::setMinimized() { - xdg_surface_set_minimized(xdgsurfacev5); + zxdg_surface_v5_set_minimized(xdgsurfacev5); } void XdgShellSurfaceUnstableV5::Private::setMaxSize(const QSize &size) @@ -351,14 +351,14 @@ operator xdg_popup*() const override { return xdgpopupv5; } - WaylandPointer xdgpopupv5; + WaylandPointer xdgpopupv5; private: static void popupDoneCallback(void *data, xdg_popup *xdg_popup); - static const struct xdg_popup_listener s_listener; + static const struct zxdg_popup_v5_listener s_listener; }; -const struct xdg_popup_listener XdgShellPopupUnstableV5::Private::s_listener = { +const struct zxdg_popup_v5_listener XdgShellPopupUnstableV5::Private::s_listener = { popupDoneCallback }; @@ -379,7 +379,7 @@ Q_ASSERT(p); Q_ASSERT(!xdgpopupv5); xdgpopupv5.setup(p); - xdg_popup_add_listener(xdgpopupv5, &s_listener, this); + zxdg_popup_v5_add_listener(xdgpopupv5, &s_listener, this); } void XdgShellPopupUnstableV5::Private::release() diff --git a/src/compat/wayland-xdg-shell-v5-client-protocol.h b/src/compat/wayland-xdg-shell-v5-client-protocol.h new file mode 100644 --- /dev/null +++ b/src/compat/wayland-xdg-shell-v5-client-protocol.h @@ -0,0 +1,1114 @@ +/* + * This file is *NOT* autogenerated. + * It contains XDGShellV5 with method names modified to be not clashing with XDG stable + * Strings inside the sent protocol remain the same + */ +#ifndef ZXDG_SHELL_V5_UNSTABLE_V5_CLIENT_PROTOCOL_H +#define ZXDG_SHELL_V5_UNSTABLE_V5_CLIENT_PROTOCOL_H + +#include +#include +#include "wayland-client.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @page page_zxdg_shell_v5_unstable_v5 The zxdg_shell_v5_unstable_v5 protocol + * @section page_ifaces_zxdg_shell_v5_unstable_v5 Interfaces + * - @subpage page_iface_xdg_shell - create desktop-style surfaces + * - @subpage page_iface_xdg_surface - A desktop window + * - @subpage page_iface_xdg_popup - short-lived, popup surfaces for menus + * @section page_copyright_zxdg_shell_v5_unstable_v5 Copyright + *
+ *
+ * Copyright © 2008-2013 Kristian Høgsberg
+ * Copyright © 2013      Rafael Antognolli
+ * Copyright © 2013      Jasper St. Pierre
+ * Copyright © 2010-2013 Intel Corporation
+ *
+ * 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.
+ * 
+ */ +struct wl_output; +struct wl_seat; +struct wl_surface; + +struct xdg_surface; +struct xdg_popup; +struct xdg_shell; + +/** + * @page page_iface_xdg_shell zxdg_shell_v5 + * @section page_iface_zxdg_shell_v5_desc Description + * + * xdg_shell allows clients to turn a wl_surface into a "real window" + * which can be dragged, resized, stacked, and moved around by the + * user. Everything about this interface is suited towards traditional + * desktop environments. + * @section page_iface_zxdg_shell_v5_api API + * See @ref iface_xdg_shell. + */ +/** + * @defgroup iface_xdg_shell The xdg_shell interface + * + * xdg_shell allows clients to turn a wl_surface into a "real window" + * which can be dragged, resized, stacked, and moved around by the + * user. Everything about this interface is suited towards traditional + * desktop environments. + */ +extern const struct wl_interface zxdg_shell_v5_interface; +/** + * @page page_iface_xdg_surface zxdg_surface_v5 + * @section page_iface_zxdg_surface_v5_desc Description + * + * An interface that may be implemented by a wl_surface, for + * implementations that provide a desktop-style user interface. + * + * It provides requests to treat surfaces like windows, allowing to set + * properties like maximized, fullscreen, minimized, and to move and resize + * them, and associate metadata like title and app id. + * + * The client must call wl_surface.commit on the corresponding wl_surface + * for the xdg_surface state to take effect. Prior to committing the new + * state, it can set up initial configuration, such as maximizing or setting + * a window geometry. + * + * Even without attaching a buffer the compositor must respond to initial + * committed configuration, for instance sending a configure event with + * expected window geometry if the client maximized its surface during + * initialization. + * + * For a surface to be mapped by the compositor the client must have + * committed both an xdg_surface state and a buffer. + * @section page_iface_zxdg_surface_v5_api API + * See @ref iface_xdg_surface. + */ +/** + * @defgroup iface_xdg_surface The xdg_surface interface + * + * An interface that may be implemented by a wl_surface, for + * implementations that provide a desktop-style user interface. + * + * It provides requests to treat surfaces like windows, allowing to set + * properties like maximized, fullscreen, minimized, and to move and resize + * them, and associate metadata like title and app id. + * + * The client must call wl_surface.commit on the corresponding wl_surface + * for the xdg_surface state to take effect. Prior to committing the new + * state, it can set up initial configuration, such as maximizing or setting + * a window geometry. + * + * Even without attaching a buffer the compositor must respond to initial + * committed configuration, for instance sending a configure event with + * expected window geometry if the client maximized its surface during + * initialization. + * + * For a surface to be mapped by the compositor the client must have + * committed both an xdg_surface state and a buffer. + */ +extern const struct wl_interface zxdg_surface_v5_interface; +/** + * @page page_iface_xdg_popup zxdg_popup_v5 + * @section page_iface_zxdg_popup_v5_desc Description + * + * A popup surface is a short-lived, temporary surface that can be + * used to implement menus. It takes an explicit grab on the surface + * that will be dismissed when the user dismisses the popup. This can + * be done by the user clicking outside the surface, using the keyboard, + * or even locking the screen through closing the lid or a timeout. + * + * When the popup is dismissed, a popup_done event will be sent out, + * and at the same time the surface will be unmapped. The zxdg_popup_v5 + * object is now inert and cannot be reactivated, so clients should + * destroy it. Explicitly destroying the xdg_popup object will also + * dismiss the popup and unmap the surface. + * + * Clients will receive events for all their surfaces during this + * grab (which is an "owner-events" grab in X11 parlance). This is + * done so that users can navigate through submenus and other + * "nested" popup windows without having to dismiss the topmost + * popup. + * + * Clients that want to dismiss the popup when another surface of + * their own is clicked should dismiss the popup using the destroy + * request. + * + * The parent surface must have either an xdg_surface or zxdg_popup_v5 + * role. + * + * Specifying an xdg_popup for the parent means that the popups are + * nested, with this popup now being the topmost popup. Nested + * popups must be destroyed in the reverse order they were created + * in, e.g. the only popup you are allowed to destroy at all times + * is the topmost one. + * + * If there is an existing popup when creating a new popup, the + * parent must be the current topmost popup. + * + * A parent surface must be mapped before the new popup is mapped. + * + * When compositors choose to dismiss a popup, they will likely + * dismiss every nested popup as well. When a compositor dismisses + * popups, it will follow the same dismissing order as required + * from the client. + * + * The x and y arguments passed when creating the popup object specify + * where the top left of the popup should be placed, relative to the + * local surface coordinates of the parent surface. See + * xdg_shell.get_xdg_popup. + * + * The client must call wl_surface.commit on the corresponding wl_surface + * for the xdg_popup state to take effect. + * + * For a surface to be mapped by the compositor the client must have + * committed both the xdg_popup state and a buffer. + * @section page_iface_zxdg_popup_v5_api API + * See @ref iface_xdg_popup. + */ +/** + * @defgroup iface_xdg_popup The xdg_popup interface + * + * A popup surface is a short-lived, temporary surface that can be + * used to implement menus. It takes an explicit grab on the surface + * that will be dismissed when the user dismisses the popup. This can + * be done by the user clicking outside the surface, using the keyboard, + * or even locking the screen through closing the lid or a timeout. + * + * When the popup is dismissed, a popup_done event will be sent out, + * and at the same time the surface will be unmapped. The zxdg_popup_v5 + * object is now inert and cannot be reactivated, so clients should + * destroy it. Explicitly destroying the xdg_popup object will also + * dismiss the popup and unmap the surface. + * + * Clients will receive events for all their surfaces during this + * grab (which is an "owner-events" grab in X11 parlance). This is + * done so that users can navigate through submenus and other + * "nested" popup windows without having to dismiss the topmost + * popup. + * + * Clients that want to dismiss the popup when another surface of + * their own is clicked should dismiss the popup using the destroy + * request. + * + * The parent surface must have either an xdg_surface or zxdg_popup_v5 + * role. + * + * Specifying an xdg_popup for the parent means that the popups are + * nested, with this popup now being the topmost popup. Nested + * popups must be destroyed in the reverse order they were created + * in, e.g. the only popup you are allowed to destroy at all times + * is the topmost one. + * + * If there is an existing popup when creating a new popup, the + * parent must be the current topmost popup. + * + * A parent surface must be mapped before the new popup is mapped. + * + * When compositors choose to dismiss a popup, they will likely + * dismiss every nested popup as well. When a compositor dismisses + * popups, it will follow the same dismissing order as required + * from the client. + * + * The x and y arguments passed when creating the popup object specify + * where the top left of the popup should be placed, relative to the + * local surface coordinates of the parent surface. See + * xdg_shell.get_xdg_popup. + * + * The client must call wl_surface.commit on the corresponding wl_surface + * for the xdg_popup state to take effect. + * + * For a surface to be mapped by the compositor the client must have + * committed both the xdg_popup state and a buffer. + */ +extern const struct wl_interface zxdg_popup_v5_interface; + +#ifndef ZXDG_SHELL_V5_VERSION_ENUM +#define ZXDG_SHELL_V5_VERSION_ENUM +/** + * @ingroup iface_zxdg_shell_v5 + * latest protocol version + * + * The 'current' member of this enum gives the version of the + * protocol. Implementations can compare this to the version + * they implement using static_assert to ensure the protocol and + * implementation versions match. + */ +enum zxdg_shell_v5_version { + /** + * Always the latest version + */ + ZXDG_SHELL_V5_VERSION_CURRENT = 5, +}; +#endif /* ZXDG_SHELL_V5_VERSION_ENUM */ + +#ifndef ZXDG_SHELL_V5_ERROR_ENUM +#define ZXDG_SHELL_V5_ERROR_ENUM +enum zxdg_shell_v5_error { + /** + * given wl_surface has another role + */ + ZXDG_SHELL_V5_ERROR_ROLE = 0, + /** + * xdg_shell was destroyed before children + */ + ZXDG_SHELL_V5_ERROR_DEFUNCT_SURFACES = 1, + /** + * the client tried to map or destroy a non-topmost popup + */ + ZXDG_SHELL_V5_ERROR_NOT_THE_TOPMOST_POPUP = 2, + /** + * the client specified an invalid popup parent surface + */ + ZXDG_SHELL_V5_ERROR_INVALID_POPUP_PARENT = 3, +}; +#endif /* ZXDG_SHELL_V5_ERROR_ENUM */ + +/** + * @ingroup iface_zxdg_shell_v5 + * @struct zxdg_shell_v5_listener + */ +struct zxdg_shell_v5_listener { + /** + * check if the client is alive + * + * The ping event asks the client if it's still alive. Pass the + * serial specified in the event back to the compositor by sending + * a "pong" request back with the specified serial. + * + * Compositors can use this to determine if the client is still + * alive. It's unspecified what will happen if the client doesn't + * respond to the ping request, or in what timeframe. Clients + * should try to respond in a reasonable amount of time. + * + * A compositor is free to ping in any way it wants, but a client + * must always respond to any xdg_shell object it created. + * @param serial pass this to the pong request + */ + void (*ping)(void *data, + struct xdg_shell *xdg_shell, + uint32_t serial); +}; + +/** + * @ingroup iface_zxdg_shell_v5 + */ +static inline int +zxdg_shell_v5_add_listener(struct xdg_shell *xdg_shell, + const struct zxdg_shell_v5_listener *listener, void *data) +{ + return wl_proxy_add_listener((struct wl_proxy *) xdg_shell, + (void (**)(void)) listener, data); +} + +#define ZXDG_SHELL_V5_DESTROY 0 +#define ZXDG_SHELL_V5_USE_UNSTABLE_VERSION 1 +#define ZXDG_SHELL_V5_GET_ZXDG_SURFACE_V5 2 +#define ZXDG_SHELL_V5_GET_ZXDG_POPUP_V5 3 +#define ZXDG_SHELL_V5_PONG 4 + +/** + * @ingroup iface_zxdg_shell_v5 + */ +#define ZXDG_SHELL_V5_PING_SINCE_VERSION 1 + +/** + * @ingroup iface_zxdg_shell_v5 + */ +#define ZXDG_SHELL_V5_DESTROY_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_shell_v5 + */ +#define ZXDG_SHELL_V5_USE_UNSTABLE_VERSION_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_shell_v5 + */ +#define ZXDG_SHELL_V5_GET_ZXDG_SURFACE_V5_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_shell_v5 + */ +#define ZXDG_SHELL_V5_GET_ZXDG_POPUP_V5_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_shell_v5 + */ +#define ZXDG_SHELL_V5_PONG_SINCE_VERSION 1 + +/** @ingroup iface_xdg_shell */ +static inline void +zxdg_shell_v5_set_user_data(struct xdg_shell *xdg_shell, void *user_data) +{ + wl_proxy_set_user_data((struct wl_proxy *) xdg_shell, user_data); +} + +/** @ingroup iface_xdg_shell */ +static inline void * +zxdg_shell_v5_get_user_data(struct xdg_shell *xdg_shell) +{ + return wl_proxy_get_user_data((struct wl_proxy *) xdg_shell); +} + +static inline uint32_t +zxdg_shell_v5_get_version(struct xdg_shell *xdg_shell) +{ + return wl_proxy_get_version((struct wl_proxy *) xdg_shell); +} + +/** + * @ingroup iface_zxdg_shell_v5 + * + * Destroy this xdg_shell object. + * + * Destroying a bound xdg_shell object while there are surfaces + * still alive created by this xdg_shell object instance is illegal + * and will result in a protocol error. + */ +static inline void +zxdg_shell_v5_destroy(struct xdg_shell *xdg_shell) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_shell, + ZXDG_SHELL_V5_DESTROY); + + wl_proxy_destroy((struct wl_proxy *) xdg_shell); +} + +/** + * @ingroup iface_zxdg_shell_v5 + * + * Negotiate the unstable version of the interface. This + * mechanism is in place to ensure client and server agree on the + * unstable versions of the protocol that they speak or exit + * cleanly if they don't agree. This request will go away once + * the xdg-shell protocol is stable. + */ +static inline void +zxdg_shell_v5_use_unstable_version(struct xdg_shell *xdg_shell, int32_t version) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_shell, + ZXDG_SHELL_V5_USE_UNSTABLE_VERSION, version); +} + +/** + * @ingroup iface_zxdg_shell_v5 + * + * This creates an xdg_surface for the given surface and gives it the + * xdg_surface role. A wl_surface can only be given an xdg_surface role + * once. If get_xdg_surface is called with a wl_surface that already has + * an active xdg_surface associated with it, or if it had any other role, + * an error is raised. + * + * See the documentation of xdg_surface for more details about what an + * xdg_surface is and how it is used. + */ +static inline struct xdg_surface * +zxdg_shell_v5_get_xdg_surface(struct xdg_shell *xdg_shell, struct wl_surface *surface) +{ + struct wl_proxy *id; + + id = wl_proxy_marshal_constructor((struct wl_proxy *) xdg_shell, + ZXDG_SHELL_V5_GET_ZXDG_SURFACE_V5, &zxdg_surface_v5_interface, NULL, surface); + + return (struct xdg_surface *) id; +} + +/** + * @ingroup iface_zxdg_shell_v5 + * + * This creates an xdg_popup for the given surface and gives it the + * xdg_popup role. A wl_surface can only be given an xdg_popup role + * once. If get_xdg_popup is called with a wl_surface that already has + * an active xdg_popup associated with it, or if it had any other role, + * an error is raised. + * + * This request must be used in response to some sort of user action + * like a button press, key press, or touch down event. + * + * See the documentation of xdg_popup for more details about what an + * xdg_popup is and how it is used. + */ +static inline struct xdg_popup * +zxdg_shell_v5_get_xdg_popup(struct xdg_shell *xdg_shell, struct wl_surface *surface, struct wl_surface *parent, struct wl_seat *seat, uint32_t serial, int32_t x, int32_t y) +{ + struct wl_proxy *id; + + id = wl_proxy_marshal_constructor((struct wl_proxy *) xdg_shell, + ZXDG_SHELL_V5_GET_ZXDG_POPUP_V5, &zxdg_popup_v5_interface, NULL, surface, parent, seat, serial, x, y); + + return (struct xdg_popup *) id; +} + +/** + * @ingroup iface_zxdg_shell_v5 + * + * A client must respond to a ping event with a pong request or + * the client may be deemed unresponsive. + */ +static inline void +zxdg_shell_v5_pong(struct xdg_shell *xdg_shell, uint32_t serial) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_shell, + ZXDG_SHELL_V5_PONG, serial); +} + +#ifndef ZXDG_SURFACE_V5_RESIZE_EDGE_ENUM +#define ZXDG_SURFACE_V5_RESIZE_EDGE_ENUM +/** + * @ingroup iface_zxdg_surface_v5 + * edge values for resizing + * + * These values are used to indicate which edge of a surface + * is being dragged in a resize operation. + */ +enum zxdg_surface_v5_resize_edge { + ZXDG_SURFACE_V5_RESIZE_EDGE_NONE = 0, + ZXDG_SURFACE_V5_RESIZE_EDGE_TOP = 1, + ZXDG_SURFACE_V5_RESIZE_EDGE_BOTTOM = 2, + ZXDG_SURFACE_V5_RESIZE_EDGE_LEFT = 4, + ZXDG_SURFACE_V5_RESIZE_EDGE_TOP_LEFT = 5, + ZXDG_SURFACE_V5_RESIZE_EDGE_BOTTOM_LEFT = 6, + ZXDG_SURFACE_V5_RESIZE_EDGE_RIGHT = 8, + ZXDG_SURFACE_V5_RESIZE_EDGE_TOP_RIGHT = 9, + ZXDG_SURFACE_V5_RESIZE_EDGE_BOTTOM_RIGHT = 10, +}; +#endif /* ZXDG_SURFACE_V5_RESIZE_EDGE_ENUM */ + +#ifndef ZXDG_SURFACE_V5_STATE_ENUM +#define ZXDG_SURFACE_V5_STATE_ENUM +/** + * @ingroup iface_zxdg_surface_v5 + * the surface is now activated + * + * Client window decorations should be painted as if the window is + * active. Do not assume this means that the window actually has + * keyboard or pointer focus. + */ +enum zxdg_surface_v5_state { + /** + * the surface is maximized + */ + ZXDG_SURFACE_V5_STATE_MAXIMIZED = 1, + /** + * the surface is fullscreen + */ + ZXDG_SURFACE_V5_STATE_FULLSCREEN = 2, + /** + * the surface is being resized + */ + ZXDG_SURFACE_V5_STATE_RESIZING = 3, + /** + * the surface is now activated + */ + ZXDG_SURFACE_V5_STATE_ACTIVATED = 4, +}; +#endif /* ZXDG_SURFACE_V5_STATE_ENUM */ + +/** + * @ingroup iface_zxdg_surface_v5 + * @struct zxdg_surface_v5_listener + */ +struct zxdg_surface_v5_listener { + /** + * suggest a surface change + * + * The configure event asks the client to resize its surface or + * to change its state. + * + * The width and height arguments specify a hint to the window + * about how its surface should be resized in window geometry + * coordinates. See set_window_geometry. + * + * If the width or height arguments are zero, it means the client + * should decide its own window dimension. This may happen when the + * compositor need to configure the state of the surface but + * doesn't have any information about any previous or expected + * dimension. + * + * The states listed in the event specify how the width/height + * arguments should be interpreted, and possibly how it should be + * drawn. + * + * Clients should arrange their surface for the new size and + * states, and then send a ack_configure request with the serial + * sent in this configure event at some point before committing the + * new surface. + * + * If the client receives multiple configure events before it can + * respond to one, it is free to discard all but the last event it + * received. + */ + void (*configure)(void *data, + struct xdg_surface *xdg_surface, + int32_t width, + int32_t height, + struct wl_array *states, + uint32_t serial); + /** + * surface wants to be closed + * + * The close event is sent by the compositor when the user wants + * the surface to be closed. This should be equivalent to the user + * clicking the close button in client-side decorations, if your + * application has any... + * + * This is only a request that the user intends to close your + * window. The client may choose to ignore this request, or show a + * dialog to ask the user to save their data... + */ + void (*close)(void *data, + struct xdg_surface *xdg_surface); +}; + +/** + * @ingroup iface_zxdg_surface_v5 + */ +static inline int +zxdg_surface_v5_add_listener(struct xdg_surface *xdg_surface, + const struct zxdg_surface_v5_listener *listener, void *data) +{ + return wl_proxy_add_listener((struct wl_proxy *) xdg_surface, + (void (**)(void)) listener, data); +} + +#define ZXDG_SURFACE_V5_DESTROY 0 +#define ZXDG_SURFACE_V5_SET_PARENT 1 +#define ZXDG_SURFACE_V5_SET_TITLE 2 +#define ZXDG_SURFACE_V5_SET_APP_ID 3 +#define ZXDG_SURFACE_V5_SHOW_WINDOW_MENU 4 +#define ZXDG_SURFACE_V5_MOVE 5 +#define ZXDG_SURFACE_V5_RESIZE 6 +#define ZXDG_SURFACE_V5_ACK_CONFIGURE 7 +#define ZXDG_SURFACE_V5_SET_WINDOW_GEOMETRY 8 +#define ZXDG_SURFACE_V5_SET_MAXIMIZED 9 +#define ZXDG_SURFACE_V5_UNSET_MAXIMIZED 10 +#define ZXDG_SURFACE_V5_SET_FULLSCREEN 11 +#define ZXDG_SURFACE_V5_UNSET_FULLSCREEN 12 +#define ZXDG_SURFACE_V5_SET_MINIMIZED 13 + +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_CONFIGURE_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_CLOSE_SINCE_VERSION 1 + +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_DESTROY_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_SET_PARENT_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_SET_TITLE_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_SET_APP_ID_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_SHOW_WINDOW_MENU_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_MOVE_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_RESIZE_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_ACK_CONFIGURE_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_SET_WINDOW_GEOMETRY_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_SET_MAXIMIZED_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_UNSET_MAXIMIZED_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_SET_FULLSCREEN_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_UNSET_FULLSCREEN_SINCE_VERSION 1 +/** + * @ingroup iface_zxdg_surface_v5 + */ +#define ZXDG_SURFACE_V5_SET_MINIMIZED_SINCE_VERSION 1 + +/** @ingroup iface_xdg_surface */ +static inline void +zxdg_surface_v5_set_user_data(struct xdg_surface *xdg_surface, void *user_data) +{ + wl_proxy_set_user_data((struct wl_proxy *) xdg_surface, user_data); +} + +/** @ingroup iface_xdg_surface */ +static inline void * +zxdg_surface_v5_get_user_data(struct xdg_surface *xdg_surface) +{ + return wl_proxy_get_user_data((struct wl_proxy *) xdg_surface); +} + +static inline uint32_t +zxdg_surface_v5_get_version(struct xdg_surface *xdg_surface) +{ + return wl_proxy_get_version((struct wl_proxy *) xdg_surface); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * Unmap and destroy the window. The window will be effectively + * hidden from the user's point of view, and all state like + * maximization, fullscreen, and so on, will be lost. + */ +static inline void +zxdg_surface_v5_destroy(struct xdg_surface *xdg_surface) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_DESTROY); + + wl_proxy_destroy((struct wl_proxy *) xdg_surface); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * Set the "parent" of this surface. This window should be stacked + * above a parent. The parent surface must be mapped as long as this + * surface is mapped. + * + * Parent windows should be set on dialogs, toolboxes, or other + * "auxiliary" surfaces, so that the parent is raised when the dialog + * is raised. + */ +static inline void +zxdg_surface_v5_set_parent(struct xdg_surface *xdg_surface, struct xdg_surface *parent) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_SET_PARENT, parent); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * Set a short title for the surface. + * + * This string may be used to identify the surface in a task bar, + * window list, or other user interface elements provided by the + * compositor. + * + * The string must be encoded in UTF-8. + */ +static inline void +zxdg_surface_v5_set_title(struct xdg_surface *xdg_surface, const char *title) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_SET_TITLE, title); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * Set an application identifier for the surface. + * + * The app ID identifies the general class of applications to which + * the surface belongs. The compositor can use this to group multiple + * surfaces together, or to determine how to launch a new application. + * + * For D-Bus activatable applications, the app ID is used as the D-Bus + * service name. + * + * The compositor shell will try to group application surfaces together + * by their app ID. As a best practice, it is suggested to select app + * ID's that match the basename of the application's .desktop file. + * For example, "org.freedesktop.FooViewer" where the .desktop file is + * "org.freedesktop.FooViewer.desktop". + * + * See the desktop-entry specification [0] for more details on + * application identifiers and how they relate to well-known D-Bus + * names and .desktop files. + * + * [0] http://standards.freedesktop.org/desktop-entry-spec/ + */ +static inline void +zxdg_surface_v5_set_app_id(struct xdg_surface *xdg_surface, const char *app_id) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_SET_APP_ID, app_id); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * Clients implementing client-side decorations might want to show + * a context menu when right-clicking on the decorations, giving the + * user a menu that they can use to maximize or minimize the window. + * + * This request asks the compositor to pop up such a window menu at + * the given position, relative to the local surface coordinates of + * the parent surface. There are no guarantees as to what menu items + * the window menu contains. + * + * This request must be used in response to some sort of user action + * like a button press, key press, or touch down event. + */ +static inline void +zxdg_surface_v5_show_window_menu(struct xdg_surface *xdg_surface, struct wl_seat *seat, uint32_t serial, int32_t x, int32_t y) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_SHOW_WINDOW_MENU, seat, serial, x, y); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * Start an interactive, user-driven move of the surface. + * + * This request must be used in response to some sort of user action + * like a button press, key press, or touch down event. The passed + * serial is used to determine the type of interactive move (touch, + * pointer, etc). + * + * The server may ignore move requests depending on the state of + * the surface (e.g. fullscreen or maximized), or if the passed serial + * is no longer valid. + * + * If triggered, the surface will lose the focus of the device + * (wl_pointer, wl_touch, etc) used for the move. It is up to the + * compositor to visually indicate that the move is taking place, such as + * updating a pointer cursor, during the move. There is no guarantee + * that the device focus will return when the move is completed. + */ +static inline void +zxdg_surface_v5_move(struct xdg_surface *xdg_surface, struct wl_seat *seat, uint32_t serial) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_MOVE, seat, serial); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * Start a user-driven, interactive resize of the surface. + * + * This request must be used in response to some sort of user action + * like a button press, key press, or touch down event. The passed + * serial is used to determine the type of interactive resize (touch, + * pointer, etc). + * + * The server may ignore resize requests depending on the state of + * the surface (e.g. fullscreen or maximized). + * + * If triggered, the client will receive configure events with the + * "resize" state enum value and the expected sizes. See the "resize" + * enum value for more details about what is required. The client + * must also acknowledge configure events using "ack_configure". After + * the resize is completed, the client will receive another "configure" + * event without the resize state. + * + * If triggered, the surface also will lose the focus of the device + * (wl_pointer, wl_touch, etc) used for the resize. It is up to the + * compositor to visually indicate that the resize is taking place, + * such as updating a pointer cursor, during the resize. There is no + * guarantee that the device focus will return when the resize is + * completed. + * + * The edges parameter specifies how the surface should be resized, + * and is one of the values of the resize_edge enum. The compositor + * may use this information to update the surface position for + * example when dragging the top left corner. The compositor may also + * use this information to adapt its behavior, e.g. choose an + * appropriate cursor image. + */ +static inline void +zxdg_surface_v5_resize(struct xdg_surface *xdg_surface, struct wl_seat *seat, uint32_t serial, uint32_t edges) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_RESIZE, seat, serial, edges); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * When a configure event is received, if a client commits the + * surface in response to the configure event, then the client + * must make an ack_configure request sometime before the commit + * request, passing along the serial of the configure event. + * + * For instance, the compositor might use this information to move + * a surface to the top left only when the client has drawn itself + * for the maximized or fullscreen state. + * + * If the client receives multiple configure events before it + * can respond to one, it only has to ack the last configure event. + * + * A client is not required to commit immediately after sending + * an ack_configure request - it may even ack_configure several times + * before its next surface commit. + * + * The compositor expects that the most recently received + * ack_configure request at the time of a commit indicates which + * configure event the client is responding to. + */ +static inline void +zxdg_surface_v5_ack_configure(struct xdg_surface *xdg_surface, uint32_t serial) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_ACK_CONFIGURE, serial); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * The window geometry of a window is its "visible bounds" from the + * user's perspective. Client-side decorations often have invisible + * portions like drop-shadows which should be ignored for the + * purposes of aligning, placing and constraining windows. + * + * The window geometry is double buffered, and will be applied at the + * time wl_surface.commit of the corresponding wl_surface is called. + * + * Once the window geometry of the surface is set once, it is not + * possible to unset it, and it will remain the same until + * set_window_geometry is called again, even if a new subsurface or + * buffer is attached. + * + * If never set, the value is the full bounds of the surface, + * including any subsurfaces. This updates dynamically on every + * commit. This unset mode is meant for extremely simple clients. + * + * If responding to a configure event, the window geometry in here + * must respect the sizing negotiations specified by the states in + * the configure event. + * + * The arguments are given in the surface local coordinate space of + * the wl_surface associated with this xdg_surface. + * + * The width and height must be greater than zero. + */ +static inline void +zxdg_surface_v5_set_window_geometry(struct xdg_surface *xdg_surface, int32_t x, int32_t y, int32_t width, int32_t height) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_SET_WINDOW_GEOMETRY, x, y, width, height); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * Maximize the surface. + * + * After requesting that the surface should be maximized, the compositor + * will respond by emitting a configure event with the "maximized" state + * and the required window geometry. The client should then update its + * content, drawing it in a maximized state, i.e. without shadow or other + * decoration outside of the window geometry. The client must also + * acknowledge the configure when committing the new content (see + * ack_configure). + * + * It is up to the compositor to decide how and where to maximize the + * surface, for example which output and what region of the screen should + * be used. + * + * If the surface was already maximized, the compositor will still emit + * a configure event with the "maximized" state. + */ +static inline void +zxdg_surface_v5_set_maximized(struct xdg_surface *xdg_surface) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_SET_MAXIMIZED); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * Unmaximize the surface. + * + * After requesting that the surface should be unmaximized, the compositor + * will respond by emitting a configure event without the "maximized" + * state. If available, the compositor will include the window geometry + * dimensions the window had prior to being maximized in the configure + * request. The client must then update its content, drawing it in a + * regular state, i.e. potentially with shadow, etc. The client must also + * acknowledge the configure when committing the new content (see + * ack_configure). + * + * It is up to the compositor to position the surface after it was + * unmaximized; usually the position the surface had before maximizing, if + * applicable. + * + * If the surface was already not maximized, the compositor will still + * emit a configure event without the "maximized" state. + */ +static inline void +zxdg_surface_v5_unset_maximized(struct xdg_surface *xdg_surface) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_UNSET_MAXIMIZED); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * Make the surface fullscreen. + * + * You can specify an output that you would prefer to be fullscreen. + * If this value is NULL, it's up to the compositor to choose which + * display will be used to map this surface. + * + * If the surface doesn't cover the whole output, the compositor will + * position the surface in the center of the output and compensate with + * black borders filling the rest of the output. + */ +static inline void +zxdg_surface_v5_set_fullscreen(struct xdg_surface *xdg_surface, struct wl_output *output) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_SET_FULLSCREEN, output); +} + +/** + * @ingroup iface_zxdg_surface_v5 + */ +static inline void +zxdg_surface_v5_unset_fullscreen(struct xdg_surface *xdg_surface) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_UNSET_FULLSCREEN); +} + +/** + * @ingroup iface_zxdg_surface_v5 + * + * Request that the compositor minimize your surface. There is no + * way to know if the surface is currently minimized, nor is there + * any way to unset minimization on this surface. + * + * If you are looking to throttle redrawing when minimized, please + * instead use the wl_surface.frame event for this, as this will + * also work with live previews on windows in Alt-Tab, Expose or + * similar compositor features. + */ +static inline void +zxdg_surface_v5_set_minimized(struct xdg_surface *xdg_surface) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_surface, + ZXDG_SURFACE_V5_SET_MINIMIZED); +} + +/** + * @ingroup iface_zxdg_popup_v5 + * @struct zxdg_popup_v5_listener + */ +struct zxdg_popup_v5_listener { + /** + * popup interaction is done + * + * The popup_done event is sent out when a popup is dismissed by + * the compositor. The client should destroy the xdg_popup object + * at this point. + */ + void (*popup_done)(void *data, + struct xdg_popup *xdg_popup); +}; + +/** + * @ingroup iface_zxdg_popup_v5 + */ +static inline int +zxdg_popup_v5_add_listener(struct xdg_popup *xdg_popup, + const struct zxdg_popup_v5_listener *listener, void *data) +{ + return wl_proxy_add_listener((struct wl_proxy *) xdg_popup, + (void (**)(void)) listener, data); +} + +#define ZXDG_POPUP_V5_DESTROY 0 + +/** + * @ingroup iface_zxdg_popup_v5 + */ +#define ZXDG_POPUP_V5_POPUP_DONE_SINCE_VERSION 1 + +/** + * @ingroup iface_zxdg_popup_v5 + */ +#define ZXDG_POPUP_V5_DESTROY_SINCE_VERSION 1 + +/** @ingroup iface_xdg_popup */ +static inline void +zxdg_popup_v5_set_user_data(struct xdg_popup *xdg_popup, void *user_data) +{ + wl_proxy_set_user_data((struct wl_proxy *) xdg_popup, user_data); +} + +/** @ingroup iface_xdg_popup */ +static inline void * +zxdg_popup_v5_get_user_data(struct xdg_popup *xdg_popup) +{ + return wl_proxy_get_user_data((struct wl_proxy *) xdg_popup); +} + +static inline uint32_t +zxdg_popup_v5_get_version(struct xdg_popup *xdg_popup) +{ + return wl_proxy_get_version((struct wl_proxy *) xdg_popup); +} + +/** + * @ingroup iface_zxdg_popup_v5 + * + * This destroys the popup. Explicitly destroying the zxdg_popup_v5 + * object will also dismiss the popup, and unmap the surface. + * + * If this xdg_popup is not the "topmost" popup, a protocol error + * will be sent. + */ +static inline void +zxdg_popup_v5_destroy(struct xdg_popup *xdg_popup) +{ + wl_proxy_marshal((struct wl_proxy *) xdg_popup, + ZXDG_POPUP_V5_DESTROY); + + wl_proxy_destroy((struct wl_proxy *) xdg_popup); +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/compat/wayland-xdg-shell-v5-protocol.c b/src/compat/wayland-xdg-shell-v5-protocol.c new file mode 100644 --- /dev/null +++ b/src/compat/wayland-xdg-shell-v5-protocol.c @@ -0,0 +1,128 @@ +/* + * This file is *NOT* autogenerated. + * It contains XDGShellV5 with method names modified to be not clashing with XDG stable + * Strings inside the sent protocol remain the same + */ +/* + * Copyright © 2008-2013 Kristian Høgsberg + * Copyright © 2013 Rafael Antognolli + * Copyright © 2013 Jasper St. Pierre + * Copyright © 2010-2013 Intel Corporation + * + * 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 +#include +#include "wayland-util.h" + +extern const struct wl_interface wl_output_interface; +extern const struct wl_interface wl_seat_interface; +extern const struct wl_interface wl_surface_interface; +extern const struct wl_interface zxdg_popup_v5_interface; +extern const struct wl_interface zxdg_surface_v5_interface; + +static const struct wl_interface *types[] = { + NULL, + NULL, + NULL, + NULL, + &zxdg_surface_v5_interface, + &wl_surface_interface, + &zxdg_popup_v5_interface, + &wl_surface_interface, + &wl_surface_interface, + &wl_seat_interface, + NULL, + NULL, + NULL, + &zxdg_surface_v5_interface, + &wl_seat_interface, + NULL, + NULL, + NULL, + &wl_seat_interface, + NULL, + &wl_seat_interface, + NULL, + NULL, + &wl_output_interface, +}; + +static const struct wl_message zxdg_shell_v5_requests[] = { + { "destroy", "", types + 0 }, + { "use_unstable_version", "i", types + 0 }, + { "get_xdg_surface", "no", types + 4 }, + { "get_xdg_popup", "nooouii", types + 6 }, + { "pong", "u", types + 0 }, +}; + +static const struct wl_message zxdg_shell_v5_events[] = { + { "ping", "u", types + 0 }, +}; + +WL_EXPORT const struct wl_interface zxdg_shell_v5_interface = { + "xdg_shell", 1, + 5, zxdg_shell_v5_requests, + 1, zxdg_shell_v5_events, +}; + +static const struct wl_message zxdg_surface_v5_requests[] = { + { "destroy", "", types + 0 }, + { "set_parent", "?o", types + 13 }, + { "set_title", "s", types + 0 }, + { "set_app_id", "s", types + 0 }, + { "show_window_menu", "ouii", types + 14 }, + { "move", "ou", types + 18 }, + { "resize", "ouu", types + 20 }, + { "ack_configure", "u", types + 0 }, + { "set_window_geometry", "iiii", types + 0 }, + { "set_maximized", "", types + 0 }, + { "unset_maximized", "", types + 0 }, + { "set_fullscreen", "?o", types + 23 }, + { "unset_fullscreen", "", types + 0 }, + { "set_minimized", "", types + 0 }, +}; + +static const struct wl_message zxdg_surface_v5_events[] = { + { "configure", "iiau", types + 0 }, + { "close", "", types + 0 }, +}; + +WL_EXPORT const struct wl_interface zxdg_surface_v5_interface = { + "xdg_surface", 1, + 14, zxdg_surface_v5_requests, + 2, zxdg_surface_v5_events, +}; + +static const struct wl_message zxdg_popup_v5_requests[] = { + { "destroy", "", types + 0 }, +}; + +static const struct wl_message zxdg_popup_v5_events[] = { + { "popup_done", "", types + 0 }, +}; + +WL_EXPORT const struct wl_interface zxdg_popup_v5_interface = { + "xdg_popup", 1, + 1, zxdg_popup_v5_requests, + 1, zxdg_popup_v5_events, +}; + diff --git a/src/compat/wayland-xdg-shell-v5-server-protocol.h b/src/compat/wayland-xdg-shell-v5-server-protocol.h new file mode 100644 --- /dev/null +++ b/src/compat/wayland-xdg-shell-v5-server-protocol.h @@ -0,0 +1,906 @@ +/* + * This file is *NOT* autogenerated. + * It contains XDGShellV5 with method names modified to be not clashing with XDG stable + * Strings inside the sent protocol remain the same + */ +#ifndef ZXDG_SHELL_V5_UNSTABLE_V5_SERVER_PROTOCOL_H +#define ZXDG_SHELL_V5_UNSTABLE_V5_SERVER_PROTOCOL_H + +#include +#include +#include "wayland-server.h" + +#ifdef __cplusplus +extern "C" { +#endif + +struct wl_client; +struct wl_resource; + +/** + * @page page_zxdg_shell_v5_unstable_v5 The zxdg_shell_v5_unstable_v5 protocol + * @section page_ifaces_zxdg_shell_v5_unstable_v5 Interfaces + * - @subpage page_iface_xdg_shell - create desktop-style surfaces + * - @subpage page_iface_xdg_surface - A desktop window + * - @subpage page_iface_xdg_popup - short-lived, popup surfaces for menus + * @section page_copyright_zxdg_shell_v5_unstable_v5 Copyright + *
+ *
+ * Copyright © 2008-2013 Kristian Høgsberg
+ * Copyright © 2013      Rafael Antognolli
+ * Copyright © 2013      Jasper St. Pierre
+ * Copyright © 2010-2013 Intel Corporation
+ *
+ * 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.
+ * 
+ */ +struct wl_output; +struct wl_seat; +struct wl_surface; +struct zxdg_popup_v5; +struct zxdg_shell_v5; +struct zxdg_surface_v5; + +/** + * @page page_iface_zxdg_shell xdg_v5_shell + * @section page_iface_zxdg_shell_v5_desc Description + * + * zxdg_shell allows clients to turn a wl_v5_surface into a "real window" + * which can be dragged, resized, stacked, and moved around by the + * user. Everything about this interface is suited towards traditional + * desktop environments. + * @section page_iface_zxdg_shell_v5_api API + * See @ref iface_xdg_shell. + */ +/** + * @defgroup iface_zxdg_shell The xdg_v5_shell interface + * + * zxdg_shell allows clients to turn a wl_v5_surface into a "real window" + * which can be dragged, resized, stacked, and moved around by the + * user. Everything about this interface is suited towards traditional + * desktop environments. + */ +extern const struct wl_interface zxdg_shell_v5_interface; +/** + * @page page_iface_zxdg_surface xdg_v5_surface + * @section page_iface_zxdg_surface_v5_desc Description + * + * An interface that may be implemented by a wl_surface, for + * implementations that provide a desktop-style user interface. + * + * It provides requests to treat surfaces like windows, allowing to set + * properties like maximized, fullscreen, minimized, and to move and resize + * them, and associate metadata like title and app id. + * + * The client must call wl_surface.commit on the corresponding wl_surface + * for the xdg_surface state to take effect. Prior to committing the new + * state, it can set up initial configuration, such as maximizing or setting + * a window geometry. + * + * Even without attaching a buffer the compositor must respond to initial + * committed configuration, for instance sending a configure event with + * expected window geometry if the client maximized its surface during + * initialization. + * + * For a surface to be mapped by the compositor the client must have + * committed both an xdg_surface state and a buffer. + * @section page_iface_zxdg_surface_v5_api API + * See @ref iface_xdg_surface. + */ +/** + * @defgroup iface_zxdg_surface The xdg_v5_surface interface + * + * An interface that may be implemented by a wl_surface, for + * implementations that provide a desktop-style user interface. + * + * It provides requests to treat surfaces like windows, allowing to set + * properties like maximized, fullscreen, minimized, and to move and resize + * them, and associate metadata like title and app id. + * + * The client must call wl_surface.commit on the corresponding wl_surface + * for the xdg_surface state to take effect. Prior to committing the new + * state, it can set up initial configuration, such as maximizing or setting + * a window geometry. + * + * Even without attaching a buffer the compositor must respond to initial + * committed configuration, for instance sending a configure event with + * expected window geometry if the client maximized its surface during + * initialization. + * + * For a surface to be mapped by the compositor the client must have + * committed both an xdg_surface state and a buffer. + */ +extern const struct wl_interface zxdg_surface_v5_interface; +/** + * @page page_iface_zxdg_popup xdg_v5_popup + * @section page_iface_zxdg_popup_v5_desc Description + * + * A popup surface is a short-lived, temporary surface that can be + * used to implement menus. It takes an explicit grab on the surface + * that will be dismissed when the user dismisses the popup. This can + * be done by the user clicking outside the surface, using the keyboard, + * or even locking the screen through closing the lid or a timeout. + * + * When the popup is dismissed, a popup_done event will be sent out, + * and at the same time the surface will be unmapped. The xdg_popup + * object is now inert and cannot be reactivated, so clients should + * destroy it. Explicitly destroying the xdg_popup object will also + * dismiss the popup and unmap the surface. + * + * Clients will receive events for all their surfaces during this + * grab (which is an "owner-events" grab in X11 parlance). This is + * done so that users can navigate through submenus and other + * "nested" popup windows without having to dismiss the topmost + * popup. + * + * Clients that want to dismiss the popup when another surface of + * their own is clicked should dismiss the popup using the destroy + * request. + * + * The parent surface must have either an zxdg_surface or xdg_v5_popup + * role. + * + * Specifying an xdg_popup for the parent means that the popups are + * nested, with this popup now being the topmost popup. Nested + * popups must be destroyed in the reverse order they were created + * in, e.g. the only popup you are allowed to destroy at all times + * is the topmost one. + * + * If there is an existing popup when creating a new popup, the + * parent must be the current topmost popup. + * + * A parent surface must be mapped before the new popup is mapped. + * + * When compositors choose to dismiss a popup, they will likely + * dismiss every nested popup as well. When a compositor dismisses + * popups, it will follow the same dismissing order as required + * from the client. + * + * The x and y arguments passed when creating the popup object specify + * where the top left of the popup should be placed, relative to the + * local surface coordinates of the parent surface. See + * zxdg_shell.get_v5_xdg_popup. + * + * The client must call wl_surface.commit on the corresponding wl_surface + * for the xdg_popup state to take effect. + * + * For a surface to be mapped by the compositor the client must have + * committed both the xdg_popup state and a buffer. + * @section page_iface_zxdg_popup_v5_api API + * See @ref iface_xdg_popup. + */ +/** + * @defgroup iface_zxdg_popup The xdg_v5_popup interface + * + * A popup surface is a short-lived, temporary surface that can be + * used to implement menus. It takes an explicit grab on the surface + * that will be dismissed when the user dismisses the popup. This can + * be done by the user clicking outside the surface, using the keyboard, + * or even locking the screen through closing the lid or a timeout. + * + * When the popup is dismissed, a popup_done event will be sent out, + * and at the same time the surface will be unmapped. The xdg_popup + * object is now inert and cannot be reactivated, so clients should + * destroy it. Explicitly destroying the xdg_popup object will also + * dismiss the popup and unmap the surface. + * + * Clients will receive events for all their surfaces during this + * grab (which is an "owner-events" grab in X11 parlance). This is + * done so that users can navigate through submenus and other + * "nested" popup windows without having to dismiss the topmost + * popup. + * + * Clients that want to dismiss the popup when another surface of + * their own is clicked should dismiss the popup using the destroy + * request. + * + * The parent surface must have either an zxdg_surface or xdg_v5_popup + * role. + * + * Specifying an xdg_popup for the parent means that the popups are + * nested, with this popup now being the topmost popup. Nested + * popups must be destroyed in the reverse order they were created + * in, e.g. the only popup you are allowed to destroy at all times + * is the topmost one. + * + * If there is an existing popup when creating a new popup, the + * parent must be the current topmost popup. + * + * A parent surface must be mapped before the new popup is mapped. + * + * When compositors choose to dismiss a popup, they will likely + * dismiss every nested popup as well. When a compositor dismisses + * popups, it will follow the same dismissing order as required + * from the client. + * + * The x and y arguments passed when creating the popup object specify + * where the top left of the popup should be placed, relative to the + * local surface coordinates of the parent surface. See + * zxdg_shell.get_v5_xdg_popup. + * + * The client must call wl_surface.commit on the corresponding wl_surface + * for the xdg_popup state to take effect. + * + * For a surface to be mapped by the compositor the client must have + * committed both the xdg_popup state and a buffer. + */ +extern const struct wl_interface zxdg_popup_v5_interface; + +#ifndef ZXDG_SHELL_V5_VERSION_ENUM +#define ZXDG_SHELL_V5_VERSION_ENUM +/** + * @ingroup iface_xdg_shell + * latest protocol version + * + * The 'current' member of this enum gives the version of the + * protocol. Implementations can compare this to the version + * they implement using static_assert to ensure the protocol and + * implementation versions match. + */ +enum zxdg_shell_v5_version { + /** + * Always the latest version + */ + ZXDG_SHELL_V5_VERSION_CURRENT = 5, +}; +#endif /* ZXDG_SHELL_V5_VERSION_ENUM */ + +#ifndef ZXDG_SHELL_V5_ERROR_ENUM +#define ZXDG_SHELL_V5_ERROR_ENUM +enum zxdg_shell_v5_error { + /** + * given wl_surface has another role + */ + ZXDG_SHELL_V5_ERROR_ROLE = 0, + /** + * xdg_shell was destroyed before children + */ + ZXDG_SHELL_V5_ERROR_DEFUNCT_SURFACES = 1, + /** + * the client tried to map or destroy a non-topmost popup + */ + ZXDG_SHELL_V5_ERROR_NOT_THE_TOPMOST_POPUP = 2, + /** + * the client specified an invalid popup parent surface + */ + ZXDG_SHELL_V5_ERROR_INVALID_POPUP_PARENT = 3, +}; +#endif /* ZXDG_SHELL_V5_ERROR_ENUM */ + +/** + * @ingroup iface_xdg_shell + * @struct zxdg_shell_v5_interface + */ +struct zxdg_shell_v5_interface { + /** + * destroy xdg_shell + * + * Destroy this xdg_shell object. + * + * Destroying a bound xdg_shell object while there are surfaces + * still alive created by this xdg_shell object instance is illegal + * and will result in a protocol error. + */ + void (*destroy)(struct wl_client *client, + struct wl_resource *resource); + /** + * enable use of this unstable version + * + * Negotiate the unstable version of the interface. This + * mechanism is in place to ensure client and server agree on the + * unstable versions of the protocol that they speak or exit + * cleanly if they don't agree. This request will go away once the + * xdg-shell protocol is stable. + */ + void (*use_unstable_version)(struct wl_client *client, + struct wl_resource *resource, + int32_t version); + /** + * create a shell surface from a surface + * + * This creates an xdg_surface for the given surface and gives it + * the zxdg_surface role. A wl_v5_surface can only be given an + * zxdg_surface role once. If get_v5_xdg_surface is called with a + * wl_surface that already has an active xdg_surface associated + * with it, or if it had any other role, an error is raised. + * + * See the documentation of xdg_surface for more details about what + * an xdg_surface is and how it is used. + */ + void (*get_zxdg_surface)(struct wl_client *client, + struct wl_resource *resource, + uint32_t id, + struct wl_resource *surface); + /** + * create a popup for a surface + * + * This creates an xdg_popup for the given surface and gives it + * the zxdg_popup role. A wl_v5_surface can only be given an xdg_popup + * role once. If get_zxdg_popup is called with a wl_v5_surface that + * already has an active xdg_popup associated with it, or if it had + * any other role, an error is raised. + * + * This request must be used in response to some sort of user + * action like a button press, key press, or touch down event. + * + * See the documentation of xdg_popup for more details about what + * an xdg_popup is and how it is used. + * @param seat the wl_seat of the user event + * @param serial the serial of the user event + */ + void (*get_zxdg_popup)(struct wl_client *client, + struct wl_resource *resource, + uint32_t id, + struct wl_resource *surface, + struct wl_resource *parent, + struct wl_resource *seat, + uint32_t serial, + int32_t x, + int32_t y); + /** + * respond to a ping event + * + * A client must respond to a ping event with a pong request or + * the client may be deemed unresponsive. + * @param serial serial of the ping event + */ + void (*pong)(struct wl_client *client, + struct wl_resource *resource, + uint32_t serial); +}; + +#define ZXDG_SHELL_V5_PING 0 + +/** + * @ingroup iface_xdg_shell + */ +#define ZXDG_SHELL_V5_PING_SINCE_VERSION 1 + +/** + * @ingroup iface_xdg_shell + */ +#define ZXDG_SHELL_V5_DESTROY_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_shell + */ +#define ZXDG_SHELL_V5_USE_UNSTABLE_VERSION_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_shell + */ +#define ZXDG_SHELL_V5_GET_ZXDG_SURFACE_V5_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_shell + */ +#define ZXDG_SHELL_V5_GET_ZXDG_POPUP_v5_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_shell + */ +#define ZXDG_SHELL_V5_PONG_SINCE_VERSION 1 + +/** + * @ingroup iface_xdg_shell + * Sends an ping event to the client owning the resource. + * @param resource_ The client's resource + * @param serial pass this to the pong request + */ +static inline void +zxdg_shell_v5_send_ping(struct wl_resource *resource_, uint32_t serial) +{ + wl_resource_post_event(resource_, ZXDG_SHELL_V5_PING, serial); +} + +#ifndef ZXDG_SURFACE_V5_RESIZE_EDGE_ENUM +#define ZXDG_SURFACE_V5_RESIZE_EDGE_ENUM +/** + * @ingroup iface_xdg_surface + * edge values for resizing + * + * These values are used to indicate which edge of a surface + * is being dragged in a resize operation. + */ +enum zxdg_surface_v5_resize_edge { + ZXDG_SURFACE_V5_RESIZE_EDGE_NONE = 0, + ZXDG_SURFACE_V5_RESIZE_EDGE_TOP = 1, + ZXDG_SURFACE_V5_RESIZE_EDGE_BOTTOM = 2, + ZXDG_SURFACE_V5_RESIZE_EDGE_LEFT = 4, + ZXDG_SURFACE_V5_RESIZE_EDGE_TOP_LEFT = 5, + ZXDG_SURFACE_V5_RESIZE_EDGE_BOTTOM_LEFT = 6, + ZXDG_SURFACE_V5_RESIZE_EDGE_RIGHT = 8, + ZXDG_SURFACE_V5_RESIZE_EDGE_TOP_RIGHT = 9, + ZXDG_SURFACE_V5_RESIZE_EDGE_BOTTOM_RIGHT = 10, +}; +#endif /* ZXDG_SURFACE_V5_RESIZE_EDGE_ENUM */ + +#ifndef ZXDG_SURFACE_V5_STATE_ENUM +#define ZXDG_SURFACE_V5_STATE_ENUM +/** + * @ingroup iface_xdg_surface + * the surface is now activated + * + * Client window decorations should be painted as if the window is + * active. Do not assume this means that the window actually has + * keyboard or pointer focus. + */ +enum zxdg_surface_v5_state { + /** + * the surface is maximized + */ + ZXDG_SURFACE_V5_STATE_MAXIMIZED = 1, + /** + * the surface is fullscreen + */ + ZXDG_SURFACE_V5_STATE_FULLSCREEN = 2, + /** + * the surface is being resized + */ + ZXDG_SURFACE_V5_STATE_RESIZING = 3, + /** + * the surface is now activated + */ + ZXDG_SURFACE_V5_STATE_ACTIVATED = 4, +}; +#endif /* ZXDG_SURFACE_V5_STATE_ENUM */ + +/** + * @ingroup iface_xdg_surface + * @struct zxdg_surface_v5_interface + */ +struct zxdg_surface_v5_interface { + /** + * Destroy the xdg_surface + * + * Unmap and destroy the window. The window will be effectively + * hidden from the user's point of view, and all state like + * maximization, fullscreen, and so on, will be lost. + */ + void (*destroy)(struct wl_client *client, + struct wl_resource *resource); + /** + * set the parent of this surface + * + * Set the "parent" of this surface. This window should be + * stacked above a parent. The parent surface must be mapped as + * long as this surface is mapped. + * + * Parent windows should be set on dialogs, toolboxes, or other + * "auxiliary" surfaces, so that the parent is raised when the + * dialog is raised. + */ + void (*set_parent)(struct wl_client *client, + struct wl_resource *resource, + struct wl_resource *parent); + /** + * set surface title + * + * Set a short title for the surface. + * + * This string may be used to identify the surface in a task bar, + * window list, or other user interface elements provided by the + * compositor. + * + * The string must be encoded in UTF-8. + */ + void (*set_title)(struct wl_client *client, + struct wl_resource *resource, + const char *title); + /** + * set application ID + * + * Set an application identifier for the surface. + * + * The app ID identifies the general class of applications to which + * the surface belongs. The compositor can use this to group + * multiple surfaces together, or to determine how to launch a new + * application. + * + * For D-Bus activatable applications, the app ID is used as the + * D-Bus service name. + * + * The compositor shell will try to group application surfaces + * together by their app ID. As a best practice, it is suggested to + * select app ID's that match the basename of the application's + * .desktop file. For example, "org.freedesktop.FooViewer" where + * the .desktop file is "org.freedesktop.FooViewer.desktop". + * + * See the desktop-entry specification [0] for more details on + * application identifiers and how they relate to well-known D-Bus + * names and .desktop files. + * + * [0] http://standards.freedesktop.org/desktop-entry-spec/ + */ + void (*set_app_id)(struct wl_client *client, + struct wl_resource *resource, + const char *app_id); + /** + * show the window menu + * + * Clients implementing client-side decorations might want to + * show a context menu when right-clicking on the decorations, + * giving the user a menu that they can use to maximize or minimize + * the window. + * + * This request asks the compositor to pop up such a window menu at + * the given position, relative to the local surface coordinates of + * the parent surface. There are no guarantees as to what menu + * items the window menu contains. + * + * This request must be used in response to some sort of user + * action like a button press, key press, or touch down event. + * @param seat the wl_seat of the user event + * @param serial the serial of the user event + * @param x the x position to pop up the window menu at + * @param y the y position to pop up the window menu at + */ + void (*show_window_menu)(struct wl_client *client, + struct wl_resource *resource, + struct wl_resource *seat, + uint32_t serial, + int32_t x, + int32_t y); + /** + * start an interactive move + * + * Start an interactive, user-driven move of the surface. + * + * This request must be used in response to some sort of user + * action like a button press, key press, or touch down event. The + * passed serial is used to determine the type of interactive move + * (touch, pointer, etc). + * + * The server may ignore move requests depending on the state of + * the surface (e.g. fullscreen or maximized), or if the passed + * serial is no longer valid. + * + * If triggered, the surface will lose the focus of the device + * (wl_pointer, wl_touch, etc) used for the move. It is up to the + * compositor to visually indicate that the move is taking place, + * such as updating a pointer cursor, during the move. There is no + * guarantee that the device focus will return when the move is + * completed. + * @param seat the wl_seat of the user event + * @param serial the serial of the user event + */ + void (*move)(struct wl_client *client, + struct wl_resource *resource, + struct wl_resource *seat, + uint32_t serial); + /** + * start an interactive resize + * + * Start a user-driven, interactive resize of the surface. + * + * This request must be used in response to some sort of user + * action like a button press, key press, or touch down event. The + * passed serial is used to determine the type of interactive + * resize (touch, pointer, etc). + * + * The server may ignore resize requests depending on the state of + * the surface (e.g. fullscreen or maximized). + * + * If triggered, the client will receive configure events with the + * "resize" state enum value and the expected sizes. See the + * "resize" enum value for more details about what is required. The + * client must also acknowledge configure events using + * "ack_configure". After the resize is completed, the client will + * receive another "configure" event without the resize state. + * + * If triggered, the surface also will lose the focus of the device + * (wl_pointer, wl_touch, etc) used for the resize. It is up to the + * compositor to visually indicate that the resize is taking place, + * such as updating a pointer cursor, during the resize. There is + * no guarantee that the device focus will return when the resize + * is completed. + * + * The edges parameter specifies how the surface should be resized, + * and is one of the values of the resize_edge enum. The compositor + * may use this information to update the surface position for + * example when dragging the top left corner. The compositor may + * also use this information to adapt its behavior, e.g. choose an + * appropriate cursor image. + * @param seat the wl_seat of the user event + * @param serial the serial of the user event + * @param edges which edge or corner is being dragged + */ + void (*resize)(struct wl_client *client, + struct wl_resource *resource, + struct wl_resource *seat, + uint32_t serial, + uint32_t edges); + /** + * ack a configure event + * + * When a configure event is received, if a client commits the + * surface in response to the configure event, then the client must + * make an ack_configure request sometime before the commit + * request, passing along the serial of the configure event. + * + * For instance, the compositor might use this information to move + * a surface to the top left only when the client has drawn itself + * for the maximized or fullscreen state. + * + * If the client receives multiple configure events before it can + * respond to one, it only has to ack the last configure event. + * + * A client is not required to commit immediately after sending an + * ack_configure request - it may even ack_configure several times + * before its next surface commit. + * + * The compositor expects that the most recently received + * ack_configure request at the time of a commit indicates which + * configure event the client is responding to. + * @param serial the serial from the configure event + */ + void (*ack_configure)(struct wl_client *client, + struct wl_resource *resource, + uint32_t serial); + /** + * set the new window geometry + * + * The window geometry of a window is its "visible bounds" from + * the user's perspective. Client-side decorations often have + * invisible portions like drop-shadows which should be ignored for + * the purposes of aligning, placing and constraining windows. + * + * The window geometry is double buffered, and will be applied at + * the time wl_surface.commit of the corresponding wl_surface is + * called. + * + * Once the window geometry of the surface is set once, it is not + * possible to unset it, and it will remain the same until + * set_window_geometry is called again, even if a new subsurface or + * buffer is attached. + * + * If never set, the value is the full bounds of the surface, + * including any subsurfaces. This updates dynamically on every + * commit. This unset mode is meant for extremely simple clients. + * + * If responding to a configure event, the window geometry in here + * must respect the sizing negotiations specified by the states in + * the configure event. + * + * The arguments are given in the surface local coordinate space of + * the wl_surface associated with this xdg_surface. + * + * The width and height must be greater than zero. + */ + void (*set_window_geometry)(struct wl_client *client, + struct wl_resource *resource, + int32_t x, + int32_t y, + int32_t width, + int32_t height); + /** + * maximize the window + * + * Maximize the surface. + * + * After requesting that the surface should be maximized, the + * compositor will respond by emitting a configure event with the + * "maximized" state and the required window geometry. The client + * should then update its content, drawing it in a maximized state, + * i.e. without shadow or other decoration outside of the window + * geometry. The client must also acknowledge the configure when + * committing the new content (see ack_configure). + * + * It is up to the compositor to decide how and where to maximize + * the surface, for example which output and what region of the + * screen should be used. + * + * If the surface was already maximized, the compositor will still + * emit a configure event with the "maximized" state. + */ + void (*set_maximized)(struct wl_client *client, + struct wl_resource *resource); + /** + * unmaximize the window + * + * Unmaximize the surface. + * + * After requesting that the surface should be unmaximized, the + * compositor will respond by emitting a configure event without + * the "maximized" state. If available, the compositor will include + * the window geometry dimensions the window had prior to being + * maximized in the configure request. The client must then update + * its content, drawing it in a regular state, i.e. potentially + * with shadow, etc. The client must also acknowledge the configure + * when committing the new content (see ack_configure). + * + * It is up to the compositor to position the surface after it was + * unmaximized; usually the position the surface had before + * maximizing, if applicable. + * + * If the surface was already not maximized, the compositor will + * still emit a configure event without the "maximized" state. + */ + void (*unset_maximized)(struct wl_client *client, + struct wl_resource *resource); + /** + * set the window as fullscreen on a monitor + * + * Make the surface fullscreen. + * + * You can specify an output that you would prefer to be + * fullscreen. If this value is NULL, it's up to the compositor to + * choose which display will be used to map this surface. + * + * If the surface doesn't cover the whole output, the compositor + * will position the surface in the center of the output and + * compensate with black borders filling the rest of the output. + */ + void (*set_fullscreen)(struct wl_client *client, + struct wl_resource *resource, + struct wl_resource *output); + /** + */ + void (*unset_fullscreen)(struct wl_client *client, + struct wl_resource *resource); + /** + * set the window as minimized + * + * Request that the compositor minimize your surface. There is no + * way to know if the surface is currently minimized, nor is there + * any way to unset minimization on this surface. + * + * If you are looking to throttle redrawing when minimized, please + * instead use the wl_surface.frame event for this, as this will + * also work with live previews on windows in Alt-Tab, Expose or + * similar compositor features. + */ + void (*set_minimized)(struct wl_client *client, + struct wl_resource *resource); +}; + +#define ZXDG_SURFACE_V5_CONFIGURE 0 +#define ZXDG_SURFACE_V5_CLOSE 1 + +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_CONFIGURE_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_CLOSE_SINCE_VERSION 1 + +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_DESTROY_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_SET_PARENT_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_SET_TITLE_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_SET_APP_ID_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_SHOW_WINDOW_MENU_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_MOVE_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_RESIZE_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_ACK_CONFIGURE_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_SET_WINDOW_GEOMETRY_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_SET_MAXIMIZED_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_UNSET_MAXIMIZED_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_SET_FULLSCREEN_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_UNSET_FULLSCREEN_SINCE_VERSION 1 +/** + * @ingroup iface_xdg_surface + */ +#define ZXDG_SURFACE_V5_SET_MINIMIZED_SINCE_VERSION 1 + +/** + * @ingroup iface_xdg_surface + * Sends an configure event to the client owning the resource. + * @param resource_ The client's resource + */ +static inline void +zxdg_surface_v5_send_configure(struct wl_resource *resource_, int32_t width, int32_t height, struct wl_array *states, uint32_t serial) +{ + wl_resource_post_event(resource_, ZXDG_SURFACE_V5_CONFIGURE, width, height, states, serial); +} + +/** + * @ingroup iface_xdg_surface + * Sends an close event to the client owning the resource. + * @param resource_ The client's resource + */ +static inline void +zxdg_surface_v5_send_close(struct wl_resource *resource_) +{ + wl_resource_post_event(resource_, ZXDG_SURFACE_V5_CLOSE); +} + +/** + * @ingroup iface_xdg_popup + * @struct zxdg_popup_v5_interface + */ +struct zxdg_popup_v5_interface { + /** + * remove xdg_popup interface + * + * This destroys the popup. Explicitly destroying the xdg_popup + * object will also dismiss the popup, and unmap the surface. + * + * If this xdg_popup is not the "topmost" popup, a protocol error + * will be sent. + */ + void (*destroy)(struct wl_client *client, + struct wl_resource *resource); +}; + +#define ZXDG_POPUP_v5_POPUP_DONE 0 + +/** + * @ingroup iface_xdg_popup + */ +#define ZXDG_POPUP_v5_POPUP_DONE_SINCE_VERSION 1 + +/** + * @ingroup iface_xdg_popup + */ +#define ZXDG_POPUP_v5_DESTROY_SINCE_VERSION 1 + +/** + * @ingroup iface_xdg_popup + * Sends an popup_done event to the client owning the resource. + * @param resource_ The client's resource + */ +static inline void +zxdg_popup_v5_send_popup_done(struct wl_resource *resource_) +{ + wl_resource_post_event(resource_, ZXDG_POPUP_v5_POPUP_DONE); +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -53,8 +53,10 @@ xdgshell_v5_interface.cpp xdgforeign_v2_interface.cpp xdgforeign_interface.cpp + xdgshell_v5_interface.cpp xdgshell_v6_interface.cpp xdgoutput_interface.cpp + ../compat/wayland-xdg-shell-v5-protocol.c ) ecm_add_wayland_server_protocol(SERVER_LIB_SRCS @@ -221,8 +223,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-input-unstable-v2-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-input-unstable-v2-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v5-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v5-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v6-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v6-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-gestures-unstable-v1-client-protocol.h diff --git a/src/server/xdgshell_v5_interface.cpp b/src/server/xdgshell_v5_interface.cpp --- a/src/server/xdgshell_v5_interface.cpp +++ b/src/server/xdgshell_v5_interface.cpp @@ -27,7 +27,7 @@ #include "seat_interface.h" #include "surface_interface.h" -#include +#include "../compat/wayland-xdg-shell-v5-server-protocol.h" namespace KWayland { @@ -61,7 +61,7 @@ static void pongCallback(wl_client *client, wl_resource *resource, uint32_t serial); XdgShellV5Interface *q; - static const struct xdg_shell_interface s_interface; + static const struct zxdg_shell_v5_interface s_interface; static const quint32 s_version; }; @@ -79,13 +79,13 @@ private: - static const struct xdg_popup_interface s_interface; + static const struct zxdg_popup_v5_interface s_interface; }; const quint32 XdgShellV5Interface::Private::s_version = 1; #ifndef DOXYGEN_SHOULD_SKIP_THIS -const struct xdg_shell_interface XdgShellV5Interface::Private::s_interface = { +const struct zxdg_shell_v5_interface XdgShellV5Interface::Private::s_interface = { destroyCallback, useUnstableVersionCallback, getXdgSurfaceCallback, @@ -123,7 +123,7 @@ } ); if (it != surfaces.constEnd()) { - wl_resource_post_error(surface->resource(), XDG_SHELL_ERROR_ROLE, "ShellSurface already created"); + wl_resource_post_error(surface->resource(), ZXDG_SHELL_V5_ERROR_ROLE, "ShellSurface already created"); return; } XdgSurfaceV5Interface *shellSurface = new XdgSurfaceV5Interface(q, surface, parentResource); @@ -175,15 +175,15 @@ } XdgShellV5Interface::Private::Private(XdgShellV5Interface *q, Display *d) - : XdgShellInterface::Private(XdgShellInterfaceVersion::UnstableV5, q, d, &xdg_shell_interface, s_version) + : XdgShellInterface::Private(XdgShellInterfaceVersion::UnstableV5, q, d, &zxdg_shell_v5_interface, s_version) , q(q) { } void XdgShellV5Interface::Private::bind(wl_client *client, uint32_t version, uint32_t id) { auto c = display->getConnection(client); - auto resource = c->createResource(&xdg_shell_interface, qMin(version, s_version), id); + auto resource = c->createResource(&zxdg_shell_v5_interface, qMin(version, s_version), id); if (!resource) { wl_client_post_no_memory(client); return; @@ -226,7 +226,7 @@ return 0; } const quint32 pingSerial = display->nextSerial(); - xdg_shell_send_ping(clientXdgShellResource, pingSerial); + zxdg_shell_v5_send_ping(clientXdgShellResource, pingSerial); setupTimer(pingSerial); return pingSerial; @@ -261,40 +261,40 @@ static void unsetFullscreenCallback(wl_client *client, wl_resource *resource); static void setMinimizedCallback(wl_client *client, wl_resource *resource); - static const struct xdg_surface_interface s_interface; + static const struct zxdg_surface_v5_interface s_interface; }; namespace { template <> -Qt::Edges edgesToQtEdges(xdg_surface_resize_edge edges) +Qt::Edges edgesToQtEdges(zxdg_surface_v5_resize_edge edges) { Qt::Edges qtEdges; switch (edges) { - case XDG_SURFACE_RESIZE_EDGE_TOP: + case ZXDG_SURFACE_V5_RESIZE_EDGE_TOP: qtEdges = Qt::TopEdge; break; - case XDG_SURFACE_RESIZE_EDGE_BOTTOM: + case ZXDG_SURFACE_V5_RESIZE_EDGE_BOTTOM: qtEdges = Qt::BottomEdge; break; - case XDG_SURFACE_RESIZE_EDGE_LEFT: + case ZXDG_SURFACE_V5_RESIZE_EDGE_LEFT: qtEdges = Qt::LeftEdge; break; - case XDG_SURFACE_RESIZE_EDGE_TOP_LEFT: + case ZXDG_SURFACE_V5_RESIZE_EDGE_TOP_LEFT: qtEdges = Qt::TopEdge | Qt::LeftEdge; break; - case XDG_SURFACE_RESIZE_EDGE_BOTTOM_LEFT: + case ZXDG_SURFACE_V5_RESIZE_EDGE_BOTTOM_LEFT: qtEdges = Qt::BottomEdge | Qt::LeftEdge; break; - case XDG_SURFACE_RESIZE_EDGE_RIGHT: + case ZXDG_SURFACE_V5_RESIZE_EDGE_RIGHT: qtEdges = Qt::RightEdge; break; - case XDG_SURFACE_RESIZE_EDGE_TOP_RIGHT: + case ZXDG_SURFACE_V5_RESIZE_EDGE_TOP_RIGHT: qtEdges = Qt::TopEdge | Qt::RightEdge; break; - case XDG_SURFACE_RESIZE_EDGE_BOTTOM_RIGHT: + case ZXDG_SURFACE_V5_RESIZE_EDGE_BOTTOM_RIGHT: qtEdges = Qt::BottomEdge | Qt::RightEdge; break; - case XDG_SURFACE_RESIZE_EDGE_NONE: + case ZXDG_SURFACE_V5_RESIZE_EDGE_NONE: break; default: Q_UNREACHABLE(); @@ -305,14 +305,14 @@ } #ifndef DOXYGEN_SHOULD_SKIP_THIS -const struct xdg_surface_interface XdgSurfaceV5Interface::Private::s_interface = { +const struct zxdg_surface_v5_interface XdgSurfaceV5Interface::Private::s_interface = { resourceDestroyedCallback, setParentCallback, setTitleCallback, setAppIdCallback, showWindowMenuCallback, moveCallback, - resizeCallback, + resizeCallback, ackConfigureCallback, setWindowGeometryCallback, setMaximizedCallback, @@ -409,15 +409,15 @@ } XdgSurfaceV5Interface::Private::Private(XdgSurfaceV5Interface *q, XdgShellV5Interface *c, SurfaceInterface *surface, wl_resource *parentResource) - : XdgShellSurfaceInterface::Private(XdgShellInterfaceVersion::UnstableV5, q, c, surface, parentResource, &xdg_surface_interface, &s_interface) + : XdgShellSurfaceInterface::Private(XdgShellInterfaceVersion::UnstableV5, q, c, surface, parentResource, &zxdg_surface_v5_interface, &s_interface) { } XdgSurfaceV5Interface::Private::~Private() = default; void XdgSurfaceV5Interface::Private::close() { - xdg_surface_send_close(resource); + zxdg_surface_v5_send_close(resource); client->flush(); } @@ -431,36 +431,36 @@ wl_array_init(&state); if (states.testFlag(State::Maximized)) { uint32_t *s = reinterpret_cast(wl_array_add(&state, sizeof(uint32_t))); - *s = XDG_SURFACE_STATE_MAXIMIZED; + *s = ZXDG_SURFACE_V5_STATE_MAXIMIZED; } if (states.testFlag(State::Fullscreen)) { uint32_t *s = reinterpret_cast(wl_array_add(&state, sizeof(uint32_t))); - *s = XDG_SURFACE_STATE_FULLSCREEN; + *s = ZXDG_SURFACE_V5_STATE_FULLSCREEN; } if (states.testFlag(State::Resizing)) { uint32_t *s = reinterpret_cast(wl_array_add(&state, sizeof(uint32_t))); - *s = XDG_SURFACE_STATE_RESIZING; + *s = ZXDG_SURFACE_V5_STATE_RESIZING; } if (states.testFlag(State::Activated)) { uint32_t *s = reinterpret_cast(wl_array_add(&state, sizeof(uint32_t))); - *s = XDG_SURFACE_STATE_ACTIVATED; + *s = ZXDG_SURFACE_V5_STATE_ACTIVATED; } configureSerials << serial; - xdg_surface_send_configure(resource, size.width(), size.height(), &state, serial); + zxdg_surface_v5_send_configure(resource, size.width(), size.height(), &state, serial); client->flush(); wl_array_release(&state); return serial; } #ifndef DOXYGEN_SHOULD_SKIP_THIS -const struct xdg_popup_interface XdgPopupV5Interface::Private::s_interface = { +const struct zxdg_popup_v5_interface XdgPopupV5Interface::Private::s_interface = { resourceDestroyedCallback }; #endif XdgPopupV5Interface::Private::Private(XdgPopupV5Interface *q, XdgShellV5Interface *c, SurfaceInterface *surface, wl_resource *parentResource) - : XdgShellPopupInterface::Private(XdgShellInterfaceVersion::UnstableV5, q, c, surface, parentResource, &xdg_popup_interface, &s_interface) + : XdgShellPopupInterface::Private(XdgShellInterfaceVersion::UnstableV5, q, c, surface, parentResource, &zxdg_popup_v5_interface, &s_interface) { } @@ -473,7 +473,7 @@ return; } // TODO: dismiss all child popups - xdg_popup_send_popup_done(resource); + zxdg_popup_v5_send_popup_done(resource); client->flush(); }