mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-06-05 03:01:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr_xdg_decoration_v1: support version 2

Browse source
This commit is contained in:
llyyr 2026-05-30 10:03:09 +05:30 • committed by Simon Ser
parent b287e361fc
commit bd99e8c2bd
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/wlr/types/wlr_xdg_decoration_v1.h
View file

@ -66,7 +66,8 @@ struct wlr_xdg_toplevel_decoration_v1 {
}; };
struct wlr_xdg_decoration_manager_v1 * struct wlr_xdg_decoration_manager_v1 *
wlr_xdg_decoration_manager_v1_create(struct wl_display *display); wlr_xdg_decoration_manager_v1_create(struct wl_display *display,
uint32_t version);
uint32_t wlr_xdg_toplevel_decoration_v1_set_mode( uint32_t wlr_xdg_toplevel_decoration_v1_set_mode(
struct wlr_xdg_toplevel_decoration_v1 *decoration, struct wlr_xdg_toplevel_decoration_v1 *decoration,

10
types/wlr_xdg_decoration_v1.c
View file

@ -5,7 +5,7 @@
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "xdg-decoration-unstable-v1-protocol.h" #include "xdg-decoration-unstable-v1-protocol.h"
#define DECORATION_MANAGER_VERSION 1 #define DECORATION_MANAGER_VERSION 2
static const struct zxdg_toplevel_decoration_v1_interface static const struct zxdg_toplevel_decoration_v1_interface
toplevel_decoration_impl; toplevel_decoration_impl;
@ -171,8 +171,9 @@ static void decoration_manager_handle_get_toplevel_decoration(
decoration_manager_from_resource(manager_resource); decoration_manager_from_resource(manager_resource);
struct wlr_xdg_toplevel *toplevel = struct wlr_xdg_toplevel *toplevel =
wlr_xdg_toplevel_from_resource(toplevel_resource); wlr_xdg_toplevel_from_resource(toplevel_resource);
uint32_t version = wl_resource_get_version(manager_resource);
if (wlr_surface_has_buffer(toplevel->base->surface)) { if (version == 1 && wlr_surface_has_buffer(toplevel->base->surface)) {
wl_resource_post_error(manager_resource, wl_resource_post_error(manager_resource,
ZXDG_TOPLEVEL_DECORATION_V1_ERROR_UNCONFIGURED_BUFFER, ZXDG_TOPLEVEL_DECORATION_V1_ERROR_UNCONFIGURED_BUFFER,
"xdg_toplevel_decoration must not have a buffer at creation"); "xdg_toplevel_decoration must not have a buffer at creation");
@ -204,7 +205,6 @@ static void decoration_manager_handle_get_toplevel_decoration(
return; return;
} }
uint32_t version = wl_resource_get_version(manager_resource);
decoration->resource = wl_resource_create(client, decoration->resource = wl_resource_create(client,
&zxdg_toplevel_decoration_v1_interface, version, id); &zxdg_toplevel_decoration_v1_interface, version, id);
if (decoration->resource == NULL) { if (decoration->resource == NULL) {
@ -271,7 +271,9 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
} }
struct wlr_xdg_decoration_manager_v1 * struct wlr_xdg_decoration_manager_v1 *
wlr_xdg_decoration_manager_v1_create(struct wl_display *display) { wlr_xdg_decoration_manager_v1_create(struct wl_display *display,
uint32_t version) {
assert(version <= DECORATION_MANAGER_VERSION);
struct wlr_xdg_decoration_manager_v1 *manager = calloc(1, sizeof(*manager)); struct wlr_xdg_decoration_manager_v1 *manager = calloc(1, sizeof(*manager));
if (manager == NULL) { if (manager == NULL) {
return NULL; return NULL;