alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

xdg-decoration: let floating clients set borders

Browse source 
The xdg-decoration protocol allows clients to request whether they want
to use server side decorations or client side decorations. Currently,
sway ignores this and always enforces whatever the server is currently
set to. Although tiled clients cannot be allowed to set borders, there
is no harm in listening requests from floating clients. Sidenote: also
fix an unrelated style error.
This commit is contained in:
Dudemanguy 2021-08-10 12:01:37 -05:00 committed by Simon Ser
parent 7a15e715b7
commit acf946fe4c
3 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sway/desktop/xdg_shell.c
View file

@ -443,12 +443,15 @@ static void handle_map(struct wl_listener *listener, void *data) {
bool csd = false; bool csd = false;
if (!view->xdg_decoration) { if (view->xdg_decoration) {
enum wlr_xdg_toplevel_decoration_v1_mode mode =
view->xdg_decoration->wlr_xdg_decoration->client_pending_mode;
csd = mode == WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
} else {
struct sway_server_decoration *deco = struct sway_server_decoration *deco =
decoration_from_surface(xdg_surface->surface); decoration_from_surface(xdg_surface->surface);
csd = !deco || deco->wlr_server_decoration->mode == csd = !deco || deco->wlr_server_decoration->mode ==
WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
} }
view_map(view, view->wlr_xdg_surface->surface, view_map(view, view->wlr_xdg_surface->surface,

12
sway/tree/container.c
View file

@ -20,6 +20,7 @@
#include "sway/tree/arrange.h" #include "sway/tree/arrange.h"
#include "sway/tree/view.h" #include "sway/tree/view.h"
#include "sway/tree/workspace.h" #include "sway/tree/workspace.h"
#include "sway/xdg_decoration.h"
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
#include "stringop.h" #include "stringop.h"
@ -835,7 +836,13 @@ void container_set_floating(struct sway_container *container, bool enable) {
if (container->view) { if (container->view) {
view_set_tiled(container->view, false); view_set_tiled(container->view, false);
if (container->view->using_csd) { if (container->view->using_csd) {
container->saved_border = container->pending.border;
container->pending.border = B_CSD; container->pending.border = B_CSD;
if (container->view->xdg_decoration) {
struct sway_xdg_decoration *deco = container->view->xdg_decoration;
wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration,
WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE);
}
} }
} }
container_floating_set_default_size(container); container_floating_set_default_size(container);
@ -873,6 +880,11 @@ void container_set_floating(struct sway_container *container, bool enable) {
view_set_tiled(container->view, true); view_set_tiled(container->view, true);
if (container->view->using_csd) { if (container->view->using_csd) {
container->pending.border = container->saved_border; container->pending.border = container->saved_border;
if (container->view->xdg_decoration) {
struct sway_xdg_decoration *deco = container->view->xdg_decoration;
wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration,
WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
}
} }
} }
container->width_fraction = 0; container->width_fraction = 0;

28
sway/xdg_decoration.c
View file

@ -10,7 +10,7 @@ static void xdg_decoration_handle_destroy(struct wl_listener *listener,
void *data) { void *data) {
struct sway_xdg_decoration *deco = struct sway_xdg_decoration *deco =
wl_container_of(listener, deco, destroy); wl_container_of(listener, deco, destroy);
if(deco->view) { if (deco->view) {
deco->view->xdg_decoration = NULL; deco->view->xdg_decoration = NULL;
} }
wl_list_remove(&deco->destroy.link); wl_list_remove(&deco->destroy.link);
@ -23,8 +23,32 @@ static void xdg_decoration_handle_request_mode(struct wl_listener *listener,
void *data) { void *data) {
struct sway_xdg_decoration *deco = struct sway_xdg_decoration *deco =
wl_container_of(listener, deco, request_mode); wl_container_of(listener, deco, request_mode);
struct sway_view *view = deco->view;
enum wlr_xdg_toplevel_decoration_v1_mode mode =
WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE;
enum wlr_xdg_toplevel_decoration_v1_mode client_mode =
deco->wlr_xdg_decoration->client_pending_mode;
bool floating;
if (view->container) {
floating = container_is_floating(view->container);
bool csd = false;
csd = client_mode ==
WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
view_update_csd_from_client(view, csd);
arrange_container(view->container);
transaction_commit_dirty();
} else {
floating = view->impl->wants_floating &&
view->impl->wants_floating(view);
}
if (floating && client_mode) {
mode = client_mode;
}
wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration, wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration,
WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); mode);
} }
void handle_xdg_decoration(struct wl_listener *listener, void *data) { void handle_xdg_decoration(struct wl_listener *listener, void *data) {