mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-19 06:46:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wlroots' into feature/xwayland

Browse source
This commit is contained in:
Tony Crisci 2017-12-04 07:32:25 -05:00
commit 0896b68675
5 changed files with 141 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sway/server.c
View file

@ -7,6 +7,7 @@
#include <wlr/render.h>
#include <wlr/render/gles2.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_wl_shell.h>
// TODO WLR: make Xwayland optional
#include <wlr/xwayland.h>
#include "sway/server.h"
@ -47,6 +48,11 @@ bool server_init(struct sway_server *server) {
&server->xwayland_surface);
server->xwayland_surface.notify = handle_xwayland_surface;
server->wl_shell = wlr_wl_shell_create(server->wl_display);
wl_signal_add(&server->wl_shell->events.new_surface,
&server->wl_shell_surface);
server->wl_shell_surface.notify = handle_wl_shell_surface;
server->socket = wl_display_add_socket_auto(server->wl_display);
if (!sway_assert(server->socket, "Unable to open wayland socket")) {
wlr_backend_destroy(server->backend);