mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-10-31 22:25:21 -04:00
backend/wayland: use xdg-decoration-unstable-v1
This allows the toplevel to have proper decorations on compositors that support xdg-decoration-unstable-v1.
This commit is contained in:
parent
6ae6b5dbb6
commit
292d20e4c1
3 changed files with 25 additions and 0 deletions
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
#include "backend/wayland.h"
|
||||
#include "util/signal.h"
|
||||
#include "xdg-decoration-unstable-v1-client-protocol.h"
|
||||
#include "xdg-shell-client-protocol.h"
|
||||
|
||||
static struct wlr_wl_output *get_wl_output_from_output(
|
||||
|
|
@ -187,6 +188,9 @@ static void output_destroy(struct wlr_output *wlr_output) {
|
|||
|
||||
wlr_egl_destroy_surface(&output->backend->egl, output->egl_surface);
|
||||
wl_egl_window_destroy(output->egl_window);
|
||||
if (output->zxdg_toplevel_decoration_v1) {
|
||||
zxdg_toplevel_decoration_v1_destroy(output->zxdg_toplevel_decoration_v1);
|
||||
}
|
||||
xdg_toplevel_destroy(output->xdg_toplevel);
|
||||
xdg_surface_destroy(output->xdg_surface);
|
||||
wl_surface_destroy(output->surface);
|
||||
|
|
@ -318,6 +322,18 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *wlr_backend) {
|
|||
goto error;
|
||||
}
|
||||
|
||||
if (backend->zxdg_decoration_manager_v1) {
|
||||
output->zxdg_toplevel_decoration_v1 =
|
||||
zxdg_decoration_manager_v1_get_toplevel_decoration(
|
||||
backend->zxdg_decoration_manager_v1, output->xdg_toplevel);
|
||||
if (!output->xdg_toplevel) {
|
||||
wlr_log_errno(WLR_ERROR, "Could not get xdg toplevel decoration");
|
||||
goto error;
|
||||
}
|
||||
zxdg_toplevel_decoration_v1_set_mode(output->zxdg_toplevel_decoration_v1,
|
||||
ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
|
||||
}
|
||||
|
||||
wlr_wl_output_set_title(wlr_output, NULL);
|
||||
|
||||
xdg_toplevel_set_app_id(output->xdg_toplevel, "wlroots");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue