Skip to content

wayland: support xdg-shell version 7 #16206

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.

Sign up for GitHub

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

wayland: support xdg-shell version 7 #16206

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c80d82
wayland: use _SINCE_VERSION instead of checking for enum constant
llyyr Apr 8, 2025
d4e155c
wayland: support xdg-shell version 7
llyyr Apr 8, 2025
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
19 changes: 17 additions & 2 deletions video/out/wayland_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,17 @@
#define CLOCK_MONOTONIC_RAW 4
#endif

#ifndef XDG_TOPLEVEL_STATE_SUSPENDED
#ifndef XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION
#define XDG_TOPLEVEL_STATE_SUSPENDED 9
#endif

#ifndef XDG_TOPLEVEL_STATE_CONSTRAINED_LEFT_SINCE_VERSION
#define XDG_TOPLEVEL_STATE_CONSTRAINED_LEFT 10
#define XDG_TOPLEVEL_STATE_CONSTRAINED_RIGHT 11
#define XDG_TOPLEVEL_STATE_CONSTRAINED_TOP 12
#define XDG_TOPLEVEL_STATE_CONSTRAINED_BOTTOM 13
#endif

// From the fractional scale protocol
#define WAYLAND_SCALE_FACTOR 120.0

Expand Down Expand Up @@ -1255,6 +1262,14 @@ static void handle_toplevel_config(void *data, struct xdg_toplevel *toplevel,
case XDG_TOPLEVEL_STATE_SUSPENDED:
is_suspended = true;
break;
case XDG_TOPLEVEL_STATE_CONSTRAINED_LEFT:
case XDG_TOPLEVEL_STATE_CONSTRAINED_RIGHT:
wl->resizing_constraint = MP_WIDTH_CONSTRAINT;
break;
case XDG_TOPLEVEL_STATE_CONSTRAINED_TOP:
case XDG_TOPLEVEL_STATE_CONSTRAINED_BOTTOM:
wl->resizing_constraint = MP_HEIGHT_CONSTRAINT;
break;
}
}

Expand Down Expand Up @@ -2011,7 +2026,7 @@ static void registry_handle_add(void *data, struct wl_registry *reg, uint32_t id
}

if (!strcmp(interface, xdg_wm_base_interface.name) && found++) {
ver = MPMIN(ver, 6); /* Cap at 6 in case new events are added later. */
ver = MPMIN(ver, 7); /* Cap at 7 in case new events are added later. */
wl->wm_base = wl_registry_bind(reg, id, &xdg_wm_base_interface, ver);
xdg_wm_base_add_listener(wl->wm_base, &xdg_wm_base_listener, wl);
}
Expand Down