aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-04-05 14:01:14 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2018-04-05 14:01:14 -0400
commit94ecd0f0aa16a3eee037b62097c4d939576b4934 (patch)
tree5960223c8b3a80b69df623dbb6c25aa706ca920e
parentMerge pull request #1742 from emersion/shell-views (diff)
downloadsway-94ecd0f0aa16a3eee037b62097c4d939576b4934.tar.gz
sway-94ecd0f0aa16a3eee037b62097c4d939576b4934.tar.zst
sway-94ecd0f0aa16a3eee037b62097c4d939576b4934.zip
Configure wlr_xdg_output_manager during init
-rw-r--r--sway/server.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sway/server.c b/sway/server.c
index 54945312..dfd01798 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -12,15 +12,17 @@
12#include <wlr/types/wlr_layer_shell.h> 12#include <wlr/types/wlr_layer_shell.h>
13#include <wlr/types/wlr_primary_selection.h> 13#include <wlr/types/wlr_primary_selection.h>
14#include <wlr/types/wlr_screenshooter.h> 14#include <wlr/types/wlr_screenshooter.h>
15#include <wlr/types/wlr_wl_shell.h>
16#include <wlr/types/wlr_xcursor_manager.h> 15#include <wlr/types/wlr_xcursor_manager.h>
16#include <wlr/types/wlr_xdg_output.h>
17#include <wlr/types/wlr_wl_shell.h>
17#include <wlr/util/log.h> 18#include <wlr/util/log.h>
18// TODO WLR: make Xwayland optional 19// TODO WLR: make Xwayland optional
19#include <wlr/xwayland.h> 20#include <wlr/xwayland.h>
20#include "sway/commands.h" 21#include "sway/commands.h"
21#include "sway/config.h" 22#include "sway/config.h"
22#include "sway/server.h"
23#include "sway/input/input-manager.h" 23#include "sway/input/input-manager.h"
24#include "sway/server.h"
25#include "sway/tree/layout.h"
24 26
25static void server_ready(struct wl_listener *listener, void *data) { 27static void server_ready(struct wl_listener *listener, void *data) {
26 wlr_log(L_DEBUG, "Compositor is ready, executing cmds in queue"); 28 wlr_log(L_DEBUG, "Compositor is ready, executing cmds in queue");
@@ -61,6 +63,9 @@ bool server_init(struct sway_server *server) {
61 server->new_output.notify = handle_new_output; 63 server->new_output.notify = handle_new_output;
62 wl_signal_add(&server->backend->events.new_output, &server->new_output); 64 wl_signal_add(&server->backend->events.new_output, &server->new_output);
63 65
66 wlr_xdg_output_manager_create(server->wl_display,
67 root_container.sway_root->output_layout);
68
64 server->layer_shell = wlr_layer_shell_create(server->wl_display); 69 server->layer_shell = wlr_layer_shell_create(server->wl_display);
65 wl_signal_add(&server->layer_shell->events.new_surface, 70 wl_signal_add(&server->layer_shell->events.new_surface,
66 &server->layer_shell_surface); 71 &server->layer_shell_surface);