hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xdg-decoration: store an xdg_toplevel instead of xdg_surface 

Closes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3685
This commit is contained in:
Leonardo Hernández Hernández 2023-08-19 11:10:36 -06:00
parent 22b6581a18
commit bdc34401ba
No known key found for this signature in database
GPG Key ID: E538897EE11B9624
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_xdg_decoration_v1.h
View File

@ -36,7 +36,7 @@ struct wlr_xdg_toplevel_decoration_v1_state {
struct wlr_xdg_toplevel_decoration_v1 { struct wlr_xdg_toplevel_decoration_v1 {
struct wl_resource *resource; struct wl_resource *resource;
struct wlr_xdg_surface *surface; struct wlr_xdg_toplevel * toplevel;
struct wlr_xdg_decoration_manager_v1 *manager; struct wlr_xdg_decoration_manager_v1 *manager;
struct wl_list link; // wlr_xdg_decoration_manager_v1.link struct wl_list link; // wlr_xdg_decoration_manager_v1.link

8
types/wlr_xdg_decoration_v1.c
View File

@ -54,7 +54,7 @@ uint32_t wlr_xdg_toplevel_decoration_v1_set_mode(
enum wlr_xdg_toplevel_decoration_v1_mode mode) { enum wlr_xdg_toplevel_decoration_v1_mode mode) {
assert(mode != WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_NONE); assert(mode != WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_NONE);
decoration->scheduled_mode = mode; decoration->scheduled_mode = mode;
return wlr_xdg_surface_schedule_configure(decoration->surface); return wlr_xdg_surface_schedule_configure(decoration->toplevel->base);
} }
static void toplevel_decoration_handle_resource_destroy( static void toplevel_decoration_handle_resource_destroy(
@ -150,7 +150,7 @@ static void toplevel_decoration_handle_surface_commit(
decoration->current = decoration->pending; decoration->current = decoration->pending;
if (decoration->surface->added && !decoration->added) { if (decoration->toplevel->base->added && !decoration->added) {
decoration->added = true; decoration->added = true;
wl_signal_emit_mutable(&manager->events.new_toplevel_decoration, wl_signal_emit_mutable(&manager->events.new_toplevel_decoration,
decoration); decoration);
@ -189,7 +189,7 @@ static void decoration_manager_handle_get_toplevel_decoration(
struct wlr_xdg_toplevel_decoration_v1 *existing; struct wlr_xdg_toplevel_decoration_v1 *existing;
wl_list_for_each(existing, &manager->decorations, link) { wl_list_for_each(existing, &manager->decorations, link) {
if (existing->surface == toplevel->base) { if (existing->toplevel == toplevel) {
wl_resource_post_error(manager_resource, wl_resource_post_error(manager_resource,
ZXDG_TOPLEVEL_DECORATION_V1_ERROR_ALREADY_CONSTRUCTED, ZXDG_TOPLEVEL_DECORATION_V1_ERROR_ALREADY_CONSTRUCTED,
"xdg_toplevel already has a decoration object"); "xdg_toplevel already has a decoration object");
@ -204,7 +204,7 @@ static void decoration_manager_handle_get_toplevel_decoration(
return; return;
} }
decoration->manager = manager; decoration->manager = manager;
decoration->surface = toplevel->base; decoration->toplevel = toplevel;
uint32_t version = wl_resource_get_version(manager_resource); uint32_t version = wl_resource_get_version(manager_resource);
decoration->resource = wl_resource_create(client, decoration->resource = wl_resource_create(client,