mirror of
https://github.com/swaywm/sway.git
synced 2024-12-02 03:16:47 +00:00
21ff87d72b
This does the following: * Removes the xdg-decoration surface_commit listener. I was under the impression the client could ignore the server's preference and set whatever decoration they like using this protocol, but I don't think that's right. * Adds a listener for the xdg-decoration request_mode signal. The protocol states that the server should respond to this with its preference. We'll always respond with SSD here. * Makes it so tiled views which use CSD will still have sway decorations rendered. To do this, using_csd had to be added back to the view struct, and the border is changed when floating or unfloating a view.
60 lines
1.8 KiB
C
60 lines
1.8 KiB
C
#include <stdlib.h>
|
|
#include "sway/desktop/transaction.h"
|
|
#include "sway/server.h"
|
|
#include "sway/tree/arrange.h"
|
|
#include "sway/tree/view.h"
|
|
#include "sway/xdg_decoration.h"
|
|
#include "log.h"
|
|
|
|
static void xdg_decoration_handle_destroy(struct wl_listener *listener,
|
|
void *data) {
|
|
struct sway_xdg_decoration *deco =
|
|
wl_container_of(listener, deco, destroy);
|
|
deco->view->xdg_decoration = NULL;
|
|
wl_list_remove(&deco->destroy.link);
|
|
wl_list_remove(&deco->request_mode.link);
|
|
wl_list_remove(&deco->link);
|
|
free(deco);
|
|
}
|
|
|
|
static void xdg_decoration_handle_request_mode(struct wl_listener *listener,
|
|
void *data) {
|
|
struct sway_xdg_decoration *deco =
|
|
wl_container_of(listener, deco, request_mode);
|
|
wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration,
|
|
WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
|
|
}
|
|
|
|
void handle_xdg_decoration(struct wl_listener *listener, void *data) {
|
|
struct wlr_xdg_toplevel_decoration_v1 *wlr_deco = data;
|
|
struct sway_xdg_shell_view *xdg_shell_view = wlr_deco->surface->data;
|
|
|
|
struct sway_xdg_decoration *deco = calloc(1, sizeof(*deco));
|
|
if (deco == NULL) {
|
|
return;
|
|
}
|
|
|
|
deco->view = &xdg_shell_view->view;
|
|
deco->view->xdg_decoration = deco;
|
|
deco->wlr_xdg_decoration = wlr_deco;
|
|
|
|
wl_signal_add(&wlr_deco->events.destroy, &deco->destroy);
|
|
deco->destroy.notify = xdg_decoration_handle_destroy;
|
|
|
|
wl_signal_add(&wlr_deco->events.request_mode, &deco->request_mode);
|
|
deco->request_mode.notify = xdg_decoration_handle_request_mode;
|
|
|
|
wl_list_insert(&server.xdg_decorations, &deco->link);
|
|
}
|
|
|
|
struct sway_xdg_decoration *xdg_decoration_from_surface(
|
|
struct wlr_surface *surface) {
|
|
struct sway_xdg_decoration *deco;
|
|
wl_list_for_each(deco, &server.xdg_decorations, link) {
|
|
if (deco->wlr_xdg_decoration->surface->surface == surface) {
|
|
return deco;
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|