aboutsummaryrefslogtreecommitdiffstats
path: root/sway/server.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-24 20:54:57 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-09-27 22:51:37 +1000
commit7b138e5ef0f679c9bb0078019d7c9c63fef36273 (patch)
tree2cdbeb394889065e0606a1fcbe38c1e99e25d260 /sway/server.c
parentMerge pull request #2717 from ianyfan/tablet-config (diff)
downloadsway-7b138e5ef0f679c9bb0078019d7c9c63fef36273.tar.gz
sway-7b138e5ef0f679c9bb0078019d7c9c63fef36273.tar.zst
sway-7b138e5ef0f679c9bb0078019d7c9c63fef36273.zip
Add CSD to border modes
This replaces view.using_csd with a new border mode: B_CSD. This also removes sway_xdg_shell{_v6}_view.deco_mode and view->has_client_side_decorations as we can now get these from the border. You can use `border toggle` to cycle through the modes including CSD, or use `border csd` to set it directly. The client must support the xdg-decoration protocol, and the only client I know of that does is the example in wlroots. If the client switches from SSD to CSD without us expecting it (via the server-decoration protocol), we stash the previous border type into view.saved_border so we can restore it if the client returns to SSD. I haven't found a way to test this though.
Diffstat (limited to 'sway/server.c')
-rw-r--r--sway/server.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sway/server.c b/sway/server.c
index bed5aed1..63bfa7e1 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -16,6 +16,7 @@
16#include <wlr/types/wlr_screencopy_v1.h> 16#include <wlr/types/wlr_screencopy_v1.h>
17#include <wlr/types/wlr_server_decoration.h> 17#include <wlr/types/wlr_server_decoration.h>
18#include <wlr/types/wlr_xcursor_manager.h> 18#include <wlr/types/wlr_xcursor_manager.h>
19#include <wlr/types/wlr_xdg_decoration_v1.h>
19#include <wlr/types/wlr_xdg_output_v1.h> 20#include <wlr/types/wlr_xdg_output_v1.h>
20#include <wlr/util/log.h> 21#include <wlr/util/log.h>
21#include "list.h" 22#include "list.h"
@@ -115,6 +116,14 @@ bool server_init(struct sway_server *server) {
115 server->server_decoration.notify = handle_server_decoration; 116 server->server_decoration.notify = handle_server_decoration;
116 wl_list_init(&server->decorations); 117 wl_list_init(&server->decorations);
117 118
119 server->xdg_decoration_manager =
120 wlr_xdg_decoration_manager_v1_create(server->wl_display);
121 wl_signal_add(
122 &server->xdg_decoration_manager->events.new_toplevel_decoration,
123 &server->xdg_decoration);
124 server->xdg_decoration.notify = handle_xdg_decoration;
125 wl_list_init(&server->xdg_decorations);
126
118 wlr_export_dmabuf_manager_v1_create(server->wl_display); 127 wlr_export_dmabuf_manager_v1_create(server->wl_display);
119 wlr_screencopy_manager_v1_create(server->wl_display); 128 wlr_screencopy_manager_v1_create(server->wl_display);
120 129