Skip to content

Switching to zxdg-shell unstable Wayland protocol to the stable xdg-s… #552

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Switching to zxdg-shell unstable Wayland protocol to the stable xdg-s… #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3419902
Switching to zxdg-shell unstable Wayland protocol to the stable xdg-s…
coki04 Jul 11, 2025
08ae4d8
Allow for older xdg-shell version
coki04 Jul 12, 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
10 changes: 5 additions & 5 deletions src/cmake/presentation.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@ elseif(PRESENTATION_BACKEND MATCHES "wayland")
pkg_get_variable(WAYLAND_PROTOCOLS_DATADIR wayland-protocols pkgdatadir)
pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)

set(PROTOCOL xdg-shell-unstable-v6)
set(PROTOCOL_XML ${WAYLAND_PROTOCOLS_DATADIR}/unstable/xdg-shell/${PROTOCOL}.xml)
set(PROTOCOL xdg-shell)
set(PROTOCOL_XML ${WAYLAND_PROTOCOLS_DATADIR}/stable/xdg-shell/${PROTOCOL}.xml)

if(NOT EXISTS ${PROTOCOL_XML})
message(FATAL_ERROR "xdg-shell-unstable-v6.xml not found in " ${WAYLAND_PROTOCOLS_DATADIR}
"\nYour wayland-protocols package does not " "contain xdg-shell-unstable-v6."
if(NOT EXISTS ${PROTOCOL_XML})
message(FATAL_ERROR "xdg-shell.xml not found in " ${WAYLAND_PROTOCOLS_DATADIR}
"\nYour wayland-protocols package does not " "contain xdg-shell."
)
endif()
add_custom_command(
Expand Down
63 changes: 36 additions & 27 deletions src/common/gfxwrapper_opengl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2187,50 +2187,59 @@ const struct wl_seat_listener seat_listener = {
_seat_capabilities_cb,
};

static void _xdg_surface_configure_cb(void *data, struct zxdg_surface_v6 *surface, uint32_t serial) {
zxdg_surface_v6_ack_configure(surface, serial);
static void _xdg_surface_configure_cb(void *data, struct xdg_surface *surface, uint32_t serial) {
xdg_surface_ack_configure(surface, serial);
}

const struct zxdg_surface_v6_listener xdg_surface_listener = {
const struct xdg_surface_listener xdg_surface_listener = {
_xdg_surface_configure_cb,
};

static void _xdg_shell_ping_cb(void *data, struct zxdg_shell_v6 *shell, uint32_t serial) { zxdg_shell_v6_pong(shell, serial); }
static void _xdg_shell_ping_cb(void *data, struct xdg_wm_base *shell, uint32_t serial) { xdg_wm_base_pong(shell, serial); }

const struct zxdg_shell_v6_listener xdg_shell_listener = {
const struct xdg_wm_base_listener xdg_shell_listener = {
_xdg_shell_ping_cb,
};

static void _xdg_toplevel_configure_cb(void *data, struct zxdg_toplevel_v6 *toplevel, int32_t width, int32_t height,
static void _xdg_toplevel_configure_cb(void *data, struct xdg_toplevel *toplevel, int32_t width, int32_t height,
struct wl_array *states) {
ksGpuWindow *window = (ksGpuWindow *)data;

window->windowActive = false;

enum zxdg_toplevel_v6_state *state;
enum xdg_toplevel_state *state;
wl_array_for_each(state, states) {
switch (*state) {
case ZXDG_TOPLEVEL_V6_STATE_FULLSCREEN:
case XDG_TOPLEVEL_STATE_FULLSCREEN:
break;
case ZXDG_TOPLEVEL_V6_STATE_RESIZING:
case XDG_TOPLEVEL_STATE_RESIZING:
window->windowWidth = width;
window->windowWidth = height;
break;
case ZXDG_TOPLEVEL_V6_STATE_MAXIMIZED:
case XDG_TOPLEVEL_STATE_MAXIMIZED:
break;
case ZXDG_TOPLEVEL_V6_STATE_ACTIVATED:
case XDG_TOPLEVEL_STATE_ACTIVATED:
window->windowActive = true;
break;
case XDG_TOPLEVEL_STATE_TILED_LEFT:
case XDG_TOPLEVEL_STATE_TILED_RIGHT:
case XDG_TOPLEVEL_STATE_TILED_TOP:
case XDG_TOPLEVEL_STATE_TILED_BOTTOM:
break;
#ifdef XDG_TOPLEVEL_STATE_SUSPENDED
case XDG_TOPLEVEL_STATE_SUSPENDED:
break;
#endif
}
}
}

static void _xdg_toplevel_close_cb(void *data, struct zxdg_toplevel_v6 *toplevel) {
static void _xdg_toplevel_close_cb(void *data, struct xdg_toplevel *toplevel) {
ksGpuWindow *window = (ksGpuWindow *)data;
window->windowExit = true;
}

const struct zxdg_toplevel_v6_listener xdg_toplevel_listener = {
const struct xdg_toplevel_listener xdg_toplevel_listener = {
_xdg_toplevel_configure_cb,
_xdg_toplevel_close_cb,
};
Expand All @@ -2240,9 +2249,9 @@ static void _registry_cb(void *data, struct wl_registry *registry, uint32_t id,

if (strcmp(interface, "wl_compositor") == 0) {
window->compositor = wl_registry_bind(registry, id, &wl_compositor_interface, 1);
} else if (strcmp(interface, "zxdg_shell_v6") == 0) {
window->shell = wl_registry_bind(registry, id, &zxdg_shell_v6_interface, 1);
zxdg_shell_v6_add_listener(window->shell, &xdg_shell_listener, NULL);
} else if (strcmp(interface, "xdg_wm_base") == 0) {
window->shell = wl_registry_bind(registry, id, &xdg_wm_base_interface, 1);
xdg_wm_base_add_listener(window->shell, &xdg_shell_listener, NULL);
} else if (strcmp(interface, "wl_seat") == 0) {
window->seat = wl_registry_bind(registry, id, &wl_seat_interface, 1);
wl_seat_add_listener(window->seat, &seat_listener, window);
Expand Down Expand Up @@ -2302,7 +2311,7 @@ bool ksGpuWindow_Create(ksGpuWindow *window, ksDriverInstance *instance, const k
}

if (window->shell == NULL) {
Error("Compositor is missing support for zxdg_shell_v6.");
Error("Compositor is missing support for xdg_shell.");
return false;
}

Expand All @@ -2312,26 +2321,26 @@ bool ksGpuWindow_Create(ksGpuWindow *window, ksDriverInstance *instance, const k
return false;
}

window->shell_surface = zxdg_shell_v6_get_xdg_surface(window->shell, window->surface);
window->shell_surface = xdg_wm_base_get_xdg_surface(window->shell, window->surface);
if (window->shell_surface == NULL) {
Error("Could not get shell surface.");
return false;
}

zxdg_surface_v6_add_listener(window->shell_surface, &xdg_surface_listener, window);
xdg_surface_add_listener(window->shell_surface, &xdg_surface_listener, window);

struct zxdg_toplevel_v6 *toplevel = zxdg_surface_v6_get_toplevel(window->shell_surface);
struct xdg_toplevel *toplevel = xdg_surface_get_toplevel(window->shell_surface);
if (toplevel == NULL) {
Error("Could not get surface toplevel.");
return false;
}

zxdg_toplevel_v6_add_listener(toplevel, &xdg_toplevel_listener, window);
xdg_toplevel_add_listener(toplevel, &xdg_toplevel_listener, window);

zxdg_toplevel_v6_set_title(toplevel, WINDOW_TITLE);
zxdg_toplevel_v6_set_app_id(toplevel, APPLICATION_NAME);
zxdg_toplevel_v6_set_min_size(toplevel, width, height);
zxdg_toplevel_v6_set_max_size(toplevel, width, height);
xdg_toplevel_set_title(toplevel, WINDOW_TITLE);
xdg_toplevel_set_app_id(toplevel, APPLICATION_NAME);
xdg_toplevel_set_min_size(toplevel, width, height);
xdg_toplevel_set_max_size(toplevel, width, height);

wl_surface_commit(window->surface);

Expand Down Expand Up @@ -2363,8 +2372,8 @@ void ksGpuWindow_Destroy(ksGpuWindow *window) {

if (window->compositor != NULL) wl_compositor_destroy(window->compositor);
if (window->registry != NULL) wl_registry_destroy(window->registry);
if (window->shell_surface != NULL) zxdg_surface_v6_destroy(window->shell_surface);
if (window->shell != NULL) zxdg_shell_v6_destroy(window->shell);
if (window->shell_surface != NULL) xdg_surface_destroy(window->shell_surface);
if (window->shell != NULL) xdg_wm_base_destroy(window->shell);
if (window->surface != NULL) wl_surface_destroy(window->surface);
if (window->display != NULL) wl_display_disconnect(window->display);

Expand Down
6 changes: 3 additions & 3 deletions src/common/gfxwrapper_opengl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ Platform headers / declarations
#include <linux/input.h>
#include <poll.h>
#include <unistd.h>
#include "xdg-shell-unstable-v6.h"
#include <xdg-shell.h>

#endif

Expand Down Expand Up @@ -671,8 +671,8 @@ typedef struct {

struct wl_registry *registry;
struct wl_compositor *compositor;
struct zxdg_shell_v6 *shell;
struct zxdg_surface_v6 *shell_surface;
struct xdg_wm_base *shell;
struct xdg_surface *shell_surface;

struct wl_keyboard *keyboard;
struct wl_pointer *pointer;
Expand Down
Loading