Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v3.3/glfw: regenerate Wayland protocols #358

Merged
merged 1 commit into from
Jul 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Regenerate Wayland protocols
This should hopefully fix/unblock fyne-io/fyne#3131.
  • Loading branch information
Jacalz committed Jul 12, 2022
commit 9b3bc82c1624832dceb0838879a3be44fce2d0f9
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner */
/* Generated by wayland-scanner 1.20.0 */

/*
* Copyright © 2015 Samsung Electronics Co., Ltd
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner */
/* Generated by wayland-scanner 1.20.0 */

#ifndef IDLE_INHIBIT_UNSTABLE_V1_CLIENT_PROTOCOL_H
#define IDLE_INHIBIT_UNSTABLE_V1_CLIENT_PROTOCOL_H
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner */
/* Generated by wayland-scanner 1.20.0 */

/*
* Copyright © 2014 Jonas Ådahl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner */
/* Generated by wayland-scanner 1.20.0 */

#ifndef POINTER_CONSTRAINTS_UNSTABLE_V1_CLIENT_PROTOCOL_H
#define POINTER_CONSTRAINTS_UNSTABLE_V1_CLIENT_PROTOCOL_H
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner */
/* Generated by wayland-scanner 1.20.0 */

/*
* Copyright © 2014 Jonas Ådahl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner */
/* Generated by wayland-scanner 1.20.0 */

#ifndef RELATIVE_POINTER_UNSTABLE_V1_CLIENT_PROTOCOL_H
#define RELATIVE_POINTER_UNSTABLE_V1_CLIENT_PROTOCOL_H
Expand Down
2 changes: 1 addition & 1 deletion v3.3/glfw/glfw/src/wayland-viewporter-client-protocol.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner */
/* Generated by wayland-scanner 1.20.0 */

/*
* Copyright © 2013-2016 Collabora, Ltd.
Expand Down
14 changes: 1 addition & 13 deletions v3.3/glfw/glfw/src/wayland-viewporter-client-protocol.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner */
/* Generated by wayland-scanner 1.20.0 */

#ifndef VIEWPORTER_CLIENT_PROTOCOL_H
#define VIEWPORTER_CLIENT_PROTOCOL_H
Expand Down Expand Up @@ -126,12 +126,6 @@ extern const struct wl_interface wp_viewporter_interface;
* when the surface state is applied. A NULL wl_buffer does not raise the
* out_of_buffer error.
*
* The x, y arguments of wl_surface.attach are applied as normal to
* the surface. They indicate how many pixels to remove from the
* surface size from the left and the top. In other words, they are
* still in the surface-local coordinate system, just like dst_width
* and dst_height are.
*
* If the wl_surface associated with the wp_viewport is destroyed,
* all wp_viewport requests except 'destroy' raise the protocol error
* no_surface.
Expand Down Expand Up @@ -193,12 +187,6 @@ extern const struct wl_interface wp_viewporter_interface;
* when the surface state is applied. A NULL wl_buffer does not raise the
* out_of_buffer error.
*
* The x, y arguments of wl_surface.attach are applied as normal to
* the surface. They indicate how many pixels to remove from the
* surface size from the left and the top. In other words, they are
* still in the surface-local coordinate system, just like dst_width
* and dst_height are.
*
* If the wl_surface associated with the wp_viewport is destroyed,
* all wp_viewport requests except 'destroy' raise the protocol error
* no_surface.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner */
/* Generated by wayland-scanner 1.20.0 */

#ifndef XDG_DECORATION_UNSTABLE_V1_CLIENT_PROTOCOL_H
#define XDG_DECORATION_UNSTABLE_V1_CLIENT_PROTOCOL_H
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner */
/* Generated by wayland-scanner 1.20.0 */

/*
* Copyright © 2018 Simon Ser
Expand Down
15 changes: 8 additions & 7 deletions v3.3/glfw/glfw/src/wayland-xdg-shell-client-protocol.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner */
/* Generated by wayland-scanner 1.20.0 */

/*
* Copyright © 2008-2013 Kristian Høgsberg
Expand Down Expand Up @@ -91,7 +91,7 @@ static const struct wl_message xdg_wm_base_events[] = {
};

WL_PRIVATE const struct wl_interface xdg_wm_base_interface = {
"xdg_wm_base", 4,
"xdg_wm_base", 5,
4, xdg_wm_base_requests,
1, xdg_wm_base_events,
};
Expand All @@ -110,7 +110,7 @@ static const struct wl_message xdg_positioner_requests[] = {
};

WL_PRIVATE const struct wl_interface xdg_positioner_interface = {
"xdg_positioner", 4,
"xdg_positioner", 5,
10, xdg_positioner_requests,
0, NULL,
};
Expand All @@ -128,7 +128,7 @@ static const struct wl_message xdg_surface_events[] = {
};

WL_PRIVATE const struct wl_interface xdg_surface_interface = {
"xdg_surface", 4,
"xdg_surface", 5,
5, xdg_surface_requests,
1, xdg_surface_events,
};
Expand All @@ -154,12 +154,13 @@ static const struct wl_message xdg_toplevel_events[] = {
{ "configure", "iia", xdg_shell_types + 0 },
{ "close", "", xdg_shell_types + 0 },
{ "configure_bounds", "4ii", xdg_shell_types + 0 },
{ "wm_capabilities", "5a", xdg_shell_types + 0 },
};

WL_PRIVATE const struct wl_interface xdg_toplevel_interface = {
"xdg_toplevel", 4,
"xdg_toplevel", 5,
14, xdg_toplevel_requests,
3, xdg_toplevel_events,
4, xdg_toplevel_events,
};

static const struct wl_message xdg_popup_requests[] = {
Expand All @@ -175,7 +176,7 @@ static const struct wl_message xdg_popup_events[] = {
};

WL_PRIVATE const struct wl_interface xdg_popup_interface = {
"xdg_popup", 4,
"xdg_popup", 5,
3, xdg_popup_requests,
3, xdg_popup_events,
};
Expand Down
62 changes: 57 additions & 5 deletions v3.3/glfw/glfw/src/wayland-xdg-shell-client-protocol.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by wayland-scanner */
/* Generated by wayland-scanner 1.20.0 */

#ifndef XDG_SHELL_CLIENT_PROTOCOL_H
#define XDG_SHELL_CLIENT_PROTOCOL_H
Expand Down Expand Up @@ -1315,6 +1315,28 @@ enum xdg_toplevel_state {
#define XDG_TOPLEVEL_STATE_TILED_BOTTOM_SINCE_VERSION 2
#endif /* XDG_TOPLEVEL_STATE_ENUM */

#ifndef XDG_TOPLEVEL_WM_CAPABILITIES_ENUM
#define XDG_TOPLEVEL_WM_CAPABILITIES_ENUM
enum xdg_toplevel_wm_capabilities {
/**
* show_window_menu is available
*/
XDG_TOPLEVEL_WM_CAPABILITIES_WINDOW_MENU = 1,
/**
* set_maximized and unset_maximized are available
*/
XDG_TOPLEVEL_WM_CAPABILITIES_MAXIMIZE = 2,
/**
* set_fullscreen and unset_fullscreen are available
*/
XDG_TOPLEVEL_WM_CAPABILITIES_FULLSCREEN = 3,
/**
* set_minimized is available
*/
XDG_TOPLEVEL_WM_CAPABILITIES_MINIMIZE = 4,
};
#endif /* XDG_TOPLEVEL_WM_CAPABILITIES_ENUM */

/**
* @ingroup iface_xdg_toplevel
* @struct xdg_toplevel_listener
Expand Down Expand Up @@ -1389,6 +1411,36 @@ struct xdg_toplevel_listener {
struct xdg_toplevel *xdg_toplevel,
int32_t width,
int32_t height);
/**
* compositor capabilities
*
* This event advertises the capabilities supported by the
* compositor. If a capability isn't supported, clients should hide
* or disable the UI elements that expose this functionality. For
* instance, if the compositor doesn't advertise support for
* minimized toplevels, a button triggering the set_minimized
* request should not be displayed.
*
* The compositor will ignore requests it doesn't support. For
* instance, a compositor which doesn't advertise support for
* minimized will ignore set_minimized requests.
*
* Compositors must send this event once before the first
* xdg_surface.configure event. When the capabilities change,
* compositors must send this event again and then send an
* xdg_surface.configure event.
*
* The configured state should not be applied immediately. See
* xdg_surface.configure for details.
*
* The capabilities are sent as an array of 32-bit unsigned
* integers in native endianness.
* @param capabilities array of 32-bit capabilities
* @since 5
*/
void (*wm_capabilities)(void *data,
struct xdg_toplevel *xdg_toplevel,
struct wl_array *capabilities);
};

/**
Expand Down Expand Up @@ -1429,6 +1481,10 @@ xdg_toplevel_add_listener(struct xdg_toplevel *xdg_toplevel,
* @ingroup iface_xdg_toplevel
*/
#define XDG_TOPLEVEL_CONFIGURE_BOUNDS_SINCE_VERSION 4
/**
* @ingroup iface_xdg_toplevel
*/
#define XDG_TOPLEVEL_WM_CAPABILITIES_SINCE_VERSION 5

/**
* @ingroup iface_xdg_toplevel
Expand Down Expand Up @@ -2108,10 +2164,6 @@ xdg_popup_destroy(struct xdg_popup *xdg_popup)
* nested grabbing popup as well. When a compositor dismisses popups, it
* will follow the same dismissing order as required from the client.
*
* The parent of a grabbing popup must either be another xdg_popup with an
* active explicit grab, or an xdg_popup or xdg_toplevel, if there are no
* explicit grabs already taken.
*
* If the topmost grabbing popup is destroyed, the grab will be returned to
* the parent of the popup, if that parent previously had an explicit grab.
*
Expand Down