mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure the view signals are initialized early

Browse source 
This prevents a crash observed by the scaled-icon-buffer listening
to the `view->events.set_icons` signal before it is initialized.
For this to happen, the application needs to use the kde decoration
protocol and set it on the xdg_surface before creating the xdg_toplevel.

Fixes: #2798
This commit is contained in:
Consolatis 2025-06-07 04:26:35 +02:00
parent 6cb34f994c
commit 4d79f0057f
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/xdg.c
View file

@ -921,6 +921,8 @@ xdg_toplevel_new(struct wl_listener *listener, void *data)
view->server = server;
view->type = LAB_XDG_SHELL_VIEW;
view->impl = &xdg_toplevel_view_impl;
view_init(view);
xdg_toplevel_view->xdg_surface = xdg_surface;
/*
@ -997,7 +999,6 @@ xdg_toplevel_new(struct wl_listener *listener, void *data)
CONNECT_SIGNAL(toplevel, xdg_toplevel_view, request_show_window_menu);
CONNECT_SIGNAL(xdg_surface, xdg_toplevel_view, new_popup);
view_init(view);
wl_list_insert(&server->views, &view->link);
}

2
src/xwayland.c
View file

@ -965,6 +965,7 @@ xwayland_view_create(struct server *server,
view->server = server;
view->type = LAB_XWAYLAND_VIEW;
view->impl = &xwayland_view_impl;
view_init(view);
/*
* Set two-way view <-> xsurface association. Usually the association
@ -1001,7 +1002,6 @@ xwayland_view_create(struct server *server,
CONNECT_SIGNAL(xsurface, xwayland_view, focus_in);
CONNECT_SIGNAL(xsurface, xwayland_view, map_request);
view_init(view);
wl_list_insert(&view->server->views, &view->link);
if (xsurface->surface) {